summaryrefslogtreecommitdiffstats
path: root/src/qtimageformats-1.patch
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2014-02-06 15:34:20 (GMT)
committerMark Brand <mabrand@mabrand.nl>2014-02-06 15:34:20 (GMT)
commitef2799c07b0e1ea9da573aa5cf51fca117532efb (patch)
tree8ef65e73bc1701a52a4aa01d2f6ba9e9c638d54b /src/qtimageformats-1.patch
parenta4eedb746561139f4742178f3e4ee52e13680725 (diff)
downloadmxe-ef2799c07b0e1ea9da573aa5cf51fca117532efb.zip
mxe-ef2799c07b0e1ea9da573aa5cf51fca117532efb.tar.gz
mxe-ef2799c07b0e1ea9da573aa5cf51fca117532efb.tar.bz2
update qt5 modules
Diffstat (limited to 'src/qtimageformats-1.patch')
-rw-r--r--src/qtimageformats-1.patch39
1 files changed, 6 insertions, 33 deletions
diff --git a/src/qtimageformats-1.patch b/src/qtimageformats-1.patch
index c1477eb..30e5fcd 100644
--- a/src/qtimageformats-1.patch
+++ b/src/qtimageformats-1.patch
@@ -1,10 +1,10 @@
This file is part of MXE.
See index.html for further information.
-From fd1717af4dd33e3ea270ec97d7f7e5e3a61021da Mon Sep 17 00:00:00 2001
+From 44d6697bd01bbd489c90d3a0f64cd8ecfcb29eb3 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
+Subject: [PATCH 1/2] add pkg-config support for libtiff-4
Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd
@@ -37,13 +37,13 @@ index 353e3f3..fa22141 100644
} else {
include($$PWD/../../../3rdparty/libtiff.pri)
--
-1.8.4
+1.8.4.5
-From a1846586160249a2debcbf113b679c9ea452b909 Mon Sep 17 00:00:00 2001
+From 8dea742660bb9d1196c4b05cf5b22fb4f4e41595 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)
+Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific)
Change-Id: I1216f35a01a974321efa2463b687c121baa22667
@@ -76,32 +76,5 @@ index cdf17c5..00cd0b3 100644
} else {
include($$PWD/../../../3rdparty/libmng.pri)
--
-1.8.4
-
-
-From 5c209558b3c4d82e59c8d5ef3cc263a8fd3bff01 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.4
+1.8.4.5