[arch-commits] Commit in nautilus/repos (10 files)
Jan de Groot
jgc at archlinux.org
Thu Dec 11 11:37:14 UTC 2014
Date: Thursday, December 11, 2014 @ 12:37:13
Author: jgc
Revision: 227439
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nautilus/repos/extra-i686/PKGBUILD
(from rev 227438, nautilus/trunk/PKGBUILD)
nautilus/repos/extra-i686/force-desktop-fix.patch
(from rev 227438, nautilus/trunk/force-desktop-fix.patch)
nautilus/repos/extra-i686/nautilus.install
(from rev 227438, nautilus/trunk/nautilus.install)
nautilus/repos/extra-x86_64/PKGBUILD
(from rev 227438, nautilus/trunk/PKGBUILD)
nautilus/repos/extra-x86_64/force-desktop-fix.patch
(from rev 227438, nautilus/trunk/force-desktop-fix.patch)
nautilus/repos/extra-x86_64/nautilus.install
(from rev 227438, nautilus/trunk/nautilus.install)
Deleted:
nautilus/repos/extra-i686/PKGBUILD
nautilus/repos/extra-i686/nautilus.install
nautilus/repos/extra-x86_64/PKGBUILD
nautilus/repos/extra-x86_64/nautilus.install
--------------------------------------+
/PKGBUILD | 116 +++++++++++++++++++++++++++++++++
/nautilus.install | 28 +++++++
extra-i686/PKGBUILD | 55 ---------------
extra-i686/force-desktop-fix.patch | 38 ++++++++++
extra-i686/nautilus.install | 14 ---
extra-x86_64/PKGBUILD | 55 ---------------
extra-x86_64/force-desktop-fix.patch | 38 ++++++++++
extra-x86_64/nautilus.install | 14 ---
8 files changed, 220 insertions(+), 138 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-12-11 11:37:03 UTC (rev 227438)
+++ extra-i686/PKGBUILD 2014-12-11 11:37:13 UTC (rev 227439)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=3.14.2
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(libexif gnome-desktop exempi gvfs desktop-file-utils dconf
- libtracker-sparql libnotify nautilus-sendto)
-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')
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-build() {
- cd $pkgbase-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nautilus \
- --disable-update-mimedb \
- --disable-schemas-compile
- make
-}
-
-package_nautilus() {
- depends+=(libnautilus-extension)
- groups=(gnome)
- install=nautilus.install
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
-
-### Split libnautilus-extension
- cd ..
- mkdir -p n-e/usr/{lib,share}
- mv "$pkgdir"/usr/include n-e/usr
- mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
- mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
- mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
-}
-
-package_libnautilus-extension() {
- pkgdesc="Library for extending the $pkgdesc"
- depends=(gtk3)
-
- mv n-e/* "$pkgdir"
-}
Copied: nautilus/repos/extra-i686/PKGBUILD (from rev 227438, nautilus/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-12-11 11:37:13 UTC (rev 227439)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.14.2
+pkgrel=2
+pkgdesc="GNOME file manager"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(libexif gnome-desktop exempi gvfs desktop-file-utils dconf
+ libtracker-sparql libnotify nautilus-sendto)
+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
+ force-desktop-fix.patch)
+sha256sums=('b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5'
+ '3478b6ec1b5dec9cc86c94d6eb5a79881103d008b1bc40e4edb39f5179d89a74')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../force-desktop-fix.patch
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --libexecdir=/usr/lib/nautilus \
+ --disable-update-mimedb \
+ --disable-schemas-compile
+ make
+}
+
+package_nautilus() {
+ depends+=(libnautilus-extension)
+ groups=(gnome)
+ install=nautilus.install
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+### Split libnautilus-extension
+ cd ..
+ mkdir -p n-e/usr/{lib,share}
+ mv "$pkgdir"/usr/include n-e/usr
+ mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
+ mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
+ mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
+}
+
+package_libnautilus-extension() {
+ pkgdesc="Library for extending the $pkgdesc"
+ depends=(gtk3)
+
+ mv n-e/* "$pkgdir"
+}
Copied: nautilus/repos/extra-i686/force-desktop-fix.patch (from rev 227438, nautilus/trunk/force-desktop-fix.patch)
===================================================================
--- extra-i686/force-desktop-fix.patch (rev 0)
+++ extra-i686/force-desktop-fix.patch 2014-12-11 11:37:13 UTC (rev 227439)
@@ -0,0 +1,38 @@
+From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <carlos.sorian89 at gmail.com>
+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
+
Deleted: extra-i686/nautilus.install
===================================================================
--- extra-i686/nautilus.install 2014-12-11 11:37:03 UTC (rev 227438)
+++ extra-i686/nautilus.install 2014-12-11 11:37:13 UTC (rev 227439)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: nautilus/repos/extra-i686/nautilus.install (from rev 227438, nautilus/trunk/nautilus.install)
===================================================================
--- extra-i686/nautilus.install (rev 0)
+++ extra-i686/nautilus.install 2014-12-11 11:37:13 UTC (rev 227439)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-12-11 11:37:03 UTC (rev 227438)
+++ extra-x86_64/PKGBUILD 2014-12-11 11:37:13 UTC (rev 227439)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=3.14.2
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(libexif gnome-desktop exempi gvfs desktop-file-utils dconf
- libtracker-sparql libnotify nautilus-sendto)
-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')
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-build() {
- cd $pkgbase-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/nautilus \
- --disable-update-mimedb \
- --disable-schemas-compile
- make
-}
-
-package_nautilus() {
- depends+=(libnautilus-extension)
- groups=(gnome)
- install=nautilus.install
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
-
-### Split libnautilus-extension
- cd ..
- mkdir -p n-e/usr/{lib,share}
- mv "$pkgdir"/usr/include n-e/usr
- mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
- mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
- mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
-}
-
-package_libnautilus-extension() {
- pkgdesc="Library for extending the $pkgdesc"
- depends=(gtk3)
-
- mv n-e/* "$pkgdir"
-}
Copied: nautilus/repos/extra-x86_64/PKGBUILD (from rev 227438, nautilus/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-12-11 11:37:13 UTC (rev 227439)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.14.2
+pkgrel=2
+pkgdesc="GNOME file manager"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(libexif gnome-desktop exempi gvfs desktop-file-utils dconf
+ libtracker-sparql libnotify nautilus-sendto)
+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
+ force-desktop-fix.patch)
+sha256sums=('b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5'
+ '3478b6ec1b5dec9cc86c94d6eb5a79881103d008b1bc40e4edb39f5179d89a74')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../force-desktop-fix.patch
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --libexecdir=/usr/lib/nautilus \
+ --disable-update-mimedb \
+ --disable-schemas-compile
+ make
+}
+
+package_nautilus() {
+ depends+=(libnautilus-extension)
+ groups=(gnome)
+ install=nautilus.install
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+### Split libnautilus-extension
+ cd ..
+ mkdir -p n-e/usr/{lib,share}
+ mv "$pkgdir"/usr/include n-e/usr
+ mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
+ mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
+ mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
+}
+
+package_libnautilus-extension() {
+ pkgdesc="Library for extending the $pkgdesc"
+ depends=(gtk3)
+
+ mv n-e/* "$pkgdir"
+}
Copied: nautilus/repos/extra-x86_64/force-desktop-fix.patch (from rev 227438, nautilus/trunk/force-desktop-fix.patch)
===================================================================
--- extra-x86_64/force-desktop-fix.patch (rev 0)
+++ extra-x86_64/force-desktop-fix.patch 2014-12-11 11:37:13 UTC (rev 227439)
@@ -0,0 +1,38 @@
+From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <carlos.sorian89 at gmail.com>
+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
+
Deleted: extra-x86_64/nautilus.install
===================================================================
--- extra-x86_64/nautilus.install 2014-12-11 11:37:03 UTC (rev 227438)
+++ extra-x86_64/nautilus.install 2014-12-11 11:37:13 UTC (rev 227439)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: nautilus/repos/extra-x86_64/nautilus.install (from rev 227438, nautilus/trunk/nautilus.install)
===================================================================
--- extra-x86_64/nautilus.install (rev 0)
+++ extra-x86_64/nautilus.install 2014-12-11 11:37:13 UTC (rev 227439)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list