Applied patch for building with libexif-0.6.10

4 files changed, 100 insertions, 33 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/Manifest b/gnome-base/nautilus/Manifest
index 89d67b092251..72805721cc9f 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,34 +1,35 @@
-MD5 f250c20d33bf82a7bc4adea72acfd1de ChangeLog 14311
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 c850bb5568f05caabc233989b82acdd7 nautilus-1.0.6-r9.ebuild 3404
 MD5 666ced824d4d7a4c8cbd7fe0b550db35 nautilus-2.6.1.ebuild 2369
-MD5 b895718bc0b4715522971180e30c5cf6 nautilus-2.6.0.ebuild 2363
-MD5 4832dda31e70f02d519882327b43ecb6 nautilus-2.6.3.ebuild 2734
 MD5 e9bb531321dc38a8351e22267dc06220 nautilus-2.4.2.ebuild 2090
+MD5 c850bb5568f05caabc233989b82acdd7 nautilus-1.0.6-r9.ebuild 3404
+MD5 4832dda31e70f02d519882327b43ecb6 nautilus-2.6.3.ebuild 2734
+MD5 b895718bc0b4715522971180e30c5cf6 nautilus-2.6.0.ebuild 2363
 MD5 a67cd136892af33c8eba094604ce0f4b nautilus-2.6.3-r1.ebuild 3013
-MD5 30784b957cf837208856ae47399ff8c9 nautilus-2.8.0.ebuild 2746
-MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
-MD5 404b6778dc9a6be0f00f197099fe2870 files/digest-nautilus-2.6.1 68
-MD5 9a42848d2be57a20167878a2996c5ec5 files/digest-nautilus-2.6.0 68
-MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
-MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
-MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
-MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-MD5 63d8d3d2f44b839065888ee8338f5f46 files/nautilus-2-disable-cdda.patch 314
-MD5 4792b2819e2384304f5a63008db5b9f6 files/nautilus-2-icon_view_gst_audio_preview.patch 8305
-MD5 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
+MD5 5716522297a31edfbd44d85cf1dba0dc ChangeLog 14497
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 94f17862ef673909c346a395712cf072 nautilus-2.8.0.ebuild 2710
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
 MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
-MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
-MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
+MD5 4792b2819e2384304f5a63008db5b9f6 files/nautilus-2-icon_view_gst_audio_preview.patch 8305
 MD5 65769439a2d335132210b34a49905531 files/nautilus-2.4-startup-bonobo.patch 677
-MD5 c861bf86a79aeaaa7c642b216769a087 files/digest-nautilus-2.4.2 68
 MD5 4970e67a919b0043dcd12623014a9aac files/nautilus-2.6-icon_view_gst_audio_preview.patch 8284
-MD5 82c26fdedf3faa3e09f91cf43035a4db files/nautilus-2.4-remove_deprecation_flags.patch 1162
-MD5 eacb36058242d4b79c6b36a12133823b files/digest-nautilus-2.6.3 68
+MD5 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
 MD5 eacb36058242d4b79c6b36a12133823b files/digest-nautilus-2.6.3-r1 68
+MD5 63d8d3d2f44b839065888ee8338f5f46 files/nautilus-2-disable-cdda.patch 314
+MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
+MD5 001005b2812396e74d726f1497eeb68b files/nautilus-2.6.3-libexif-0.6.patch 749
+MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
+MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
+MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
+MD5 82c26fdedf3faa3e09f91cf43035a4db files/nautilus-2.4-remove_deprecation_flags.patch 1162
 MD5 65b7efad740c9746ecb13c770e1ad52d files/nautilus-2.6.3-novolumes.patch 4607
+MD5 c861bf86a79aeaaa7c642b216769a087 files/digest-nautilus-2.4.2 68
+MD5 9a42848d2be57a20167878a2996c5ec5 files/digest-nautilus-2.6.0 68
+MD5 404b6778dc9a6be0f00f197099fe2870 files/digest-nautilus-2.6.1 68
+MD5 eacb36058242d4b79c6b36a12133823b files/digest-nautilus-2.6.3 68
 MD5 ba6864f5fd16f269567214a308a87a5d files/digest-nautilus-2.8.0 68
-MD5 001005b2812396e74d726f1497eeb68b files/nautilus-2.6.3-libexif-0.6.patch 749
+MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
+MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
+MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
+MD5 a224909240bfb29f80c5d62d1e25e458 files/nautilus-2-libexif.patch 1834
 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
 MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
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
 
 }