package qt: libmng 2 compatibility

1 files changed, 57 insertions, 31 deletions

diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch
index 967a035..a256c33 100644
--- a/src/qt-1-cherrypicks.patch
+++ b/src/qt-1-cherrypicks.patch
@@ -4,11 +4,10 @@ See index.html for further information.
 Commits backported (cherry-picked) from upstream branch or merge requests.
 http://qt.gitorious.org/qt
 Also contains MXE specific fixes.
-
-From 07dd00eda09c4d8bdad037fb0b47c5bc3c9c5b9c Mon Sep 17 00:00:00 2001
+From 6dfcbf0d99d76dbade4e3b427c9826e171382ca4 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:17:48 +0100
-Subject: [PATCH 01/15] remove trailing whitespace
+Subject: [PATCH 01/16] remove trailing whitespace
 
 backported from qt5/qtbase
 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
@@ -32,10 +31,10 @@ index 9090773..859ec8d 100644
 1.8.1.4
 
 
-From 2bb8b31ebc88fb0a59a8988e7ae3908211e41f87 Mon Sep 17 00:00:00 2001
+From f35425afd4ab61c9d5b806223d58292aa519997b Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 30 Jun 2011 10:22:33 +0200
-Subject: [PATCH 02/15] do not detect or configure iconv for Windows
+Subject: [PATCH 02/16] do not detect or configure iconv for Windows
 
 Qt doesn't use iconv on Windows, but configuring it will appear to
 work and the build will complete. The result is that character
@@ -66,10 +65,10 @@ index 460b446..e337dc0 100755
 1.8.1.4
 
 
-From a18496d765d41b43a44dc6596edb4d71847f9b90 Mon Sep 17 00:00:00 2001
+From 4dcf10f5beed5fbe74201f06a750bf18643dd716 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 11:43:10 +0100
-Subject: [PATCH 03/15] fix whitespace
+Subject: [PATCH 03/16] fix whitespace
 
 backported from qt5/qtbase
 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
@@ -140,10 +139,10 @@ index 859ec8d..70cd890 100644
 1.8.1.4
 
 
-From b412f830f448ee7ba5f364238d71a4b4072bbdbb Mon Sep 17 00:00:00 2001
+From b3bf93f2b38902cabdd203ad0362e3a90977e118 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Jul 2011 00:42:24 +0200
-Subject: [PATCH 04/15] build and load text codecs regardless of iconv and
+Subject: [PATCH 04/16] build and load text codecs regardless of iconv and
  platform
 
 Otherwise applications linking to static Qt may have to import
@@ -282,10 +281,10 @@ index 7c513a0..517ac87 100644
 1.8.1.4
 
 
-From e3ee716ee2295eb6cb685a9d9c218179601a6795 Mon Sep 17 00:00:00 2001
+From 73d43da5b39105d52511036c3bef3a391d0f19ae Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:24:13 +0100
-Subject: [PATCH 05/15] move plugin text codecs to QtCore
+Subject: [PATCH 05/16] move plugin text codecs to QtCore
 
 Having plugin text codecs adds considerable complexity to
 configuring Qt. The plugin interface is designed for optional
@@ -79233,10 +79232,10 @@ index 94ce675..c4af49b 100644
 1.8.1.4
 
 
-From d92f8791dec8984c42613f623a5e48f1aeab1ebb Mon Sep 17 00:00:00 2001
+From aa4d579e9393c0f9b1be42c3b37c9feb04ad42d6 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 21:01:26 +0100
-Subject: [PATCH 06/15] update private header references
+Subject: [PATCH 06/16] update private header references
 
 backported from qt5/qtbase
 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
@@ -79396,10 +79395,10 @@ index 054fbe5..c1e4689 100644
 1.8.1.4
 
 
-From 0f5e4515de61fe6c00a8a5169e65477f3e396025 Mon Sep 17 00:00:00 2001
+From 1461f769066a4e73a421f88c57f6ebd5de279f9d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 3 Jul 2011 21:53:27 +0200
-Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs
+Subject: [PATCH 07/16] cosmetic adjustments for files moved to core/codecs
 
 -update old reference to 'plugin'
 -rename multiple inclusion guards
@@ -79888,10 +79887,10 @@ index c1e4689..d5cbd74 100644
 1.8.1.4
 
 
