summaryrefslogtreecommitdiffstats
path: root/src/qtimageformats-1.patch
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2013-11-30 09:32:39 (GMT)
committerMark Brand <mabrand@mabrand.nl>2013-11-30 10:03:06 (GMT)
commit43a92a6a070d9b0931033d658b6a9a2314ee1c0c (patch)
treeb6e56bcc6e6b5e0c28965c6c6dc21f4fe8ddb75b /src/qtimageformats-1.patch
parenta6c4d0b7c953d6798ce468b1756bee52c4551b08 (diff)
downloadmxe-43a92a6a070d9b0931033d658b6a9a2314ee1c0c.zip
mxe-43a92a6a070d9b0931033d658b6a9a2314ee1c0c.tar.gz
mxe-43a92a6a070d9b0931033d658b6a9a2314ee1c0c.tar.bz2
qt5 packages: rename patch files
We only have single patches exported from git for these packages.
Diffstat (limited to 'src/qtimageformats-1.patch')
-rw-r--r--src/qtimageformats-1.patch107
1 files changed, 107 insertions, 0 deletions
diff --git a/src/qtimageformats-1.patch b/src/qtimageformats-1.patch
new file mode 100644
index 0000000..9a23ea7
--- /dev/null
+++ b/src/qtimageformats-1.patch
@@ -0,0 +1,107 @@
+This file is part of MXE.
+See index.html for further information.
+
+From f6906f5cb744554a985f6ecbb55a49dd2883d531 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 3 Nov 2011 14:11:02 +0100
+Subject: [PATCH 1/3] add pkg-config support for libtiff-4
+
+Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd
+
+diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
+index 47a8437..bd2c6b0 100644
+--- a/config.tests/libtiff/libtiff.pro
++++ b/config.tests/libtiff/libtiff.pro
+@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+ win32:CONFIG += console
+-unix|win32-g++*: LIBS += -ltiff
++CONFIG += link_pkgconfig
++packagesExist(libtiff-4):PKGCONFIG += libtiff-4
++else:if(unix|win32-g++*): LIBS += -ltiff
+ else:win32: LIBS += libtiff.lib
+diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
+index 353e3f3..fa22141 100644
+--- a/src/plugins/imageformats/tiff/tiff.pro
++++ b/src/plugins/imageformats/tiff/tiff.pro
+@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp
+ OTHER_FILES += tiff.json
+
+ config_libtiff {
+- unix|win32-g++*: LIBS += -ltiff
++ CONFIG += link_pkgconfig
++ packagesExist(libtiff-4):PKGCONFIG += libtiff-4
++ else:if(unix|win32-g++*): LIBS += -ltiff
+ else:win32: LIBS += libtiff.lib
+ } else {
+ include($$PWD/../../../3rdparty/libtiff.pri)
+--
+1.8.1.4
+
+
+From 3c300d849fbe41368aedbf8d9c8052a170dfd108 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 19 Dec 2012 23:29:52 +0100
+Subject: [PATCH 2/3] add pkg-config support for libmng (mxe-specific)
+
+Change-Id: I1216f35a01a974321efa2463b687c121baa22667
+
+diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
+index 7a45825..a20a0a0 100644
+--- a/config.tests/libmng/libmng.pro
++++ b/config.tests/libmng/libmng.pro
+@@ -2,5 +2,7 @@ SOURCES = libmng.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+ win32:CONFIG += console
+-unix|win32-g++*: LIBS += -lmng
++CONFIG += link_pkgconfig
++packagesExist(libmng):PKGCONFIG += libmng
++else:if(unix|win32-g++*): LIBS += -lmng
+ else:win32: LIBS += libmng.lib
+diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri
+index cdf17c5..00cd0b3 100644
+--- a/src/plugins/imageformats/mng/qmnghandler.pri
++++ b/src/plugins/imageformats/mng/qmnghandler.pri
+@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD
+ HEADERS += $$PWD/qmnghandler_p.h
+ SOURCES += $$PWD/qmnghandler.cpp
+ config_libmng {
+- unix|win32-g++*: LIBS += -lmng
++ CONFIG += link_pkgconfig
++ packagesExist(libmng):PKGCONFIG += libmng
++ else:if(unix|win32-g++*): LIBS += -lmng
+ else:win32: LIBS += libmng.lib
+ } else {
+ include($$PWD/../../../3rdparty/libmng.pri)
+--
+1.8.1.4
+
+
+From a6398a7029a455f6c4878d18210e4bf7a782ddfd Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 17 Aug 2013 18:08:22 +0200
+Subject: [PATCH 3/3] libmng 2 config.test compatibility
+
+Change-Id: I62903256590faf1f1d3d07265b96a6597f912fc2
+
+diff --git a/config.tests/libmng/libmng.cpp b/config.tests/libmng/libmng.cpp
+index 9def33e..266dd71 100644
+--- a/config.tests/libmng/libmng.cpp
++++ b/config.tests/libmng/libmng.cpp
+@@ -46,9 +46,11 @@ int main(int, char **)
+ mng_handle hMNG;
+ mng_cleanup(&hMNG);
+
++#ifdef MNG_VERSION_MAJOR
+ #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)
+ #error System libmng version is less than 1.0.9; using built-in version instead.
+ #endif
++#endif
+
+ return 0;
+ }
+--
+1.8.1.4
+