Date: Thursday, December 11, 2014 @ 12:37:03 Author: jgc Revision: 227438
upgpkg: nautilus 3.14.2-2 Fix desktop icons Added: nautilus/trunk/force-desktop-fix.patch Modified: nautilus/trunk/PKGBUILD -------------------------+ PKGBUILD | 9 ++++++--- force-desktop-fix.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-12-11 09:19:38 UTC (rev 227437) +++ PKGBUILD 2014-12-11 11:37:03 UTC (rev 227438) @@ -4,7 +4,7 @@ pkgbase=nautilus pkgname=(nautilus libnautilus-extension) pkgver=3.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME file manager" arch=(i686 x86_64) license=(GPL) @@ -13,11 +13,14 @@ makedepends=(intltool gobject-introspection python python2 packagekit) url="http://www.gnome.org"; options=('!emptydirs') -source=(http://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) -sha256sums=('b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5') +source=(http://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz + force-desktop-fix.patch) +sha256sums=('b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5' + '3478b6ec1b5dec9cc86c94d6eb5a79881103d008b1bc40e4edb39f5179d89a74') prepare() { cd $pkgbase-$pkgver + patch -Np1 -i ../force-desktop-fix.patch } build() { Added: force-desktop-fix.patch =================================================================== --- force-desktop-fix.patch (rev 0) +++ force-desktop-fix.patch 2014-12-11 11:37:03 UTC (rev 227438) @@ -0,0 +1,38 @@ +From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001 +From: Carlos Soriano <[email protected]> +Date: Fri, 5 Dec 2014 17:57:19 +0100 +Subject: nautilus-application: Parse force-desktop before exiting + +In commit ae4d4960 we introduced a regression that a new window was +openned if both --no-default-window and --force-desktop options were +used. + +To avoid that, activate those options before actually skipping the +activate of the application if --no-default-window option is provided. + +The application nornally would exit if --no-default-window is provided +and the show-desktop-window is not activated, but, we rely on a the +detail that activating the open-desktop action when --force-desktop is +provided as a option, creates a new window, which makes the application +keep alive. + +https://bugzilla.gnome.org/show_bug.cgi?id=741166 + +diff --git a/src/nautilus-application.c b/src/nautilus-application.c +index f26c8c7..c336a39 100644 +--- a/src/nautilus-application.c ++++ b/src/nautilus-application.c +@@ -930,7 +930,9 @@ nautilus_application_handle_local_options (GApplication *application, + self->priv->desktop_override = TRUE; + g_action_group_activate_action (G_ACTION_GROUP (application), + "close-desktop", NULL); +- } else if (g_variant_dict_contains (options, "no-default-window")) { ++ } ++ ++ if (g_variant_dict_contains (options, "no-default-window")) { + /* We want to avoid trigering the activate signal; so no window is created. + * GApplication doesn't call activate if we return a value >= 0. + * Use EXIT_SUCCESS since is >= 0. */ +-- +cgit v0.10.1 +
