[arch-commits] Commit in gksu/repos (3 files)

[Jan de Groot]

    Date: Friday, July 18, 2008 @ 17:19:51
  Author: jgc
Revision: 5575

Merged revisions 5573-5574 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gksu/trunk

........
  r5574 | jgc | 2008-07-18 21:19:34 +0000 (Fri, 18 Jul 2008) | 2 lines
  
  Add missing patches
........

Added:
  gksu/repos/extra-i686/16_fix_ftbfs.patch
    (from rev 5574, gksu/trunk/16_fix_ftbfs.patch)
  gksu/repos/extra-i686/20_move_to_extensions-2.0.patch
    (from rev 5574, gksu/trunk/20_move_to_extensions-2.0.patch)
Modified:
  gksu/repos/extra-i686/	(properties)

---------------------------------+
 16_fix_ftbfs.patch              |   12 ++++++++++++
 20_move_to_extensions-2.0.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+)


Property changes on: gksu/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gksu/trunk:1-5572
   + /gksu/trunk:1-5574

Copied: gksu/repos/extra-i686/16_fix_ftbfs.patch (from rev 5574, gksu/trunk/16_fix_ftbfs.patch)
===================================================================
--- extra-i686/16_fix_ftbfs.patch	                        (rev 0)
+++ extra-i686/16_fix_ftbfs.patch	2008-07-18 21:19:51 UTC (rev 5575)
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/configure.ac gksu-2.0.0.new/configure.ac
+--- gksu-2.0.0/configure.ac	2008-04-04 20:04:14.000000000 +0200
++++ gksu-2.0.0.new/configure.ac	2008-04-04 20:05:12.000000000 +0200
+@@ -66,7 +66,7 @@
+ AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes)
+ 
+ if test x$enable_nautilus_extension = xyes; then
+-   PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++   PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension, gnome-vfs-2.0])
+ fi
+ 
+ AC_CONFIG_FILES([

Copied: gksu/repos/extra-i686/20_move_to_extensions-2.0.patch (from rev 5574, gksu/trunk/20_move_to_extensions-2.0.patch)
===================================================================
--- extra-i686/20_move_to_extensions-2.0.patch	                        (rev 0)
+++ extra-i686/20_move_to_extensions-2.0.patch	2008-07-18 21:19:51 UTC (rev 5575)
@@ -0,0 +1,24 @@
+diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/nautilus-gksu/Makefile.am gksu-2.0.0.new/nautilus-gksu/Makefile.am
+--- gksu-2.0.0/nautilus-gksu/Makefile.am	2006-09-15 10:45:10.000000000 +0800
++++ gksu-2.0.0.new/nautilus-gksu/Makefile.am	2008-04-12 15:45:47.000000000 +0800
+@@ -2,7 +2,7 @@
+ INCLUDES = ${NAUTILUS_CFLAGS}
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+ 
+-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
++nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
+diff -Nur -x '*.orig' -x '*~' gksu-2.0.0/nautilus-gksu/Makefile.in gksu-2.0.0.new/nautilus-gksu/Makefile.in
+--- gksu-2.0.0/nautilus-gksu/Makefile.in	2006-09-24 04:23:10.000000000 +0800
++++ gksu-2.0.0.new/nautilus-gksu/Makefile.in	2008-04-12 15:45:53.000000000 +0800
+@@ -241,7 +241,7 @@
+ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${NAUTILUS_CFLAGS}
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0
++nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined