summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO66
-rw-r--r--0001-Add-profile-for-cross-compilation-with-mingw-w64.patch2
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch2
-rw-r--r--0003-Use-external-ANGLE-library.patch2
-rw-r--r--0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch2
-rw-r--r--0005-Make-sure-.pc-files-are-installed-correctly.patch2
-rw-r--r--0006-Don-t-add-resource-files-to-LIBS-parameter.patch2
-rw-r--r--0007-Prevent-debug-library-names-in-pkg-config-files.patch2
-rw-r--r--0008-Fix-linking-against-shared-static-libpng.patch2
-rw-r--r--0009-Fix-linking-against-static-D-Bus.patch2
-rw-r--r--0010-Fix-linking-against-static-freetype2.patch2
-rw-r--r--0011-Fix-linking-against-static-harfbuzz.patch2
-rw-r--r--0012-Fix-linking-against-static-pcre.patch2
-rw-r--r--0013-Fix-linking-against-shared-static-MariaDB.patch8
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch6
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch4
-rw-r--r--0016-Build-dynamic-host-libraries.patch4
-rw-r--r--0017-Enable-rpath-for-build-tools.patch4
-rw-r--r--0018-Use-system-zlib-for-build-tools.patch4
-rw-r--r--0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch4
-rw-r--r--0020-Use-.dll.a-as-import-lib-extension.patch4
-rw-r--r--0021-Merge-shared-and-static-library-trees.patch4
-rw-r--r--0022-Allow-usage-of-static-version-with-CMake.patch62
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch4
-rw-r--r--0024-Fix-qt5_wrap_ui-macro.patch4
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch4
-rw-r--r--0026-Enable-and-fix-use-of-iconv.patch (renamed from 0026-Enable-anf-fix-use-of-iconv.patch)7
-rw-r--r--0027-Ignore-failing-pkg-config-test.patch4
-rw-r--r--0028-Include-uiviewsettingsinterop.h-correctly.patch4
-rw-r--r--0029-Hardcode-linker-flags-for-libqwindows.dll.patch4
-rw-r--r--0030-Prevent-qmake-from-messing-static-lib-dependencies.patch4
-rw-r--r--PKGBUILD68
32 files changed, 162 insertions, 135 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be9812c1c77..e3b6cd421cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Feb 9 19:59:58 UTC 2017
+# Wed Mar 22 23:12:57 UTC 2017
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
pkgver = 5.8.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.qt.io/
arch = i686
arch = x86_64
@@ -57,42 +57,42 @@ pkgbase = mingw-w64-qt5-base
source = 0023-Use-correct-pkg-config-static-flag.patch
source = 0024-Fix-qt5_wrap_ui-macro.patch
source = 0025-Ignore-errors-about-missing-feature-static.patch
- source = 0026-Enable-anf-fix-use-of-iconv.patch
+ source = 0026-Enable-and-fix-use-of-iconv.patch
source = 0027-Ignore-failing-pkg-config-test.patch
source = 0028-Include-uiviewsettingsinterop.h-correctly.patch
source = 0029-Hardcode-linker-flags-for-libqwindows.dll.patch
source = 0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
md5sums = 6e1f7f6fb6333eb66e563b175c4e87e9
- md5sums = 4870da8aa8e01334f0daf09be09e7f32
- md5sums = e86ad52f472a4c4a70f9061b5474b947
- md5sums = 4c7c1df53c99182e296932d8cf398c5f
- md5sums = d18a5d3fc8570b03aed954a72b68739a
- md5sums = 685860a2ac1410c49ab82648bc24f510
- md5sums = e1a1ca7caf93e8033a1915af457b7b98
- md5sums = bd7c1c99dca91ed604c84cf9632f7e0d
- md5sums = 7fbfcbb581e07563ab87e17c33a6b48b
- md5sums = df541beb0bc0cc8054aae93f462c5923
- md5sums = 4711804aaf43ec810e70898c32948237
- md5sums = 3d4294c3279e69864fcdf87b6f852122
- md5sums = 55c3593dc03079c794e97ed88136845b
- md5sums = 5d04636091f7768b940d090178997384
- md5sums = d4cc6c6394c795a2e6708e797e49b616
- md5sums = 8e234c3b077a8f942ee9a7e8209bfc79
- md5sums = 6685fe994d64f3e1b2a4bfe6a645bb6a
- md5sums = a0fa368726934c21d3a0e8a5a61023c9
- md5sums = 3dc9e1efaed892d0eb24dfa68769d0f2
- md5sums = 53c06c4a646a9572b40982c4e29b5ce4
- md5sums = 61f4848e9e0a8a6e183458c871070a53
- md5sums = fd2e8c22fdbb3f9415ee500bde5980fc
- md5sums = 6a7539edc09f66bae5dfad7e3d210614
- md5sums = 440f7d221985abcb781a519d1bc26ee7
- md5sums = 504e6a091aa8b35a5b6b5a8c77b7d4e3
- md5sums = e85f6106f31bcd8da1213f670575941a
- md5sums = 4046dcb53c3a6c735f6d7d4b866d80a0
- md5sums = c964ad83bff270380aa5ac0991e57c10
- md5sums = 3921c665e46cbe39e012432db704089d
- md5sums = 8f47783a83f54c82650502a120af4f16
- md5sums = 2bc5f6f3d2c1cd0e2590a8e8e1cf0ff1
+ md5sums = 59cabe2d0b5646342c6cec93f7ebc074
+ md5sums = 9d45eaf425961899c40c76dbd1151204
+ md5sums = 60fc8de6d43685fc158ff705891b12ff
+ md5sums = f8da92ad83e2d0e0ebc6ead7d49dcd62
+ md5sums = f4d2daf0e914d7df8ff9ea0db778164c
+ md5sums = d198fc82d361e5a52f066e20d0f2ac1a
+ md5sums = b8a9042191146eee8898c19090e6dd79
+ md5sums = bcf6b7aa10e04c1093c801d2f2b5722b
+ md5sums = 50ef8614cb99b72b1e5cd5cb790b089e
+ md5sums = 381c9f451602c72c9a11512b41a7e725
+ md5sums = 6f2986a143d4d3fcbbf5ec6149742896
+ md5sums = 398499d79aeb1ccbdc02c4e604035ee9
+ md5sums = 94c63b114ee93f3d9892646090dceea2
+ md5sums = 01c49b3786ce8852607aeb40482c56ab
+ md5sums = 8d43ede146c545826b8667f4ebe1a92c
+ md5sums = 47e13ec0622a3af2d89768cb6c228774
+ md5sums = e08a00d918adad4734e56be6f03ba9bc
+ md5sums = 4808132cbdbc320d2e0dd26033fa245f
+ md5sums = 92afca193efe77c51fe33c209047d6c5
+ md5sums = 75ef72598c4274447b5668c791d019e4
+ md5sums = 8eb99eec735bc566847ac692bec14ce6
+ md5sums = b22a8b34e4e403256fd9cfeba5fff508
+ md5sums = 26c08be34065619f12a15b485c8c2ea3
+ md5sums = 360f6a8dae753f3649bb7bea1ca9170f
+ md5sums = ac4b80a15f9004a8f668b80fb475ddd1
+ md5sums = ccec8075e73f445fcf4c600b4b990fee
+ md5sums = 2a7a504e2b4572bef11855c8a0b2863a
+ md5sums = 963f27d8f720a91b2345cda9fe0be8cd
+ md5sums = a12368572b27f714babb720258f7b81e
+ md5sums = 3aa314937307e172c30258a82dd4ed67
pkgname = mingw-w64-qt5-base
diff --git a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
index 028bc5cfef8..70903bda828 100644
--- a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
+++ b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
@@ -303,5 +303,5 @@ index 0000000000..c5a70b1445
+
+#endif // QPLATFORMDEFS_H
--
-2.11.1
+2.12.1
diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index 3f73b4f545f..07436f981c1 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -23,5 +23,5 @@ index aad48571b3..46f44d8b91 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.11.1
+2.12.1
diff --git a/0003-Use-external-ANGLE-library.patch b/0003-Use-external-ANGLE-library.patch
index d7131af6ca4..396b5431c77 100644
--- a/0003-Use-external-ANGLE-library.patch
+++ b/0003-Use-external-ANGLE-library.patch
@@ -93,5 +93,5 @@ index 90d7e2b76c..92e89ea39f 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
-2.11.1
+2.12.1
diff --git a/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index 9ab42c0cc6e..9508bd6c0f6 100644
--- a/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -25,5 +25,5 @@ index 1a1022b3a7..792bdf9e7a 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.11.1
+2.12.1
diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch
index b2221f58bb0..57bad2288b9 100644
--- a/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -62,5 +62,5 @@ index 3c029c8004..caa000ea53 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.11.1
+2.12.1
diff --git a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 49b62779025..9da2a9dfc3a 100644
--- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -24,5 +24,5 @@ index 8d5a9a7d0f..d2cf8d9afc 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.11.1
+2.12.1
diff --git a/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index 690e8bea741..2b360f34144 100644
--- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -29,5 +29,5 @@ index 182fe79238..a762443fe2 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.11.1
+2.12.1
diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch
index 066b6249648..fdc684a5dca 100644
--- a/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/0008-Fix-linking-against-shared-static-libpng.patch
@@ -22,5 +22,5 @@ index 1f5011617c..5006ff5a3a 100644
},
"mirclient": {
--
-2.11.1
+2.12.1
diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch
index db59848868f..dd755274fc1 100644
--- a/0009-Fix-linking-against-static-D-Bus.patch
+++ b/0009-Fix-linking-against-static-D-Bus.patch
@@ -62,5 +62,5 @@ index cfc0e12046..65f1397cd6 100644
# include <dbus/dbus.h>
#else
--
-2.11.1
+2.12.1
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index bfdc43d6236..406fff4bd69 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -26,5 +26,5 @@ index 5006ff5a3a..6530357be9 100644
},
"fontconfig": {
--
-2.11.1
+2.12.1
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index cb9f7ecfc98..a4abc606219 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -25,5 +25,5 @@ index 6530357be9..c5b9b1542a 100644
},
"imf": {
--
-2.11.1
+2.12.1
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index 17d52dbb6ca..d70a5d04dd1 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -23,5 +23,5 @@ index 4a30daa72c..3d7c811124 100644
QT_BEGIN_NAMESPACE
--
-2.11.1
+2.12.1
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index 0bd7adfb93e..ebeac864229 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From acbc69f1a6d40c8a4106e4b931650b6921a40503 Mon Sep 17 00:00:00 2001
+From 889ea99f62dd010c168cce6b18f0d49fb2a48203 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/30] Fix linking against shared/static MariaDB
@@ -8,19 +8,19 @@ Subject: [PATCH 13/30] Fix linking against shared/static MariaDB
1 file changed, 3 insertions(+)
diff --git a/src/sql/configure.json b/src/sql/configure.json
-index 96c82e84f9..7219926cf5 100644
+index 96c82e84f9..fce948026f 100644
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
@@ -58,6 +58,9 @@
"label": "MySQL",
"test": "unix/mysql",
"sources": [
-+ { "libs": "-lmariadbclient -lssl -lcrypto -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
++ { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
+ { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },
+ { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },
{ "type": "mysqlConfig", "query": "--libs_r" },
{ "type": "mysqlConfig", "query": "--libs" },
{ "libs": "-lmysqlclient_r", "condition": "!config.win32" },
--
-2.11.1
+2.12.1
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index af474c80177..88dba2748e7 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From 0712fd493611c503092fe616b4bd1c75e1d5d5ee Mon Sep 17 00:00:00 2001
+From 953ca26efa1cb2e86a958c52ce737ada0078e1a3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/30] Fix linking against shared/static PostgreSQL
@@ -8,7 +8,7 @@ Subject: [PATCH 14/30] Fix linking against shared/static PostgreSQL
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/sql/configure.json b/src/sql/configure.json
-index 7219926cf5..713254b8cf 100644
+index fce948026f..f560c191fd 100644
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
@@ -72,9 +72,10 @@
@@ -25,5 +25,5 @@ index 7219926cf5..713254b8cf 100644
]
},
--
-2.11.1
+2.12.1
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index 3eae2223d77..365bfef9cb3 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From c15379dee443b353a9e1b1a5aff4301c29f3341b Mon Sep 17 00:00:00 2001
+From e81d865a144c5c12ea1b93922a8c27f676aad531 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/30] Rename qtmain to qt5main
@@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
-2.11.1
+2.12.1
diff --git a/0016-Build-dynamic-host-libraries.patch b/0016-Build-dynamic-host-libraries.patch
index 0ac1d3241e7..4c21300392b 100644
--- a/0016-Build-dynamic-host-libraries.patch
+++ b/0016-Build-dynamic-host-libraries.patch
@@ -1,4 +1,4 @@
-From 008256f455bb1e28f28cd9b492a0ecd34c05c0aa Mon Sep 17 00:00:00 2001
+From b91bb54e98627bd92ff740ed547d52febb3523d4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 16/30] Build dynamic host libraries
@@ -34,5 +34,5 @@ index c3ed27d979..30d2114aa1 100644
-INSTALLS = lib
+INSTALLS += lib
--
-2.11.1
+2.12.1
diff --git a/0017-Enable-rpath-for-build-tools.patch b/0017-Enable-rpath-for-build-tools.patch
index 8029e963014..0569dcf602f 100644
--- a/0017-Enable-rpath-for-build-tools.patch
+++ b/0017-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 25cdf3efda8669c68df7c8ad0332bdaddbf4d628 Mon Sep 17 00:00:00 2001
+From 0e79722e8c8162f87b2b765932d3507de2f20a88 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 17/30] Enable rpath for build tools
@@ -31,5 +31,5 @@ index cb84ae0da8..8d9471ed0a 100644
INSTALLS += target
--
-2.11.1
+2.12.1
diff --git a/0018-Use-system-zlib-for-build-tools.patch b/0018-Use-system-zlib-for-build-tools.patch
index 63e1b560bfa..fa5e8402954 100644
--- a/0018-Use-system-zlib-for-build-tools.patch
+++ b/0018-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 206e25be29ac115c84076a2b58bae3a6d0900eb1 Mon Sep 17 00:00:00 2001
+From 510f64af3d51b140e18cbf026cbfd4990ba973d5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 18/30] Use system zlib for build tools
@@ -21,5 +21,5 @@ index d51f9e98a4..2242b7c4f1 100644
} else {
CONFIG += no_core_dep
--
-2.11.1
+2.12.1
diff --git a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
index b849cbf70d4..7658ac08ebc 100644
--- a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@@ -1,4 +1,4 @@
-From 698d1f283e96c2d04e7482dc51bb43d43e6fd17c Mon Sep 17 00:00:00 2001
+From 12e64d649d5a01b4f878778aa6c183ceb51b28e7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:20:25 +0200
Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
@@ -22,5 +22,5 @@ index 3f266dd2a4..258d374ee0 100644
cmd_prefix = "LC_ALL=C"
cmd_suffix = "</dev/null >/dev/null"
--
-2.11.1
+2.12.1
diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch
index 0f840ab8ae7..2bd78073781 100644
--- a/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/0020-Use-.dll.a-as-import-lib-extension.patch
@@ -1,4 +1,4 @@
-From 6993d2146fb9adf79f7e1f28b44b12a2104ed71c Mon Sep 17 00:00:00 2001
+From cea6744e8b23c780033c4e5a2f51fdb0bd60153c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 20/30] Use *.dll.a as import lib extension
@@ -64,5 +64,5 @@ index caa000ea53..e6338546bb 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.11.1
+2.12.1
diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch
index 0036722c8e0..c89977019ea 100644
--- a/0021-Merge-shared-and-static-library-trees.patch
+++ b/0021-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 96f65c5db2dfb4c4a646eabd48b4f864850b5121 Mon Sep 17 00:00:00 2001
+From 7d8372b48046631d93ea260649d29a023fe29b01 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 21/30] Merge shared and static library trees
@@ -124,5 +124,5 @@ index a762443fe2..8ac3a0f647 100644
t << endl;
--
-2.11.1
+2.12.1
diff --git a/0022-Allow-usage-of-static-version-with-CMake.patch b/0022-Allow-usage-of-static-version-with-CMake.patch
index 2e36f158c9c..5136f3e873e 100644
--- a/0022-Allow-usage-of-static-version-with-CMake.patch
+++ b/0022-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From 90dd18c931134b3a872d54e9f51df638f0ce8b4b Mon Sep 17 00:00:00 2001
+From 1c1935b0d6e6685181880f6d591677ed49b0695e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 22/30] Allow usage of static version with CMake
@@ -9,13 +9,14 @@ Subject: [PATCH 22/30] Allow usage of static version with CMake
- Use eg. find_package(Qt5Core) for dynamic version
- and eg. find_package(StaticQt5Core) for static version
---
- mkspecs/features/create_cmake.prf | 85 ++++--
- .../features/data/cmake/Qt5BasicConfig.cmake.in | 338 +++++++++++++++------
+ mkspecs/features/create_cmake.prf | 85 +++--
+ .../features/data/cmake/Qt5BasicConfig.cmake.in | 358 ++++++++++++++-------
.../features/data/cmake/Qt5PluginTarget.cmake.in | 30 +-
qmake/generators/makefile.cpp | 7 +
src/corelib/Qt5CoreConfigExtras.cmake.in | 37 ++-
src/gui/Qt5GuiConfigExtras.cmake.in | 12 +-
- 6 files changed, 358 insertions(+), 151 deletions(-)
+ src/testlib/Qt5TestConfigExtras.cmake.in | 4 +
+ 7 files changed, 372 insertions(+), 161 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 461a7fdff5..c4afc5251b 100644
@@ -221,7 +222,7 @@ index 461a7fdff5..c4afc5251b 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358cae4b..89575efd6f 100644
+index d2358cae4b..6365d0f9ff 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -35,15 +35,18 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -353,7 +354,7 @@ index d2358cae4b..89575efd6f 100644
!!IF !no_module_headers
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -99,33 +149,33 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -99,46 +149,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
)
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@@ -362,11 +363,14 @@ index d2358cae4b..89575efd6f 100644
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
)
- !!ELSE
+-!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+-!!ENDIF
+-!!ELSE
++!!ELSE // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+ set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ELSE
++!!ENDIF // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
++!!ELSE // !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@@ -375,11 +379,14 @@ index d2358cae4b..89575efd6f 100644
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
)
- !!ELSE
+-!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+-!!ENDIF
+-!!ELSE
++!!ELSE // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+ set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ELSE
++!!ENDIF // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
++!!ELSE // isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
@@ -387,13 +394,18 @@ index d2358cae4b..89575efd6f 100644
\"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
\"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
)
- !!ELSE
+-!!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+-!!ENDIF
+-!!ENDIF
+-!!ENDIF
++!!ELSE // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
+ set($${VAR_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
- !!ENDIF
-@@ -134,11 +184,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
++!!ENDIF // isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
++!!ENDIF // isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
++!!ENDIF // !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+ !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
+ include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
!!ENDIF
!!ELSE
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
@@ -967,6 +979,20 @@ index 2e32911a64..31567d7da2 100644
IMPORTED_LINK_DEPENDENT_LIBRARIES_${_config}
${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
)
+diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in
+index 2a575958ae..8312c90fd1 100644
+--- a/src/testlib/Qt5TestConfigExtras.cmake.in
++++ b/src/testlib/Qt5TestConfigExtras.cmake.in
+@@ -1,5 +1,9 @@
+
++!!IF !isEmpty(CMAKE_STATIC_TYPE)
++set_property(TARGET StaticQt5::Test
++!!ELSE
+ set_property(TARGET Qt5::Test
++!!ENDIF
+ APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
+ )
--
-2.11.1
+2.12.1
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 9c57e11316b..220e3c6a08c 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 58f6e5d904464923eebcbb80ec0c774a30b30569 Mon Sep 17 00:00:00 2001
+From 2d7fb7169cfeed0c95a703b58fa7ec2412ba5daf Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/30] Use correct pkg-config --static flag
@@ -22,5 +22,5 @@ index 0c4b8ebbf8..8afb893e88 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.11.1
+2.12.1
diff --git a/0024-Fix-qt5_wrap_ui-macro.patch b/0024-Fix-qt5_wrap_ui-macro.patch
index 5f383e7eb8d..05415808aa8 100644
--- a/0024-Fix-qt5_wrap_ui-macro.patch
+++ b/0024-Fix-qt5_wrap_ui-macro.patch
@@ -1,4 +1,4 @@
-From 40049fa696cc4b02cab01cf3a79f5ea76b92d364 Mon Sep 17 00:00:00 2001
+From 3e3e4a59ab80c311d4158369d456287123151286 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/30] Fix qt5_wrap_ui() macro
@@ -24,5 +24,5 @@ index f5e7b7f050..18d120f0c7 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
list(APPEND ${outfiles} ${outfile})
--
-2.11.1
+2.12.1
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index bf976fd6ed8..d36f4fe0f15 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 4f2f3f020a8fb463532afa4aa9ffeaae211208d5 Mon Sep 17 00:00:00 2001
+From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/30] Ignore errors about missing feature static
@@ -32,5 +32,5 @@ index 999cd18154..6bf08ea583 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.11.1
+2.12.1
diff --git a/0026-Enable-anf-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index 977ad6acfe4..a70cb3818e8 100644
--- a/0026-Enable-anf-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,8 +1,9 @@
-From 29b4407c73d05bb98afb3a3a65e987cd825aa7f8 Mon Sep 17 00:00:00 2001
+From c8710fe0122cc6847fb11944b657f814872954b5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 26/30] Enable anf fix use of iconv
+Subject: [PATCH 26/30] Enable and fix use of iconv
+Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
config.tests/unix/gnu-libiconv/gnu-libiconv.cpp | 2 +-
src/corelib/codecs/qiconvcodec.cpp | 7 +++----
@@ -78,5 +79,5 @@ index 0d1954c3a8..32bbe92f57 100644
},
"icu": {
--
-2.11.1
+2.12.1
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 5a8f8e0ad0d..3e72c18cce4 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 4388424c4c7545480e4a06421aab9fe096a8d259 Mon Sep 17 00:00:00 2001
+From 64db0066305a86a66cc304174052de639607d10c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 27/30] Ignore failing pkg-config test
@@ -21,5 +21,5 @@ index 12714da714..adc54e439c 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.11.1
+2.12.1
diff --git a/0028-Include-uiviewsettingsinterop.h-correctly.patch b/0028-Include-uiviewsettingsinterop.h-correctly.patch
index caa72122de3..7cbf0614071 100644
--- a/0028-Include-uiviewsettingsinterop.h-correctly.patch
+++ b/0028-Include-uiviewsettingsinterop.h-correctly.patch
@@ -1,4 +1,4 @@
-From 37a65bf51b0747f9d306eb5c466f9b34096aa8a6 Mon Sep 17 00:00:00 2001
+From f598982149077d0cd9aeb51efe47116f3598b8eb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:41:16 +0100
Subject: [PATCH 28/30] Include uiviewsettingsinterop.h correctly
@@ -21,5 +21,5 @@ index 977bbfd11b..12cccd124b 100644
#ifndef HAS_UI_VIEW_SETTINGS_INTEROP
--
-2.11.1
+2.12.1
diff --git a/0029-Hardcode-linker-flags-for-libqwindows.dll.patch b/0029-Hardcode-linker-flags-for-libqwindows.dll.patch
index bfb961cae8b..56059692f04 100644
--- a/0029-Hardcode-linker-flags-for-libqwindows.dll.patch
+++ b/0029-Hardcode-linker-flags-for-libqwindows.dll.patch
@@ -1,4 +1,4 @@
-From 511bcf53d5fdf051becd7707e816dc6ad1111790 Mon Sep 17 00:00:00 2001
+From d73ee96c1fcaab9351d7e8471f2d9c1a0d842377 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 29/30] Hardcode linker flags for libqwindows.dll
@@ -41,5 +41,5 @@ index 23168c10dc..e27cf1a248 100644
include(windows.pri)
--
-2.11.1
+2.12.1
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index f330e92d674..cefd4b32e7c 100644
--- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From 15b374d87ff91c3a20d9022d5036a97c1252bb98 Mon Sep 17 00:00:00 2001
+From cf89985a2417df8e4519cab3824b239269792e57 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 30/30] Prevent qmake from messing static lib dependencies
@@ -39,5 +39,5 @@ index e6338546bb..2407d26a5a 100644
static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
for (int i = 0; lflags[i]; i++) {
--
-2.11.1
+2.12.1
diff --git a/PKGBUILD b/PKGBUILD
index 93cfc7191d2..f850a673928 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -78,7 +78,7 @@ isNoOpenGL() {
pkgname=mingw-w64-qt5-base
pkgver=5.8.0
-pkgrel=1
+pkgrel=2
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
# The static variant doesn't contain any executables which need to be executed on the build machine
isStatic && arch=('any') || arch=('i686' 'x86_64')
@@ -118,42 +118,42 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
'0023-Use-correct-pkg-config-static-flag.patch'
'0024-Fix-qt5_wrap_ui-macro.patch'
'0025-Ignore-errors-about-missing-feature-static.patch'
- '0026-Enable-anf-fix-use-of-iconv.patch'
+ '0026-Enable-and-fix-use-of-iconv.patch'
'0027-Ignore-failing-pkg-config-test.patch'
'0028-Include-uiviewsettingsinterop.h-correctly.patch'
'0029-Hardcode-linker-flags-for-libqwindows.dll.patch'
'0030-Prevent-qmake-from-messing-static-lib-dependencies.patch')
md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
- '4870da8aa8e01334f0daf09be09e7f32'
- 'e86ad52f472a4c4a70f9061b5474b947'
- '4c7c1df53c99182e296932d8cf398c5f'
- 'd18a5d3fc8570b03aed954a72b68739a'
- '685860a2ac1410c49ab82648bc24f510'
- 'e1a1ca7caf93e8033a1915af457b7b98'
- 'bd7c1c99dca91ed604c84cf9632f7e0d'
- '7fbfcbb581e07563ab87e17c33a6b48b'
- 'df541beb0bc0cc8054aae93f462c5923'
- '4711804aaf43ec810e70898c32948237'
- '3d4294c3279e69864fcdf87b6f852122'
- '55c3593dc03079c794e97ed88136845b'
- '5d04636091f7768b940d090178997384'
- 'd4cc6c6394c795a2e6708e797e49b616'
- '8e234c3b077a8f942ee9a7e8209bfc79'
- '6685fe994d64f3e1b2a4bfe6a645bb6a'
- 'a0fa368726934c21d3a0e8a5a61023c9'
- '3dc9e1efaed892d0eb24dfa68769d0f2'
- '53c06c4a646a9572b40982c4e29b5ce4'
- '61f4848e9e0a8a6e183458c871070a53'
- 'fd2e8c22fdbb3f9415ee500bde5980fc'
- '6a7539edc09f66bae5dfad7e3d210614'
- '440f7d221985abcb781a519d1bc26ee7'
- '504e6a091aa8b35a5b6b5a8c77b7d4e3'
- 'e85f6106f31bcd8da1213f670575941a'
- '4046dcb53c3a6c735f6d7d4b866d80a0'
- 'c964ad83bff270380aa5ac0991e57c10'
- '3921c665e46cbe39e012432db704089d'
- '8f47783a83f54c82650502a120af4f16'
- '2bc5f6f3d2c1cd0e2590a8e8e1cf0ff1')
+ '59cabe2d0b5646342c6cec93f7ebc074'
+ '9d45eaf425961899c40c76dbd1151204'
+ '60fc8de6d43685fc158ff705891b12ff'
+ 'f8da92ad83e2d0e0ebc6ead7d49dcd62'
+ 'f4d2daf0e914d7df8ff9ea0db778164c'
+ 'd198fc82d361e5a52f066e20d0f2ac1a'
+ 'b8a9042191146eee8898c19090e6dd79'
+ 'bcf6b7aa10e04c1093c801d2f2b5722b'
+ '50ef8614cb99b72b1e5cd5cb790b089e'
+ '381c9f451602c72c9a11512b41a7e725'
+ '6f2986a143d4d3fcbbf5ec6149742896'
+ '398499d79aeb1ccbdc02c4e604035ee9'
+ '94c63b114ee93f3d9892646090dceea2'
+ '01c49b3786ce8852607aeb40482c56ab'
+ '8d43ede146c545826b8667f4ebe1a92c'
+ '47e13ec0622a3af2d89768cb6c228774'
+ 'e08a00d918adad4734e56be6f03ba9bc'
+ '4808132cbdbc320d2e0dd26033fa245f'
+ '92afca193efe77c51fe33c209047d6c5'
+ '75ef72598c4274447b5668c791d019e4'
+ '8eb99eec735bc566847ac692bec14ce6'
+ 'b22a8b34e4e403256fd9cfeba5fff508'
+ '26c08be34065619f12a15b485c8c2ea3'
+ '360f6a8dae753f3649bb7bea1ca9170f'
+ 'ac4b80a15f9004a8f668b80fb475ddd1'
+ 'ccec8075e73f445fcf4c600b4b990fee'
+ '2a7a504e2b4572bef11855c8a0b2863a'
+ '963f27d8f720a91b2345cda9fe0be8cd'
+ 'a12368572b27f714babb720258f7b81e'
+ '3aa314937307e172c30258a82dd4ed67')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
#_architectures='x86_64-w64-mingw32 i686-w64-mingw32'
@@ -301,13 +301,13 @@ build() {
mkdir -p ../build-${_arch} && pushd ../build-${_arch}
if isStatic; then
- ../${_pkgfqn}/configure -static $qt_configure_args $qt_configure_args_mysql
+ ../${_pkgfqn}/configure -static $qt_configure_args
make
else
# The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this
- ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql
+ ../${_pkgfqn}/configure -shared $qt_configure_args
LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
fi
popd