[arch-commits] Commit in nautilus-actions/repos (6 files)

Balló György bgyorgy at archlinux.org
Sat Jan 21 15:19:42 UTC 2017


    Date: Saturday, January 21, 2017 @ 15:19:41
  Author: bgyorgy
Revision: 208267

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nautilus-actions/repos/community-i686/PKGBUILD
    (from rev 208266, nautilus-actions/trunk/PKGBUILD)
  nautilus-actions/repos/community-i686/drop-libunique3.patch
    (from rev 208266, nautilus-actions/trunk/drop-libunique3.patch)
  nautilus-actions/repos/community-x86_64/PKGBUILD
    (from rev 208266, nautilus-actions/trunk/PKGBUILD)
  nautilus-actions/repos/community-x86_64/drop-libunique3.patch
    (from rev 208266, nautilus-actions/trunk/drop-libunique3.patch)
Deleted:
  nautilus-actions/repos/community-i686/PKGBUILD
  nautilus-actions/repos/community-x86_64/PKGBUILD

----------------------------------------+
 /PKGBUILD                              |  104 +++++++++++++++++++++++++++++++
 community-i686/PKGBUILD                |   43 ------------
 community-i686/drop-libunique3.patch   |   76 ++++++++++++++++++++++
 community-x86_64/PKGBUILD              |   43 ------------
 community-x86_64/drop-libunique3.patch |   76 ++++++++++++++++++++++
 5 files changed, 256 insertions(+), 86 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-01-21 15:19:35 UTC (rev 208266)
