| 1 |
eva 08/10/11 15:18:48 |
| 2 |
|
| 3 |
Added: nautilus-2.20.0-exempi.patch |
| 4 |
nautilus-2.22.5.1-exempi.patch |
| 5 |
Log: |
| 6 |
Fix exempi automagic detection, bug #206041 in preparation of bug #185689. |
| 7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64, RepoMan options: --force) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nautilus-2.20.0-exempi.patch |
| 16 |
=================================================================== |
| 17 |
--- configure.in.old 2008-07-04 17:51:51.000000000 +0200 |
| 18 |
+++ configure.in 2008-07-04 18:00:12.000000000 +0200 |
| 19 |
@@ -255,13 +255,23 @@ |
| 20 |
|
| 21 |
dnl exempi checking |
| 22 |
|
| 23 |
-PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [ |
| 24 |
- AM_CONDITIONAL(HAVE_EXEMPI, true) |
| 25 |
- AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support]) |
| 26 |
- ], [AM_CONDITIONAL(HAVE_EXEMPI, false)]) |
| 27 |
+AM_CONDITIONAL(HAVE_EXEMPI, false) |
| 28 |
+AC_ARG_ENABLE(xmp, |
| 29 |
+ AC_HELP_STRING([--disable-xmp], |
| 30 |
+ [build without xmp support])) |
| 31 |
+msg_xmp=no |
| 32 |
+if test "x$enable_xmp" != "xno"; then |
| 33 |
+ PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [ |
| 34 |
+ AM_CONDITIONAL(HAVE_EXEMPI, true) |
| 35 |
+ AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support]) |
| 36 |
+ ] |
| 37 |
+ msg_xmp=yes, |
| 38 |
+ [AM_CONDITIONAL(HAVE_EXEMPI, false)]) |
| 39 |
+ |
| 40 |
|
| 41 |
-AC_SUBST(EXEMPI_CFLAGS) |
| 42 |
-AC_SUBST(EXEMPI_LIBS) |
| 43 |
+ AC_SUBST(EXEMPI_CFLAGS) |
| 44 |
+ AC_SUBST(EXEMPI_LIBS) |
| 45 |
+fi |
| 46 |
|
| 47 |
dnl ========================================================================== |
| 48 |
dnl search implementations |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: nautilus-2.22.5.1-exempi.patch |
| 58 |
=================================================================== |
| 59 |
--- configure.in.old 2008-07-04 17:51:51.000000000 +0200 |
| 60 |
+++ configure.in 2008-07-04 18:00:12.000000000 +0200 |
| 61 |
@@ -255,16 +255,26 @@ |
| 62 |
|
| 63 |
dnl exempi checking |
| 64 |
|
| 65 |
-PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [ |
| 66 |
- AM_CONDITIONAL(HAVE_EXEMPI, true) |
| 67 |
- AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support]) |
| 68 |
- ], [AM_CONDITIONAL(HAVE_EXEMPI, false)]) |
| 69 |
+AM_CONDITIONAL(HAVE_EXEMPI, false) |
| 70 |
|
| 71 |
-PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi, |
| 72 |
+AC_ARG_ENABLE(xmp, |
| 73 |
+ AC_HELP_STRING([--disable-xmp], |
| 74 |
+ [build without xmp support])) |
| 75 |
+msg_xmp=no |
| 76 |
+if test "x$enable_xmp" != "xno"; then |
| 77 |
+ PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [ |
| 78 |
+ AM_CONDITIONAL(HAVE_EXEMPI, true) |
| 79 |
+ AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support]) |
| 80 |
+ ] |
| 81 |
+ msg_xmp=yes, |
| 82 |
+ [AM_CONDITIONAL(HAVE_EXEMPI, false)]) |
| 83 |
+ |
| 84 |
+ PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi, |
| 85 |
AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true) |
| 86 |
|
| 87 |
-AC_SUBST(EXEMPI_CFLAGS) |
| 88 |
-AC_SUBST(EXEMPI_LIBS) |
| 89 |
+ AC_SUBST(EXEMPI_CFLAGS) |
| 90 |
+ AC_SUBST(EXEMPI_LIBS) |
| 91 |
+fi |
| 92 |
|
| 93 |
dnl ========================================================================== |
| 94 |
dnl search implementations |
Archives