Make build against libexif-0.6.13.

5 files changed, 63 insertions, 5 deletions

diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 36250a8807d..264f2bba597 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/10/06 18:38:49 drochner Exp $
+$NetBSD: distinfo,v 1.9 2006/01/13 17:58:25 wiz Exp $
 
 SHA1 (gthumb-2.6.8.tar.gz) = 5dd338d0779e4adbe94db8c8f9813b110f054930
 RMD160 (gthumb-2.6.8.tar.gz) = f55a04b88272491199f7d153ed3364b3a9e0f637
 Size (gthumb-2.6.8.tar.gz) = 3448533 bytes
-SHA1 (patch-aa) = fd593b6157b8749cdb92bf502c01b70c090b7947
+SHA1 (patch-aa) = 05b09184f8dda2847a7658ff07add0ca382a1fcf
+SHA1 (patch-ab) = 2ae1f7031b8586a74c34026a617eec3f2b34e390
+SHA1 (patch-ac) = 4b4faf14677338e2f8bec2c9e4b62170912ed7aa
+SHA1 (patch-ad) = 9e94c7a30ea04a6aca6bae019e73a84087c0f5c4
diff --git a/graphics/gthumb/patches/patch-aa b/graphics/gthumb/patches/patch-aa
index 9cc822f4075..e7f693f123b 100644
--- a/graphics/gthumb/patches/patch-aa
+++ b/graphics/gthumb/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/11/25 18:50:31 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/13 17:58:25 wiz Exp $
 
---- data/Makefile.in.orig	2004-11-20 14:27:47.000000000 -0600
+--- data/Makefile.in.orig	2005-09-21 07:58:48.000000000 +0000
 +++ data/Makefile.in
-@@ -684,7 +684,7 @@ uninstall-man: uninstall-man1
+@@ -686,7 +686,7 @@ uninstall-man: uninstall-man1
  
  @INTLTOOL_SCHEMAS_RULE@
  
diff --git a/graphics/gthumb/patches/patch-ab b/graphics/gthumb/patches/patch-ab
new file mode 100644
index 00000000000..154972dc996
--- /dev/null
+++ b/graphics/gthumb/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2006/01/13 17:58:25 wiz Exp $
+
+--- src/dlg-jpegtran.c.orig	2005-09-21 07:56:17.000000000 +0000
++++ src/dlg-jpegtran.c
+@@ -31,10 +31,10 @@
+ #include <glade/glade.h>
+ 
+ #ifdef HAVE_LIBEXIF
+-#include <exif-data.h>
+-#include <exif-content.h>
+-#include <exif-entry.h>
+-#include <exif-utils.h>
++#include <libexif/exif-data.h>
++#include <libexif/exif-content.h>
++#include <libexif/exif-entry.h>
++#include <libexif/exif-utils.h>
+ #include "jpegutils/jpeg-data.h"
+ #endif /* HAVE_LIBEXIF */
+ 
diff --git a/graphics/gthumb/patches/patch-ac b/graphics/gthumb/patches/patch-ac
new file mode 100644
index 00000000000..ed8d3da0d67
--- /dev/null
+++ b/graphics/gthumb/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2006/01/13 17:58:25 wiz Exp $
+
+--- src/gth-exif-data-viewer.c.orig	2005-09-21 07:56:17.000000000 +0000
++++ src/gth-exif-data-viewer.c
+@@ -34,9 +34,9 @@
+ #include "image-viewer.h"
+ 
+ #ifdef HAVE_LIBEXIF
+-#include <exif-data.h>
+-#include <exif-content.h>
+-#include <exif-entry.h>
++#include <libexif/exif-data.h>
++#include <libexif/exif-content.h>
++#include <libexif/exif-entry.h>
+ #endif /* HAVE_LIBEXIF */
+ 
+ 
diff --git a/graphics/gthumb/patches/patch-ad b/graphics/gthumb/patches/patch-ad
new file mode 100644
index 00000000000..56b232d4622
--- /dev/null
+++ b/graphics/gthumb/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2006/01/13 17:58:25 wiz Exp $
+
+--- src/gth-exif-utils.h.orig	2005-09-21 07:56:17.000000000 +0000
++++ src/gth-exif-utils.h
+@@ -28,10 +28,10 @@
+ 
+ #ifdef HAVE_LIBEXIF
+ 
+-#include <exif-data.h>
+-#include <exif-content.h>
+-#include <exif-entry.h>
+-#include <exif-utils.h>
++#include <libexif/exif-data.h>
++#include <libexif/exif-content.h>
++#include <libexif/exif-entry.h>
++#include <libexif/exif-utils.h>
+ 
+ 
+ typedef enum { /*< skip >*/