-From e8e977e321ab075cae6b4109868d6642b7e54548 Mon Sep 17 00:00:00 2001
+From d2258c0533b501f36842f99fc7e32d44e5321fd8 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 12 Jan 2012 10:43:29 +0100
-Subject: [PATCH 08/15] remove obsolete codec plugin loading code
+Subject: [PATCH 08/16] remove obsolete codec plugin loading code
 
 backported from qt5/qtbase
 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
@@ -80425,10 +80424,10 @@ index 1642947..36c09f1 100644
 1.8.1.4
 
 
-From ec1d708e71b87739fde04fcd480ea7317ff390a0 Mon Sep 17 00:00:00 2001
+From 18bb9c4ba6b8d08af061a5465da5db16260a309d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 23 Jan 2012 23:12:46 +0100
-Subject: [PATCH 09/15] remove vestiges of text codec plugins
+Subject: [PATCH 09/16] remove vestiges of text codec plugins
 
 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
 
@@ -80459,10 +80458,10 @@ index dea05e0..12cd8ea 100644
 1.8.1.4
 
 
-From f35eab15174376cf907517b7fa12468d84decd3c Mon Sep 17 00:00:00 2001
+From 4fc126e7430559acb80a5c8891d5f237be0409b3 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 15:10:26 +0100
-Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific)
+Subject: [PATCH 10/16] use pkg-config for libmng (MXE specific)
 
 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
 
@@ -80485,10 +80484,10 @@ index ffb98de..6aab68f 100644
 1.8.1.4
 
 
-From e8fb265680c5170fd3796d86fd2fea55c7dbf95e Mon Sep 17 00:00:00 2001
+From 2e6ae6495c5ec5a52b4de2473a6a6ad7b1e0fbb2 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 14:11:02 +0100
-Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific)
+Subject: [PATCH 11/16] use pkg-config for libtiff-4 (MXE specific)
 
 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
 
@@ -80511,10 +80510,10 @@ index e1cc3ee..71cbab1 100644
 1.8.1.4
 
 
-From df24a20f268f023c1aa921366b59cf650cd71d92 Mon Sep 17 00:00:00 2001
+From 7040eedeada1f2e73e76b6ced8badd403138ed62 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 5 Jun 2010 23:41:04 +0200
-Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE
+Subject: [PATCH 12/16] restore support for static linking of QtWebKit (MXE
  specific)
 
 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
@@ -80614,10 +80613,10 @@ index 9be0f4a..6744f58 100644
 1.8.1.4
 
 
-From 67a99e7ba8cddb9257ea2d4b642191a40f70f931 Mon Sep 17 00:00:00 2001
+From 63506d7ad0ce09e8d1a28db6b76324c4a7576ed4 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:47:10 +0200
-Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific)
+Subject: [PATCH 13/16] fix building on GNU/kFreeBSD (MXE specific)
 
 This patch has been taken from:
 
@@ -80645,10 +80644,10 @@ index e914ede..d4d06c8 100644
 1.8.1.4
 
 
-From 07cdc269228ef8a728392ce7eb973dda16507c08 Mon Sep 17 00:00:00 2001
+From 7dda90d3a9e0bb86bea079a225e245f031d2de36 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:49:47 +0200
-Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD (MXE
+Subject: [PATCH 14/16] fix missing platform when building on GNU/kFreeBSD (MXE
  specific)
 
 This patch is inspired by:
@@ -80676,10 +80675,10 @@ index e54782e..707f55a 100755
 1.8.1.4
 
 
-From 9be5f8ccf1d4664f9b799696c5c343be65bde5d4 Mon Sep 17 00:00:00 2001
+From 9c9244e24c767378429c70b6b85198fd8e91718f Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:51:50 +0200
-Subject: [PATCH 15/15] fix building on dragonfly (MXE specific)
+Subject: [PATCH 15/16] fix building on dragonfly (MXE specific)
 
 This patch is inspired by:
 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
@@ -80702,3 +80701,30 @@ index 707f55a..8c48f51 100755
 -- 
 1.8.1.4
 
+
+From 780cdd78482a95a44ae204588577e150e8c34ef3 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 17 Aug 2013 20:34:36 +0200
+Subject: [PATCH 16/16] libmng 2 config.test compatibility
+
+Change-Id: I6de90a0f51087c7927bd978f605f4960d3f8ee87
+
+diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp
+index 0fbe554..2559132 100644
+--- a/config.tests/unix/libmng/libmng.cpp
++++ b/config.tests/unix/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
+