Fix build with newer lcms

3 files changed, 57 insertions, 4 deletions

diff --git a/graphics/lprof/distinfo b/graphics/lprof/distinfo
index 3badc72cf02..85d88f9129e 100644
--- a/graphics/lprof/distinfo
+++ b/graphics/lprof/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/05/12 10:53:14 joerg Exp $
+$NetBSD: distinfo,v 1.4 2011/12/22 16:31:15 joerg Exp $
 
 SHA1 (lprof-1.10.1.tar.gz) = ad7cc5fff5d6dfff9d0993d201232d7bb71a46aa
 RMD160 (lprof-1.10.1.tar.gz) = d4a20cffe42a2ca12a1321a2e6013756e447300f
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = 24fe5629f7f02b4c737b5cbbe81edff01c5a33e9
 SHA1 (patch-ad) = 48c7e62c4bed40607dfce8dfb557f172d2c9b85a
 SHA1 (patch-ae) = 95ea6012a05500ad6ef0c919ac8d818b23ddc6a7
 SHA1 (patch-af) = 4858e11e9905beb95bb89949c6a03067babf8c9a
-SHA1 (patch-ag) = 1bf152ed9a49437fb574842d8be1f29a7c29fdc6
+SHA1 (patch-ag) = b6fcbffc42a5d2621c48b3f42c7b9da99294ce41
+SHA1 (patch-src_liblprof_lcmsprf.h) = c87f25db911674f5939844dc0f56fe70bd1cd12a
diff --git a/graphics/lprof/patches/patch-ag b/graphics/lprof/patches/patch-ag
index fbfc0526ec5..54920c130f9 100644
--- a/graphics/lprof/patches/patch-ag
+++ b/graphics/lprof/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2006/05/12 10:53:14 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2011/12/22 16:31:16 joerg Exp $
 
---- src/qtMeasurementTool/qtiffio.cpp.orig	2006-05-06 12:25:32.000000000 +0000
+--- src/qtMeasurementTool/qtiffio.cpp.orig	2005-08-20 01:11:52.000000000 +0000
 +++ src/qtMeasurementTool/qtiffio.cpp
 @@ -17,6 +17,7 @@
  // 
@@ -10,3 +10,34 @@ $NetBSD: patch-ag,v 1.1 2006/05/12 10:53:14 joerg Exp $
  #include <sys/mman.h>
  
  #include <tiffio.h>
+@@ -69,19 +70,6 @@ static toff_t tiff_size(thandle_t handle
+   return iod->size();
+ }
+ 
+-//! QIODevice / libtiff mmap wrapper
+-/*! \warning always returns MAP_FAILED.
+-*/
+-static int tiff_mmap(thandle_t handle,tdata_t* data,toff_t* size) {
+-  return (int) MAP_FAILED;
+-}
+-
+-//! QIODevice / libtiff write wrapper
+-/*! \warning because you can't mmap, this is a dummy.
+-*/
+-static void tiff_unmap(thandle_t handle, tdata_t data, toff_t size) {
+-}
+-
+ //! QImageIO read handler for TIFF files.
+ //
+ static void read_tiff_image(QImageIO *iio) {
+@@ -103,8 +91,8 @@ static void read_tiff_image(QImageIO *ii
+                            tiff_seek,
+                            tiff_close,
+                            tiff_size,
+-                           tiff_mmap,
+-                           tiff_unmap );
++                           NULL,
++                           NULL );
+   
+   if(tif) {
+     unsigned width, height,size;
diff --git a/graphics/lprof/patches/patch-src_liblprof_lcmsprf.h b/graphics/lprof/patches/patch-src_liblprof_lcmsprf.h
new file mode 100644
index 00000000000..f0ad08695d2
--- /dev/null
+++ b/graphics/lprof/patches/patch-src_liblprof_lcmsprf.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_liblprof_lcmsprf.h,v 1.1 2011/12/22 16:31:16 joerg Exp $
+
+--- src/liblprof/lcmsprf.h.orig	2005-09-03 17:36:02.000000000 +0000
++++ src/liblprof/lcmsprf.h
+@@ -37,7 +37,7 @@ the same distribution terms that you use
+ 
+ #ifndef __cmsprf_H
+ 
+-#include "lcms.h"
++#include <lcms.h>
+ #include <ctype.h>
+ #include <limits.h>
+ #include <stdarg.h>
+@@ -58,6 +58,7 @@ extern "C" {
+ #define max(a,b) ((a) > (b)?(a):(b))
+ #endif
+ 
++#define BOOL LCMSBOOL
+ 
+ /* Matrix operations - arbitrary size ----------------------------------------------------- */
+