| 1 |
tetromino 12/04/07 23:55:39 |
| 2 |
|
| 3 |
Added: gksu-2.0.2-glib-2.31.patch |
| 4 |
gksu-2.0.2-nautilus-dir.patch |
| 5 |
Log: |
| 6 |
Fix nautilus extension directoryfor nautilus-3. Add patch for building with >=glib-2.31 (thanks to biohazrd for reporting in bug #401437 comment #1). Add some missing dependencies. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gksu-2.0.2-glib-2.31.patch |
| 17 |
=================================================================== |
| 18 |
From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 20 |
Date: Sat, 7 Apr 2012 17:57:36 -0400 |
| 21 |
Subject: [PATCH] Fix glib includes for building with >=glib-2.31 |
| 22 |
|
| 23 |
glib-2.31 and newer no longer allow most glib subheaders to be included |
| 24 |
directly. |
| 25 |
|
| 26 |
https://savannah.nongnu.org/bugs/index.php?36127 |
| 27 |
--- |
| 28 |
nautilus-gksu/libnautilus-gksu.c | 2 +- |
| 29 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 30 |
|
| 31 |
diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c |
| 32 |
index 8e44d29..4acf3f8 100644 |
| 33 |
--- a/nautilus-gksu/libnautilus-gksu.c |
| 34 |
+++ b/nautilus-gksu/libnautilus-gksu.c |
| 35 |
@@ -5,7 +5,7 @@ |
| 36 |
#include <string.h> |
| 37 |
#include <pthread.h> |
| 38 |
|
| 39 |
-#include <glib/gkeyfile.h> |
| 40 |
+#include <glib.h> |
| 41 |
#include <gtk/gtk.h> |
| 42 |
#include <gio/gio.h> |
| 43 |
#include <libnautilus-extension/nautilus-extension-types.h> |
| 44 |
-- |
| 45 |
1.7.8.5 |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: gksu-2.0.2-nautilus-dir.patch |
| 56 |
=================================================================== |
| 57 |
From d7ee2b46dad2070982b035a3136ccbb5787e9ed4 Mon Sep 17 00:00:00 2001 |
| 58 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 59 |
Date: Sat, 7 Apr 2012 19:39:03 -0400 |
| 60 |
Subject: [PATCH] Fix nautilus extensions directory for nautilus-3 |
| 61 |
|
| 62 |
The gksu nautilus extension works with both nautilus-2 and nautilus-3, |
| 63 |
so we should not assume that the extension is always installed in |
| 64 |
/usr/lib/nautilus/extensions-2.0 |
| 65 |
|
| 66 |
https://savannah.nongnu.org/bugs/index.php?36129 |
| 67 |
--- |
| 68 |
configure.ac | 14 +++++++++++++- |
| 69 |
nautilus-gksu/Makefile.am | 2 +- |
| 70 |
2 files changed, 14 insertions(+), 2 deletions(-) |
| 71 |
|
| 72 |
diff --git a/configure.ac b/configure.ac |
| 73 |
index 21d33bb..d65c586 100644 |
| 74 |
--- a/configure.ac |
| 75 |
+++ b/configure.ac |
| 76 |
@@ -64,9 +64,21 @@ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test x$use_libtool = xyes) |
| 77 |
|
| 78 |
AC_ARG_ENABLE(nautilus-extension, [ --enable-nautilus-extension Build the nautilus extensions module [default=yes]], enable_nautilus_extension="$enableval", enable_nautilus_extension=yes) |
| 79 |
AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes) |
| 80 |
+AC_ARG_WITH(nautilus-extensions-dir, |
| 81 |
+ AS_HELP_STRING([--with-nautilus-extension-dir=DIR], |
| 82 |
+ [Directory where nautilus extensions have to be installed (usually /usr/lib/nautilus/extensions-2.0 or -3.0)])) |
| 83 |
|
| 84 |
if test x$enable_nautilus_extension = xyes; then |
| 85 |
- PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension]) |
| 86 |
+ PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension]) |
| 87 |
+ if test "x$with_nautilus_extension_dir" = x; then |
| 88 |
+ AC_MSG_CHECKING([for Nautilus extensions directory]) |
| 89 |
+ with_nautilus_extension_dir=`pkg-config --variable=extensiondir libnautilus-extension` |
| 90 |
+ if test "x$with_nautilus_extension_dir" = x; then |
| 91 |
+ AC_MSG_ERROR([not found. You can specify the extensions directory manually using --with-nautilus-extension-dir=DIR]) |
| 92 |
+ fi |
| 93 |
+ AC_MSG_RESULT($with_nautilus_extension_dir) |
| 94 |
+ fi |
| 95 |
+ AC_SUBST(NAUTILUS_EXTENSION_DIR, [$with_nautilus_extensios_dir]) |
| 96 |
fi |
| 97 |
|
| 98 |
AC_CONFIG_FILES([ |
| 99 |
diff --git a/nautilus-gksu/Makefile.am b/nautilus-gksu/Makefile.am |
| 100 |
index 3a70c78..cbe4d00 100644 |
| 101 |
--- a/nautilus-gksu/Makefile.am |
| 102 |
+++ b/nautilus-gksu/Makefile.am |
| 103 |
@@ -2,7 +2,7 @@ AM_CFLAGS = -g -O2 -Wall |
| 104 |
INCLUDES = ${NAUTILUS_CFLAGS} |
| 105 |
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" |
| 106 |
|
| 107 |
-nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0 |
| 108 |
+nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) |
| 109 |
nautilus_extension_LTLIBRARIES = libnautilus-gksu.la |
| 110 |
libnautilus_gksu_la_SOURCES = libnautilus-gksu.c |
| 111 |
libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined |
| 112 |
-- |
| 113 |
1.7.8.5 |
Archives