[arch-commits] Commit in nautilus/repos (8 files)
Jan de Groot
jgc at archlinux.org
Mon Mar 16 11:01:26 UTC 2015
Date: Monday, March 16, 2015 @ 12:01:26
Author: jgc
Revision: 233935
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
nautilus/repos/gnome-unstable-i686/
nautilus/repos/gnome-unstable-i686/PKGBUILD
(from rev 233934, nautilus/trunk/PKGBUILD)
nautilus/repos/gnome-unstable-i686/force-desktop-fix.patch
(from rev 233934, nautilus/trunk/force-desktop-fix.patch)
nautilus/repos/gnome-unstable-i686/nautilus.install
(from rev 233934, nautilus/trunk/nautilus.install)
nautilus/repos/gnome-unstable-x86_64/
nautilus/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 233934, nautilus/trunk/PKGBUILD)
nautilus/repos/gnome-unstable-x86_64/force-desktop-fix.patch
(from rev 233934, nautilus/trunk/force-desktop-fix.patch)
nautilus/repos/gnome-unstable-x86_64/nautilus.install
(from rev 233934, nautilus/trunk/nautilus.install)
-----------------------------------------------+
gnome-unstable-i686/PKGBUILD | 52 ++++++++++++++++++++++++
gnome-unstable-i686/force-desktop-fix.patch | 38 +++++++++++++++++
gnome-unstable-i686/nautilus.install | 14 ++++++
gnome-unstable-x86_64/PKGBUILD | 52 ++++++++++++++++++++++++
gnome-unstable-x86_64/force-desktop-fix.patch | 38 +++++++++++++++++
gnome-unstable-x86_64/nautilus.install | 14 ++++++
6 files changed, 208 insertions(+)
Copied: nautilus/repos/gnome-unstable-i686/PKGBUILD (from rev 233934, nautilus/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2015-03-16 11:01:26 UTC (rev 233935)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.15.91
+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=('abac8ad3271855f3568ead752261a90d89c203cd26c39c1aa878b06928e7489b')
+
+
+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/gnome-unstable-i686/force-desktop-fix.patch (from rev 233934, nautilus/trunk/force-desktop-fix.patch)
===================================================================
--- gnome-unstable-i686/force-desktop-fix.patch (rev 0)
+++ gnome-unstable-i686/force-desktop-fix.patch 2015-03-16 11:01:26 UTC (rev 233935)
@@ -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
+
Copied: nautilus/repos/gnome-unstable-i686/nautilus.install (from rev 233934, nautilus/trunk/nautilus.install)
===================================================================
--- gnome-unstable-i686/nautilus.install (rev 0)
+++ gnome-unstable-i686/nautilus.install 2015-03-16 11:01:26 UTC (rev 233935)
@@ -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
+}
Copied: nautilus/repos/gnome-unstable-x86_64/PKGBUILD (from rev 233934, nautilus/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2015-03-16 11:01:26 UTC (rev 233935)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.15.91
+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=('abac8ad3271855f3568ead752261a90d89c203cd26c39c1aa878b06928e7489b')
+
+
+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/gnome-unstable-x86_64/force-desktop-fix.patch (from rev 233934, nautilus/trunk/force-desktop-fix.patch)
===================================================================
--- gnome-unstable-x86_64/force-desktop-fix.patch (rev 0)
+++ gnome-unstable-x86_64/force-desktop-fix.patch 2015-03-16 11:01:26 UTC (rev 233935)
@@ -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
+
Copied: nautilus/repos/gnome-unstable-x86_64/nautilus.install (from rev 233934, nautilus/trunk/nautilus.install)
===================================================================
--- gnome-unstable-x86_64/nautilus.install (rev 0)
+++ gnome-unstable-x86_64/nautilus.install 2015-03-16 11:01:26 UTC (rev 233935)
@@ -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