+++ community-i686/PKGBUILD	2017-01-21 15:19:41 UTC (rev 208267)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Roman Kyrylych <roman at archlinux.org>
-# Contributor: Tor Krill <tor at krill.nu>
-
-pkgname=nautilus-actions
-pkgver=3.2.4
-pkgrel=2
-pkgdesc="Configures programs to be launched when files are selected in Nautilus"
-arch=('i686' 'x86_64')
-url="http://git.gnome.org/browse/nautilus-actions"
-license=('GPL')
-depends=('nautilus' 'libunique3' 'libgtop' 'libsm' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'python')
-source=(http://www.nautilus-actions.org/downloads/$pkgname-$pkgver.tar.gz)
-sha1sums=('bfa90e86ff0624d345962a9add71d3b2e8bb2047')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-              --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Install GConf schemas
-  mkdir -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
-                     "$pkgdir"/usr/share/nautilus-actions/gconf-schemas/*.schemas
-  rm -r "$pkgdir/usr/share/nautilus-actions/gconf-schemas/"
-
-  # Remove redundant documentation
-  rm -r "$pkgdir/usr/share/doc/"
-}

Copied: nautilus-actions/repos/community-i686/PKGBUILD (from rev 208266, nautilus-actions/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-01-21 15:19:41 UTC (rev 208267)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: Tor Krill <tor at krill.nu>
+
+pkgname=nautilus-actions
+pkgver=3.2.4
+pkgrel=3
+pkgdesc="Configures programs to be launched when files are selected in Nautilus"
+arch=('i686' 'x86_64')
+url="http://git.gnome.org/browse/nautilus-actions"
+license=('GPL')
+depends=('nautilus' 'libgtop' 'libsm' 'gconf')
+makedepends=('intltool' 'gnome-doc-utils' 'python')
+source=(http://www.nautilus-actions.org/downloads/$pkgname-$pkgver.tar.gz
+        drop-libunique3.patch)
+sha1sums=('bfa90e86ff0624d345962a9add71d3b2e8bb2047'
+          '0bd84d150a0b610459f98bd8e3dc2d55e52f1860')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Remove libunique3 dependency
+  patch -Np1 -i ../drop-libunique3.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package(){
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Install GConf schemas
+  mkdir -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
+                     "$pkgdir"/usr/share/nautilus-actions/gconf-schemas/*.schemas
+  rm -r "$pkgdir/usr/share/nautilus-actions/gconf-schemas/"
+
+  # Remove redundant documentation
+  rm -r "$pkgdir/usr/share/doc/"
+}

Copied: nautilus-actions/repos/community-i686/drop-libunique3.patch (from rev 208266, nautilus-actions/trunk/drop-libunique3.patch)
===================================================================
--- community-i686/drop-libunique3.patch	                        (rev 0)
+++ community-i686/drop-libunique3.patch	2017-01-21 15:19:41 UTC (rev 208267)
@@ -0,0 +1,76 @@
+diff -Naur nautilus-actions-3.2.4.orig/src/nact/base-iunique.c nautilus-actions-3.2.4/src/nact/base-iunique.c
+--- nautilus-actions-3.2.4.orig/src/nact/base-iunique.c	2014-05-01 11:03:27.000000000 +0200
++++ nautilus-actions-3.2.4/src/nact/base-iunique.c	2017-01-21 16:13:08.203356184 +0100
+@@ -33,7 +33,6 @@
+ 
+ #include <glib/gi18n.h>
+ #include <string.h>
+-#include <unique/unique.h>
+ 
+ #include "base-iunique.h"
+ #include "base-window.h"
+@@ -47,8 +46,8 @@
+ /* pseudo-properties, set against the instance
+  */
+ typedef struct {
+-	gchar     *unique_app_name;
+-	UniqueApp *handle;
++	gchar        *unique_app_name;
++	GApplication *handle;
+ }
+ 	IUniqueData;
+ 
+@@ -165,7 +164,6 @@
+ 	data = get_iunique_data( instance );
+ 
+ 	if( data->handle ){
+-		g_return_if_fail( UNIQUE_IS_APP( data->handle ));
+ 		g_object_unref( data->handle );
+ 	}
+ 
+@@ -173,12 +171,6 @@
+ 	g_free( data );
+ }
+ 
+-/*
+- * Relying on libunique to detect if another instance is already running.
+- *
+- * A replacement is available with GLib 2.28 in GApplication, but only
+- * GLib 2.30 (Fedora 16) provides a "non-unique" capability.
+- */
+ gboolean
+ base_iunique_init_with_name( BaseIUnique *instance, const gchar *unique_app_name )
+ {
+@@ -197,11 +189,11 @@
+ 
+ 	if( unique_app_name && strlen( unique_app_name )){
+ 
+-			data->handle = unique_app_new( unique_app_name, NULL );
+-			is_first = !unique_app_is_running( data->handle );
++			data->handle = g_application_new (unique_app_name, 0);
++			g_application_register (data->handle, NULL, NULL);
++			is_first = !g_application_get_is_remote( data->handle );
+ 
+ 			if( !is_first ){
+-				unique_app_send_message( data->handle, UNIQUE_ACTIVATE, NULL );
+ 				/* i18n: application name */
+ 				msg = g_strdup_printf(
+ 						_( "Another instance of %s is already running.\n"
+@@ -210,17 +202,6 @@
+ 				base_window_display_error_dlg( NULL, _( "The application is not unique" ), msg );
+ 				g_free( msg );
+ 				ret = FALSE;
+-#if 0
+-			/* default from libunique is actually to activate the first window
+-			 * so we rely on the default..
+-			 */
+-			} else {
+-				g_signal_connect(
+-						data->handle,
+-						"message-received",
+-						G_CALLBACK( on_unique_message_received ),
+-						instance );
+-#endif
+ 			} else {
+ 				data->unique_app_name = g_strdup( unique_app_name );
+ 			}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-01-21 15:19:35 UTC (rev 208266)
+++ community-x86_64/PKGBUILD	2017-01-21 15:19:41 UTC (rev 208267)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Roman Kyrylych <roman at archlinux.org>
-# Contributor: Tor Krill <tor at krill.nu>
-
-pkgname=nautilus-actions
-pkgver=3.2.4
-pkgrel=2
-pkgdesc="Configures programs to be launched when files are selected in Nautilus"
-arch=('i686' 'x86_64')
-url="http://git.gnome.org/browse/nautilus-actions"
-license=('GPL')
-depends=('nautilus' 'libunique3' 'libgtop' 'libsm' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'python')
-source=(http://www.nautilus-actions.org/downloads/$pkgname-$pkgver.tar.gz)
-sha1sums=('bfa90e86ff0624d345962a9add71d3b2e8bb2047')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-              --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Install GConf schemas
-  mkdir -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
-                     "$pkgdir"/usr/share/nautilus-actions/gconf-schemas/*.schemas
-  rm -r "$pkgdir/usr/share/nautilus-actions/gconf-schemas/"
-
-  # Remove redundant documentation
-  rm -r "$pkgdir/usr/share/doc/"
-}

Copied: nautilus-actions/repos/community-x86_64/PKGBUILD (from rev 208266, nautilus-actions/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-01-21 15:19:41 UTC (rev 208267)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: Tor Krill <tor at krill.nu>
+
+pkgname=nautilus-actions
+pkgver=3.2.4
+pkgrel=3
+pkgdesc="Configures programs to be launched when files are selected in Nautilus"
+arch=('i686' 'x86_64')
+url="http://git.gnome.org/browse/nautilus-actions"
+license=('GPL')
+depends=('nautilus' 'libgtop' 'libsm' 'gconf')
+makedepends=('intltool' 'gnome-doc-utils' 'python')
+source=(http://www.nautilus-actions.org/downloads/$pkgname-$pkgver.tar.gz
+        drop-libunique3.patch)
+sha1sums=('bfa90e86ff0624d345962a9add71d3b2e8bb2047'
+          '0bd84d150a0b610459f98bd8e3dc2d55e52f1860')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Remove libunique3 dependency
+  patch -Np1 -i ../drop-libunique3.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package(){
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Install GConf schemas
+  mkdir -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
+                     "$pkgdir"/usr/share/nautilus-actions/gconf-schemas/*.schemas
+  rm -r "$pkgdir/usr/share/nautilus-actions/gconf-schemas/"
+
+  # Remove redundant documentation
+  rm -r "$pkgdir/usr/share/doc/"
+}

Copied: nautilus-actions/repos/community-x86_64/drop-libunique3.patch (from rev 208266, nautilus-actions/trunk/drop-libunique3.patch)
===================================================================
--- community-x86_64/drop-libunique3.patch	                        (rev 0)
+++ community-x86_64/drop-libunique3.patch	2017-01-21 15:19:41 UTC (rev 208267)
@@ -0,0 +1,76 @@
+diff -Naur nautilus-actions-3.2.4.orig/src/nact/base-iunique.c nautilus-actions-3.2.4/src/nact/base-iunique.c
+--- nautilus-actions-3.2.4.orig/src/nact/base-iunique.c	2014-05-01 11:03:27.000000000 +0200
++++ nautilus-actions-3.2.4/src/nact/base-iunique.c	2017-01-21 16:13:08.203356184 +0100
+@@ -33,7 +33,6 @@
+ 
+ #include <glib/gi18n.h>
+ #include <string.h>
+-#include <unique/unique.h>
+ 
+ #include "base-iunique.h"
+ #include "base-window.h"
+@@ -47,8 +46,8 @@
+ /* pseudo-properties, set against the instance
+  */
+ typedef struct {
+-	gchar     *unique_app_name;
+-	UniqueApp *handle;
++	gchar        *unique_app_name;
++	GApplication *handle;
+ }
+ 	IUniqueData;
+ 
+@@ -165,7 +164,6 @@
+ 	data = get_iunique_data( instance );
+ 
+ 	if( data->handle ){
+-		g_return_if_fail( UNIQUE_IS_APP( data->handle ));
+ 		g_object_unref( data->handle );
+ 	}
+ 
+@@ -173,12 +171,6 @@
+ 	g_free( data );
+ }
+ 
+-/*
+- * Relying on libunique to detect if another instance is already running.
+- *
+- * A replacement is available with GLib 2.28 in GApplication, but only
+- * GLib 2.30 (Fedora 16) provides a "non-unique" capability.
+- */
+ gboolean
+ base_iunique_init_with_name( BaseIUnique *instance, const gchar *unique_app_name )
+ {
+@@ -197,11 +189,11 @@
+ 
+ 	if( unique_app_name && strlen( unique_app_name )){
+ 
+-			data->handle = unique_app_new( unique_app_name, NULL );
+-			is_first = !unique_app_is_running( data->handle );
++			data->handle = g_application_new (unique_app_name, 0);
++			g_application_register (data->handle, NULL, NULL);
++			is_first = !g_application_get_is_remote( data->handle );
+ 
+ 			if( !is_first ){
+-				unique_app_send_message( data->handle, UNIQUE_ACTIVATE, NULL );
+ 				/* i18n: application name */
+ 				msg = g_strdup_printf(
+ 						_( "Another instance of %s is already running.\n"
+@@ -210,17 +202,6 @@
+ 				base_window_display_error_dlg( NULL, _( "The application is not unique" ), msg );
+ 				g_free( msg );
+ 				ret = FALSE;
+-#if 0
+-			/* default from libunique is actually to activate the first window
+-			 * so we rely on the default..
+-			 */
+-			} else {
+-				g_signal_connect(
+-						data->handle,
+-						"message-received",
+-						G_CALLBACK( on_unique_message_received ),
+-						instance );
+-#endif
+ 			} else {
+ 				data->unique_app_name = g_strdup( unique_app_name );
+ 			}



More information about the arch-commits mailing list