Fixed the libexif patch to correctly detect no verison of libexif installed, see bug #70789

3 files changed, 32 insertions, 23 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 22fb0c5d50fd..a5a48d030ca6 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2004/11/10 02:44:38 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.108 2004/11/11 17:44:33 obz Exp $
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  files/nautilus-2-libexif.patch:
+  Fixed the libexif patch to correctly detect no verison of libexif installed,
+  see bug #70789
 
   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
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f8432789239c..563c2715abed 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -4,7 +4,7 @@ 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 5716522297a31edfbd44d85cf1dba0dc ChangeLog 14497
+MD5 c07260a5b1c6d2cccc265b198177d326 ChangeLog 14674
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 56ddbe0af5ce30f6be59b656fed8ed3a nautilus-2.8.0.ebuild 2711
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
@@ -28,8 +28,8 @@ 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 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
-MD5 1efb9ab62c55b394112ea11cc0d740c6 files/nautilus-2-libexif.patch 1654
 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 17a27d5da6fc0545c43731d5ca7c37cd files/nautilus-2-libexif.patch 2320
 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
index 4c85023d223e..2ff13fa42cb1 100644
--- a/gnome-base/nautilus/files/nautilus-2-libexif.patch
+++ b/gnome-base/nautilus/files/nautilus-2-libexif.patch
@@ -1,12 +1,14 @@
---- acconfig.h
-+++ acconfig.h
+diff -ur nautilus-2.8.0/acconfig.h nautilus-2.8.0-newpatch/acconfig.h
+--- nautilus-2.8.0/acconfig.h	2003-10-14 23:28:25.000000000 +0800
++++ nautilus-2.8.0-newpatch/acconfig.h	2004-11-11 17:02:43.170940312 +0800
 @@ -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
+diff -ur nautilus-2.8.0/components/image_properties/nautilus-image-properties-view.c nautilus-2.8.0-newpatch/components/image_properties/nautilus-image-properties-view.c
+--- nautilus-2.8.0/components/image_properties/nautilus-image-properties-view.c	2004-03-09 19:23:37.000000000 +0800
++++ nautilus-2.8.0-newpatch/components/image_properties/nautilus-image-properties-view.c	2004-11-11 17:02:43.171940160 +0800
 @@ -124,13 +124,20 @@
  exif_content_callback (ExifContent *content, gpointer data)
  {
@@ -28,9 +30,10 @@
  	if (attribute->value != NULL) {
  		attribute->found = TRUE;
  	}
---- configure.in
-+++ configure.in
-@@ -228,12 +227,17 @@
+diff -ur nautilus-2.8.0/configure.in nautilus-2.8.0-newpatch/configure.in
+--- nautilus-2.8.0/configure.in	2004-09-13 16:45:08.000000000 +0800
++++ nautilus-2.8.0-newpatch/configure.in	2004-11-11 17:03:13.662304920 +0800
+@@ -228,11 +228,19 @@
  
  AC_MSG_CHECKING(for libExif)
  
@@ -39,18 +42,19 @@
 -  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)
-+])])
++PKG_CHECK_MODULES(EXIF, libexif > 0.5.12, have_new_exif=yes, have_new_exif=no)
++if test "x$have_new_exif" = "xyes"; then
++	AC_DEFINE(HAVE_EXIF,1)
++	AC_SUBST(EXIF_CFLAGS)
++	AC_SUBST(EXIF_LIBS)
++else
++	PKG_CHECK_MODULES(EXIF, libexif = 0.5.12, have_old_exif=yes, have_old_exif=no)
++	if test "x$have_old_exif" = "xyes"; then
++		AC_DEFINE(HAVE_EXIF,1)
++		AC_DEFINE(HAVE_OLD_EXIF,1)
++		AC_SUBST(EXIF_CFLAGS)
++		AC_SUBST(EXIF_LIBS)
++	fi
+ fi
  
  dnl ==========================================================================
-