Applied patch for building with libexif-0.6.10

3 files changed, 77 insertions, 11 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 9127e284965c..22fb0c5d50fd 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.106 2004/10/01 07:04:23 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.107 2004/11/10 02:44:38 obz Exp $
+
+  10 Nov 2004; Mike Gardiner <obz@gentoo.org> nautilus-2.8.0.ebuild:
+  Added a patch for building against the upcoming libexif-0.6, by doing
+  things the right way. This fixes bug #65602.
 
   01 Oct 2004; Stephen P. Becker <geoman@gentoo.org> nautilus-2.6.3.ebuild:
   stable on mips
diff --git a/gnome-base/nautilus/files/nautilus-2-libexif.patch b/gnome-base/nautilus/files/nautilus-2-libexif.patch
new file mode 100644
index 000000000000..161ef006e01c
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2-libexif.patch
@@ -0,0 +1,64 @@
+--- acconfig.h
++++ acconfig.h
+@@ -23,3 +23,4 @@
+ #define HAVE_GTK_MULTIHEAD /* needed for egg-screen-exec functions */
+ #undef HAVE_STARTUP_NOTIFICATION
+ #undef HAVE_EXIF
++#undef HAVE_OLD_EXIF
+--- components/image_properties/nautilus-image-properties-view.c
++++ components/image_properties/nautilus-image-properties-view.c
+@@ -124,13 +124,20 @@
+ exif_content_callback (ExifContent *content, gpointer data)
+ {
+ 	struct ExifAttribute *attribute;
++#if !HAVE_OLD_EXIF
++	char b[1024];
++#endif
+ 
+ 	attribute = (struct ExifAttribute *)data;
+ 	if (attribute->found) {
+ 		return;
+ 	}
+ 
++#ifdef HAVE_OLD_EXIF
+         attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
++#else
++        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, b, sizeof(b)));
++#endif
+ 	if (attribute->value != NULL) {
+ 		attribute->found = TRUE;
+ 	}
+--- configure.in
++++ configure.in
+@@ -20,7 +20,6 @@
+ RSVG_REQUIRED=2.0.1
+ XML_REQUIRED=2.4.7
+ STARTUP_NOTIFICATION_REQUIRED=0.5
+-EXIF_REQUIRED=0.5.12
+ 
+ AC_SUBST(ART_REQUIRED)
+ AC_SUBST(BONOBO_ACTIVATION_REQUIRED)
+@@ -228,12 +227,17 @@
+ 
+ AC_MSG_CHECKING(for libExif)
+ 
+-PKG_CHECK_MODULES(EXIF, libexif >= $EXIF_REQUIRED, have_exif=yes, have_exif=no)
+-if test "x$have_exif" = "xyes"; then
+-  AC_DEFINE(HAVE_EXIF,1)
+-  AC_SUBST(EXIF_CFLAGS)
+-  AC_SUBST(EXIF_LIBS)
+-fi
++PKG_CHECK_MODULES(EXIF, libexif > 0.5.12, [
++    AC_DEFINE(HAVE_EXIF, 1, [Define to 1 if you have EXIF library (libexif).])
++    AC_SUBST(EXIF_CFLAGS)
++    AC_SUBST(EXIF_LIBS)
++  ], [
++    PKG_CHECK_MODULES(EXIF, libexif = 0.5.12, [
++      AC_DEFINE(HAVE_EXIF, 1)
++      AC_DEFINE(HAVE_OLD_EXIF, 1, [Define to 1 if your EXIF library has old API.])
++      AC_SUBST(EXIF_CFLAGS)
++      AC_SUBST(EXIF_LIBS)
++])])
+ 
+ dnl ==========================================================================
+ 
diff --git a/gnome-base/nautilus/nautilus-2.8.0.ebuild b/gnome-base/nautilus/nautilus-2.8.0.ebuild
index 5cd40b00c86c..5e64433f35eb 100644
--- a/gnome-base/nautilus/nautilus-2.8.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.8.0.ebuild,v 1.3 2004/11/08 20:50:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.8.0.ebuild,v 1.4 2004/11/10 02:44:38 obz Exp $
 
 inherit gnome2 eutils
 
@@ -72,16 +72,14 @@ src_unpack() {
 	# add libgnomeprint support
 	use cups && epatch ${FILESDIR}/${PN}-2-x-printers.patch
 
-	# regenerating only needed with patching
-	if use cups || use gstreamer; then
-		WANT_AUTOCONF=2.5 autoheader || die
-		WANT_AUTOCONF=2.5 autoconf || die
-		WANT_AUTOMAKE=1.4 automake || die
-	fi
+	# patch to support libexif versions 0.5 and 0.6
+	epatch ${FILESDIR}/${PN}-2-libexif.patch
 
-	# applying patch to optionally remove volumes from the desktop,
-	# see bug #51343 <obz@gentoo.org>
-#	epatch ${FILESDIR}/${P}-novolumes.patch
+	# and we always need to regenerate now, because we
+	# always apply the libexif patch <obz@gentoo.org>
+	WANT_AUTOCONF=2.5 autoheader || die
+	WANT_AUTOCONF=2.5 autoconf || die
+	WANT_AUTOMAKE=1.4 automake || die
 
 }