Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/nautilus-open-terminal/files: nautilus-open-terminal-0.9-gnomevfs.patch
Date: Sat, 28 Mar 2009 22:40:09
Message-Id: E1LnhCB-0004Zi-Qc@stork.gentoo.org
1 eva 09/03/28 22:40:07
2
3 Added: nautilus-open-terminal-0.9-gnomevfs.patch
4 Log:
5 Bump to 0.9-r2. inherit autotools, bug #263886. Fix compilation with gnome 2.26, bug #261914.
6 (Portage version: 2.2_rc26/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 gnome-extra/nautilus-open-terminal/files/nautilus-open-terminal-0.9-gnomevfs.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/nautilus-open-terminal/files/nautilus-open-terminal-0.9-gnomevfs.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/nautilus-open-terminal/files/nautilus-open-terminal-0.9-gnomevfs.patch?rev=1.1&content-type=text/plain
13
14 Index: nautilus-open-terminal-0.9-gnomevfs.patch
15 ===================================================================
16 ---
17 https://bugs.gentoo.org/show_bug.cgi?id=261914
18 http://svn.gnome.org/viewvc/nautilus-open-terminal?view=revision&revision=217
19
20 Fix building with gnome 2.26 libs.
21 diff --git a/configure.in b/configure.in
22 index 6b4da94..88edc6a 100644
23 --- a/configure.in
24 +++ b/configure.in
25 @@ -13,6 +13,7 @@ NAUTILUS_REQUIRED=2.21.2
26 EEL_REQUIRED=2.6.0
27 LIBGNOME_DESKTOP_REQUIRED=2.9.91
28 GLIB_REQUIRED=2.4.0
29 +GNOMEVFS_REQUIRED=2.0
30
31 AC_PROG_CC
32 AM_PROG_LIBTOOL
33 @@ -29,6 +30,7 @@ fi
34 PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED glib-2.0 >= $GLIB_REQUIRED)
35 PKG_CHECK_MODULES(GCONF, gconf-2.0)
36 PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
37 +PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED)
38
39 PKG_CHECK_MODULES(GLIB_RECENT, glib-2.0 >= 2.13.3,
40 AC_DEFINE(HAVE_GLIB_DESKTOP_DIR_API, 1, [g_get_user_special_dir() support]),
41 @@ -42,6 +44,9 @@ AC_SUBST(NAUTILUS_LIBS)
42 AC_SUBST(GCONF_CFLAGS)
43 AC_SUBST(GCONF_LIBS)
44
45 +AC_SUBST(GNOMEVFS_CFLAGS)
46 +AC_SUBST(GNOMEVFS_LIBS)
47 +
48 AC_SUBST(GNOMEDESKTOP_CFLAGS)
49 AC_SUBST(GNOMEDESKTOP_LIBS)
50
51 diff --git a/src/Makefile.am b/src/Makefile.am
52 index 3161190..f25795a 100644
53 --- a/src/Makefile.am
54 +++ b/src/Makefile.am
55 @@ -9,6 +9,7 @@ INCLUDES = \
56 $(DISABLE_DEPRECATED_CFLAGS) \
57 $(NAUTILUS_CFLAGS) \
58 $(GCONF_CFLAGS) \
59 + $(GNOMEVFS_CFLAGS) \
60 $(GNOMEDESKTOP_CFLAGS)
61
62 nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)