Date: Sunday, March 11, 2018 @ 20:42:11 Author: heftig Revision: 318651
3.27.92.1+7+gd316f4d09-1 Modified: nautilus/trunk/PKGBUILD Deleted: nautilus/trunk/0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch -----------------------------------------------------------------+ 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch | 52 ---------- PKGBUILD | 45 ++------ 2 files changed, 15 insertions(+), 82 deletions(-) Deleted: 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch =================================================================== --- 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch 2018-03-11 20:41:16 UTC (rev 318650) +++ 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch 2018-03-11 20:42:11 UTC (rev 318651) @@ -1,52 +0,0 @@ -From bf86a803ab912a4cb8f7bd680616882ca47cad3a Mon Sep 17 00:00:00 2001 -Message-Id: <bf86a803ab912a4cb8f7bd680616882ca47cad3a.1516394111.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Fri, 19 Jan 2018 20:47:04 +0100 -Subject: [PATCH] rename-file-popover-controller: Don't destroy the popover in - 'unmap' - -Doing that when transitions are deactivated destroys the popover in the -middle of gtk_popover_popdown, causing gtk_popover_hide_internal to -operate on a finalized popover. - -Fixes #216. ---- - src/nautilus-rename-file-popover-controller.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/src/nautilus-rename-file-popover-controller.c b/src/nautilus-rename-file-popover-controller.c -index 83a13d6d9..5806315fb 100644 ---- a/src/nautilus-rename-file-popover-controller.c -+++ b/src/nautilus-rename-file-popover-controller.c -@@ -56,7 +56,6 @@ rename_file_popover_controller_on_closed (GtkPopover *popover, - g_signal_handler_disconnect (controller->rename_file_popover, - controller->closed_handler_id); - controller->closed_handler_id = 0; -- controller->rename_file_popover = NULL; - - g_signal_emit_by_name (controller, "cancelled"); - } -@@ -282,11 +281,6 @@ nautilus_rename_file_popover_controller_new (NautilusFile *target_file, - G_CALLBACK (target_file_on_changed), - self); - -- g_signal_connect (rename_file_popover, -- "unmap", -- (GCallback) gtk_widget_destroy, -- NULL); -- - g_signal_connect (name_entry, - "key-press-event", - G_CALLBACK (name_entry_on_key_pressed), -@@ -357,7 +351,7 @@ nautilus_rename_file_popover_controller_finalize (GObject *object) - self->closed_handler_id = 0; - } - gtk_popover_popdown (GTK_POPOVER (self->rename_file_popover)); -- self->rename_file_popover = NULL; -+ g_clear_pointer (&self->rename_file_popover, gtk_widget_destroy); - } - - if (self->file_changed_handler_id != 0) --- -2.16.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-11 20:41:16 UTC (rev 318650) +++ PKGBUILD 2018-03-11 20:42:11 UTC (rev 318651) @@ -3,35 +3,26 @@ pkgbase=nautilus pkgname=(nautilus libnautilus-extension) -pkgver=3.26.2 -pkgrel=3 +pkgver=3.27.92.1+7+gd316f4d09 +pkgrel=1 pkgdesc="Default file manager for GNOME" url="https://wiki.gnome.org/Apps/Nautilus" arch=(x86_64) license=(GPL) -depends=(libexif gnome-desktop exempi gvfs dconf tracker nautilus-sendto gnome-autoar) +depends=(libgexiv2 gnome-desktop gvfs dconf tracker nautilus-sendto gnome-autoar) makedepends=(gobject-introspection packagekit git gtk-doc meson) options=(!emptydirs) -_commit=51637bc0960002b811e1c0c7be8671cf9a1cc5be # tags/3.26.2^0 +_commit=d316f4d0926db2f5316c07f11f61c5ce832bfe18 # master source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit" - "git+https://git.gnome.org/browse/libgd" - 0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch) + "git+https://git.gnome.org/browse/libgd") sha256sums=('SKIP' - 'SKIP' - 'de644c2426a96e595bd93daef1db1716dc4d9680af2b6884db9518d29ea7eaac') + 'SKIP') prepare() { - mkdir -p build libne/usr/{lib,share} cd $pkgbase - # https://gitlab.gnome.org/GNOME/nautilus/issues/25 - git cherry-pick -n d74e1a3d 9238456b - - # https://gitlab.gnome.org/GNOME/nautilus/issues/216 - patch -Np1 -i ../0001-rename-file-popover-controller-Don-t-destroy-the-pop.patch - git submodule init - git config --local submodule.libgd.url "$srcdir/libgd" + git config --local submodule.subprojects/libgd.url "$srcdir/libgd" git submodule update } @@ -41,13 +32,8 @@ } build() { - cd build - arch-meson ../$pkgbase \ - -Denable-exif=true \ - -Denable-xmp=true \ - -Denable-gtk-doc=true \ - -Denable-selinux=false - ninja + arch-meson $pkgbase build -D docs=true + ninja -C build } package_nautilus() { @@ -54,19 +40,18 @@ depends+=(libnautilus-extension) groups=(gnome) - cd build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install ### Split libnautilus-extension - cd ../libne - mv "$pkgdir"/usr/include usr - mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} usr/lib - mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} usr/share + mkdir -p libne/{lib,share} + mv "$pkgdir"/usr/include libne + mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} libne/lib + mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} libne/share } package_libnautilus-extension() { pkgdesc="Library for extending the $pkgdesc" depends=(gtk3) - mv libne/usr "$pkgdir" + mv libne "$pkgdir/usr" }