# HG changeset patch # User Mark Brand # Date 1324540454 -3600 # Node ID 8d045db8706f90e43d4667223d1d3a52f50ae6ff # Parent bdd96ff135709a64b825e3bed30badbe1f74a14b update package tiff diff -r bdd96ff13570 -r 8d045db8706f src/qt-1-cherrypicks.patch --- a/src/qt-1-cherrypicks.patch Wed Dec 21 10:20:16 2011 +0100 +++ b/src/qt-1-cherrypicks.patch Thu Dec 22 08:54:14 2011 +0100 @@ -33,7 +33,7 @@ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then CFG_ICONV=yes -- -1.7.7.3 +1.7.8 From 986dc8a13a0ac35082af274427f25f11cafbfe76 Mon Sep 17 00:00:00 2001 @@ -66,7 +66,7 @@ + +#endif // CP494CODETBL_H -- -1.7.7.3 +1.7.8 From 520a67aa51bb02aad5e7f96cff3b36442ab33102 Mon Sep 17 00:00:00 2001 @@ -140,7 +140,7 @@ #endif // QT_NO_CODECS -- -1.7.7.3 +1.7.8 From 4c148f06f97bf8596b9c4a869105c7214fb245bb Mon Sep 17 00:00:00 2001 @@ -79778,7 +79778,7 @@ !embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers -- -1.7.7.3 +1.7.8 From 99a792b0373066137fe863db80a3c004a9d8789c Mon Sep 17 00:00:00 2001 @@ -79806,20 +79806,21 @@ } else { include($$PWD/../../3rdparty/libmng.pri) -- -1.7.7.3 +1.7.8 -From b9648ff155a885b2ca615c3f606e0cfc2704d54d Mon Sep 17 00:00:00 2001 +From bbbe5893c7a2e4a64c11beb4676b10a90f5e18ff Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 06/12] use pkg-config for libtiff (mingw-cross-env specific) +Subject: [PATCH 06/12] use pkg-config for libtiff-4 (mingw-cross-env + specific) --- src/gui/image/qtiffhandler.pri | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/gui/image/qtiffhandler.pri b/src/gui/image/qtiffhandler.pri -index e1cc3ee..c692ca9 100644 +index e1cc3ee..71cbab1 100644 --- a/src/gui/image/qtiffhandler.pri +++ b/src/gui/image/qtiffhandler.pri @@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD @@ -79828,16 +79829,16 @@ contains(QT_CONFIG, system-tiff) { - if(unix|win32-g++*):LIBS += -ltiff + CONFIG += link_pkgconfig -+ PKGCONFIG += libtiff ++ PKGCONFIG += libtiff-4 + if(unix|win32-g++*):LIBS *= -ltiff else:win32: LIBS += libtiff.lib } else { include($$PWD/../../3rdparty/libtiff.pri) -- -1.7.7.3 +1.7.8 -From 806e5773758bffd7a00af772994eb2b86339659d Mon Sep 17 00:00:00 2001 +From 01b98c48f31e616cf29593d08a843300e812a496 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 5 Jun 2010 23:41:04 +0200 Subject: [PATCH 07/12] restore support for static linking of QtWebKit @@ -79928,10 +79929,10 @@ build-qtscript { SUBDIRS += \ -- -1.7.7.3 +1.7.8 -From ede1b5a5efeb7e62bb5472b657dde190bb1a8f02 Mon Sep 17 00:00:00 2001 +From 9705fb3b6c79b5ce4e4933b839a04ee1d9053048 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Sep 2011 13:47:10 +0200 Subject: [PATCH 08/12] fix building on GNU/kFreeBSD (mingw-cross-specific) @@ -79961,10 +79962,10 @@ # define Q_OS_NETBSD # define Q_OS_BSD4 -- -1.7.7.3 +1.7.8 -From 03e9b78df4cccf7e8d804e9e661f85afc89cc6cb Mon Sep 17 00:00:00 2001 +From eb0ae6c2504dea9e1b3e4df3b1f420d8e78d8b2f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Sep 2011 13:49:47 +0200 Subject: [PATCH 09/12] fix missing platform when building on GNU/kFreeBSD @@ -79993,10 +79994,10 @@ PLATFORM=dgux-g++ ;; -- -1.7.7.3 +1.7.8 -From 9f10ee186e28c8f3c22af911c56b740f2821a425 Mon Sep 17 00:00:00 2001 +From 00f4ef12c2507c56bbf87df0250fc77c34a4427b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Sep 2011 13:51:50 +0200 Subject: [PATCH 10/12] fix building on dragonfly (mingw-cross-env specific) @@ -80021,10 +80022,10 @@ PLATFORM_NOTES=" - Also available for FreeBSD: freebsd-icc -- -1.7.7.3 +1.7.8 -From a78a6f534ae1db783ba444a7f33170cb3c5a43ca Mon Sep 17 00:00:00 2001 +From 15ed59fa6a060df54b0a9e59223f1c567af6d30e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 17 Nov 2011 00:57:12 +0100 Subject: [PATCH 11/12] Windows: Add gcc 4.6 for cross building @@ -80097,10 +80098,10 @@ + +#include "../../win32-g++-4.6/qplatformdefs.h" -- -1.7.7.3 +1.7.8 -From 055bc5250e7f522a3c390c1c7460e4b654714a5e Mon Sep 17 00:00:00 2001 +From 0017467dec96bbe6596fb865586ddd810598129c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 21 Nov 2011 08:56:19 +0100 Subject: [PATCH 12/12] use "cp -R" instead of "cp -r" for *bsd compatibility @@ -80123,5 +80124,5 @@ QMAKE_DEL_FILE = rm -f QMAKE_MKDIR = mkdir -p -- -1.7.7.3 +1.7.8 diff -r bdd96ff13570 -r 8d045db8706f src/tiff-1-fixes.patch --- a/src/tiff-1-fixes.patch Wed Dec 21 10:20:16 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From 17fe30e6f97895b276a1d6efe87096bb665bc5de Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Thu, 3 Nov 2011 13:49:55 +0100 -Subject: [PATCH] backported pkg-config file from libtiff 4.0.0 beta - - -diff --git a/Makefile.am b/Makefile.am -index 7069094..cb3c51e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,7 +43,8 @@ EXTRA_DIST = \ - SConstruct \ - autogen.sh \ - configure.com \ -- nmake.opt -+ nmake.opt \ -+ libtiff.pc.in - - dist_doc_DATA = $(docfiles) - -@@ -54,3 +55,5 @@ release: - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = libtiff.pc -diff --git a/configure.ac b/configure.ac -index b89f373..114aa5a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,6 +109,9 @@ case "${host_os}" in - ;; - esac - -+tiff_libs_private= -+AC_SUBST(tiff_libs_private) -+ - dnl Checks for header files. - AC_CHECK_HEADERS([assert.h fcntl.h io.h limits.h malloc.h search.h sys/time.h unistd.h]) - -@@ -373,6 +376,7 @@ fi - if test "$HAVE_ZLIB" = "yes" ; then - AC_DEFINE(ZIP_SUPPORT,1,[Support Deflate compression]) - LIBS="-lz $LIBS" -+ tiff_libs_private="-lz ${tiff_libs_private}" - - if test "$HAVE_RPATH" = "yes" -a "x$with_zlib_lib_dir" != "x" ; then - LIBDIR="-R $with_zlib_lib_dir $LIBDIR" -@@ -441,6 +445,7 @@ fi - if test "$HAVE_JPEG" = "yes" ; then - AC_DEFINE(JPEG_SUPPORT,1,[Support JPEG compression (requires IJG JPEG library)]) - LIBS="-ljpeg $LIBS" -+ tiff_libs_private="-ljpeg ${tiff_libs_private}" - - if test "$HAVE_RPATH" = "yes" -a "x$with_jpeg_lib_dir" != "x" ; then - LIBDIR="-R $with_jpeg_lib_dir $LIBDIR" -@@ -509,6 +514,7 @@ fi - if test "$HAVE_JBIG" = "yes" ; then - AC_DEFINE(JBIG_SUPPORT,1,[Support ISO JBIG compression (requires JBIG-KIT library)]) - LIBS="-ljbig $LIBS" -+ tiff_libs_private="-ljbig ${tiff_libs_private}" - - if test "$HAVE_RPATH" = "yes" -a "x$with_jbig_lib_dir" != "x" ; then - LIBDIR="-R $with_jbig_lib_dir $LIBDIR" -@@ -659,6 +665,7 @@ AC_CONFIG_FILES([Makefile \ - html/Makefile \ - html/images/Makefile \ - html/man/Makefile \ -+ libtiff.pc \ - libtiff/Makefile \ - man/Makefile \ - port/Makefile \ -diff --git a/libtiff.pc.in b/libtiff.pc.in -new file mode 100644 -index 0000000..abe75a6 ---- /dev/null -+++ b/libtiff.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libtiff -+Description: Tag Image File Format (TIFF) library. -+Version: @VERSION@ -+Libs: -L${libdir} -ltiff -+Libs.private: @tiff_libs_private@ -+Cflags: -I${includedir} --- -1.7.7 - diff -r bdd96ff13570 -r 8d045db8706f src/tiff.mk --- a/src/tiff.mk Wed Dec 21 10:20:16 2011 +0100 +++ b/src/tiff.mk Thu Dec 22 08:54:14 2011 +0100 @@ -4,8 +4,8 @@ # LibTIFF PKG := tiff $(PKG)_IGNORE := -$(PKG)_VERSION := 3.9.5 -$(PKG)_CHECKSUM := f40aab20fb2f609b5cbc1171c40b66a1445e3773 +$(PKG)_VERSION := 4.0.0 +$(PKG)_CHECKSUM := 85d85520fea40fc9291995a60e3d40cf980b5522 $(PKG)_SUBDIR := tiff-$($(PKG)_VERSION) $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.remotesensing.org/libtiff/ @@ -20,7 +20,6 @@ endef define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \