summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-02-23 17:59:49 +0000
committerjoerg <joerg@pkgsrc.org>2006-02-23 17:59:49 +0000
commit8a2ed448986985dd1afbf3f85f0574b0ccad8ecc (patch)
treea4b85d9fadef12d7e11592eafcf9c2682787540a /graphics
parent1aadb3b0e282b9a99bcad02f3bf1a8347f1f03ce (diff)
downloadpkgsrc-8a2ed448986985dd1afbf3f85f0574b0ccad8ecc.tar.gz
Use tiff from pkgsrc. Fixes Qt-STL fallout and a possible security
problem. Bump revision.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/TiffIO/Makefile8
-rw-r--r--graphics/TiffIO/distinfo3
-rw-r--r--graphics/TiffIO/patches/patch-aa89
3 files changed, 94 insertions, 6 deletions
diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index 8f4f292abcc..89f514cf99b 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/23 17:59:49 joerg Exp $
#
DISTNAME= TiffIO-110c
PKGNAME= TiffIO-1.1.0.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://artis.imag.fr/Software/TiffIO/
EXTRACT_SUFX= .tgz
@@ -28,9 +28,7 @@ do-install:
BUILD_ENV+= QTDIR="${QTDIR}"
-# XXX The package uses an included version of tiff.
-#.include "../../graphics/tiff/buildlink3.mk"
-
+.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/graphics/TiffIO/distinfo b/graphics/TiffIO/distinfo
index 3beaac2b0ad..9fe757e4b23 100644
--- a/graphics/TiffIO/distinfo
+++ b/graphics/TiffIO/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/09 15:47:34 gdt Exp $
+$NetBSD: distinfo,v 1.2 2006/02/23 17:59:49 joerg Exp $
SHA1 (TiffIO-110c.tgz) = 061b291c7b123b8936ba1d52989fd44c422dbd94
RMD160 (TiffIO-110c.tgz) = d8f6c17f6669887bfea0cc8cf1dca1855298b41a
Size (TiffIO-110c.tgz) = 826601 bytes
+SHA1 (patch-aa) = 09ebe7b537112f3782eb42c8bc88453ec65fae3e
diff --git a/graphics/TiffIO/patches/patch-aa b/graphics/TiffIO/patches/patch-aa
new file mode 100644
index 00000000000..affe90a215c
--- /dev/null
+++ b/graphics/TiffIO/patches/patch-aa
@@ -0,0 +1,89 @@
+$NetBSD: patch-aa,v 1.1 2006/02/23 17:59:50 joerg Exp $
+
+--- TiffIO.pri.orig 2006-02-23 02:30:46.000000000 +0100
++++ TiffIO.pri
+@@ -23,11 +23,7 @@
+ CONFIG -= debug_and_release debug_and_release_target
+ CONFIG += qt
+
+-isEmpty(TIFF): TIFF=$$(TIFF)
+-isEmpty(TIFF): TIFF=libtiff-3.7.2
+-message( +++++ Using TIFF $${TIFF} )
+-!exists( $$TIFF/tiffio.h ) : error( Unable to find libtiff )
+-INCLUDEPATH = $$TIFF $$INCLUDEPATH
++INCLUDEPATH = $${PREFIX}/include $$INCLUDEPATH
+ INCLUDEPATH -= /usr/include
+
+ #Note: All *_SUPPORT flags are set inside tif_config.h
+@@ -40,70 +36,10 @@ win32: !jpeg: CONFIG += no-jpeg
+ # (that generates link error on Qt4/nmake compiles).
+ DEFINES += TIF_PLATFORM_CONSOLE=1
+
+-HEADERS += \
+- $$TIFF/tiffio.h
+-
+ SOURCES += \
+ TiffIO.cpp
+
+-##############################################################################
+-# Auto detect, for linux, if a tiff plateform was required
+-
+-linux: !exists( $$TIFF/tif_aux.c ) : CONFIG += libtiff
+-!libtiff {
+- message( +++++ Using internal $$TIFF sources )
+-
+- HEADERS += \
+- $$TIFF/tiff.h \
+- $$TIFF/tiffiop.h \
+- $$TIFF/tiffvers.h \
+- $$TIFF/tif_config.h
+-
+- SOURCES += \
+- $$TIFF/tif_aux.c \
+- $$TIFF/tif_close.c \
+- $$TIFF/tif_codec.c \
+- $$TIFF/tif_color.c \
+- $$TIFF/tif_compress.c \
+- $$TIFF/tif_dir.c \
+- $$TIFF/tif_dirinfo.c \
+- $$TIFF/tif_dirread.c \
+- $$TIFF/tif_dirwrite.c \
+- $$TIFF/tif_dumpmode.c \
+- $$TIFF/tif_error.c \
+- $$TIFF/tif_extension.c \
+- $$TIFF/tif_fax3.c \
+- $$TIFF/tif_fax3sm.c \
+- $$TIFF/tif_flush.c \
+- $$TIFF/tif_getimage.c \
+- $$TIFF/tif_luv.c \
+- $$TIFF/tif_next.c \
+- $$TIFF/tif_open.c \
+- $$TIFF/tif_packbits.c \
+- $$TIFF/tif_predict.c \
+- $$TIFF/tif_print.c \
+- $$TIFF/tif_read.c \
+- $$TIFF/tif_strip.c \
+- $$TIFF/tif_swab.c \
+- $$TIFF/tif_thunder.c \
+- $$TIFF/tif_tile.c \
+- $$TIFF/tif_version.c \
+- $$TIFF/tif_warning.c \
+- $$TIFF/tif_write.c
+-
+- !no-zlib: SOURCES += $$TIFF/tif_zip.c $$TIFF/tif_pixarlog.c
+- no-zlib: DEFINES += NO_ZLIB=1
+- !no-lzw: SOURCES += $$TIFF/tif_lzw.c
+- no-lzw: DEFINES += NO_LZW=1
+- !no-jpeg: SOURCES += $$TIFF/tif_jpeg.c
+- no-jpeg: DEFINES += NO_JPEG=1
+-
+- win32: SOURCES += $$TIFF/tif_win32.c
+- unix : SOURCES += $$TIFF/tif_unix.c
+-} else {
+- message( Using system Tiff )
+- LIBS *= -ltiff
+-}
++LIBS *= -ltiff
+
+ ##############################################################################
+ # Auto-detect Qt3 or Qt4 support mode...