summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO72
-rw-r--r--0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch23
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch4
-rw-r--r--0003-Use-external-ANGLE-library.patch4
-rw-r--r--0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch4
-rw-r--r--0005-Make-sure-.pc-files-are-installed-correctly.patch10
-rw-r--r--0006-Don-t-add-resource-files-to-LIBS-parameter.patch4
-rw-r--r--0007-Prevent-debug-library-names-in-pkg-config-files.patch8
-rw-r--r--0008-Fix-linking-against-shared-static-libpng.patch4
-rw-r--r--0009-Fix-linking-against-static-D-Bus.patch6
-rw-r--r--0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch6
-rw-r--r--0011-Fix-linking-against-static-freetype2.patch4
-rw-r--r--0012-Fix-linking-against-static-harfbuzz.patch4
-rw-r--r--0013-Fix-linking-against-static-pcre.patch4
-rw-r--r--0014-Fix-linking-against-shared-static-MariaDB.patch4
-rw-r--r--0015-Fix-linking-against-shared-static-PostgreSQL.patch4
-rw-r--r--0016-Rename-qtmain-to-qt5main.patch10
-rw-r--r--0017-Build-dynamic-host-libraries.patch4
-rw-r--r--0018-Enable-rpath-for-build-tools.patch4
-rw-r--r--0019-Use-system-zlib-for-build-tools.patch4
-rw-r--r--0020-Use-.dll.a-as-import-lib-extension.patch6
-rw-r--r--0021-Merge-shared-and-static-library-trees.patch10
-rw-r--r--0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch6
-rw-r--r--0023-Allow-usage-of-static-version-with-CMake.patch8
-rw-r--r--0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch4
-rw-r--r--0025-Use-correct-pkg-config-static-flag.patch4
-rw-r--r--0026-Fix-macro-invoking-moc-rcc-and-uic.patch6
-rw-r--r--0027-Ignore-errors-about-missing-feature-static.patch4
-rw-r--r--0028-Enable-and-fix-use-of-iconv.patch6
-rw-r--r--0029-Ignore-failing-pkg-config-test.patch6
-rw-r--r--0030-Prevent-qmake-from-messing-static-lib-dependencies.patch6
-rw-r--r--0031-Hardcode-linker-flags-for-platform-plugins.patch4
-rw-r--r--0032-Fix-linking-against-static-plugins-with-qmake.patch4
-rw-r--r--0033-Disable-hardware-randomizer-for-32-bit.patch4
-rw-r--r--PKGBUILD85
35 files changed, 165 insertions, 185 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ea995617bb..aba85944c8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 5.11.0
+ pkgver = 5.11.1
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -29,7 +29,7 @@ pkgbase = mingw-w64-qt5-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtbase-everywhere-src-5.11.0.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz
source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
source = 0003-Use-external-ANGLE-library.patch
@@ -63,40 +63,40 @@ pkgbase = mingw-w64-qt5-base
source = 0031-Hardcode-linker-flags-for-platform-plugins.patch
source = 0032-Fix-linking-against-static-plugins-with-qmake.patch
source = 0033-Disable-hardware-randomizer-for-32-bit.patch
- sha256sums = ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66
- sha256sums = d01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3
- sha256sums = 29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2
- sha256sums = 58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e
- sha256sums = 3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27
- sha256sums = 2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905
- sha256sums = 5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0
- sha256sums = 164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd
- sha256sums = 351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc
- sha256sums = a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e
- sha256sums = 844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39
- sha256sums = a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447
- sha256sums = 7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb
- sha256sums = 1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117
- sha256sums = 504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff
- sha256sums = b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d
- sha256sums = f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242
- sha256sums = da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5
- sha256sums = e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a
- sha256sums = 83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831
- sha256sums = bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf
- sha256sums = 7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17
- sha256sums = bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2
- sha256sums = 29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d
- sha256sums = 0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76
- sha256sums = bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e
- sha256sums = 08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384
- sha256sums = 20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f
- sha256sums = d9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a
- sha256sums = fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75
- sha256sums = df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec
- sha256sums = 65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173
- sha256sums = 178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0
- sha256sums = 704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3
+ sha256sums = a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46
+ sha256sums = e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039
+ sha256sums = 46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e
+ sha256sums = 48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b
+ sha256sums = b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d
+ sha256sums = 765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c
+ sha256sums = 80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169
+ sha256sums = 22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce
+ sha256sums = 1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f
+ sha256sums = d26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7
+ sha256sums = a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d
+ sha256sums = dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8
+ sha256sums = 7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f
+ sha256sums = 03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4
+ sha256sums = 910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590
+ sha256sums = a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5
+ sha256sums = 613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a
+ sha256sums = 3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde
+ sha256sums = 9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98
+ sha256sums = 90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f
+ sha256sums = 37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c
+ sha256sums = 4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f
+ sha256sums = 3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d
+ sha256sums = f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3
+ sha256sums = c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7
+ sha256sums = feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1
+ sha256sums = e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444
+ sha256sums = faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c
+ sha256sums = 241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876
+ sha256sums = e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505
+ sha256sums = 5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c
+ sha256sums = e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982
+ sha256sums = 60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8
+ sha256sums = 7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180
pkgname = mingw-w64-qt5-base
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index 013d327fd29..dd47ebc2abb 100644
--- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,4 +1,4 @@
-From bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001
+From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@@ -13,16 +13,16 @@ Also see the following issues:
* https://github.com/Martchus/PKGBUILDs/issues/59
* https://github.com/Martchus/PKGBUILDs/issues/60
---
- mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++---------
+ mkspecs/common/g++-win32.conf | 53 ++++++++++++++++++++----------
mkspecs/win32-clang-g++/qmake.conf | 4 +--
mkspecs/win32-g++/qmake.conf | 4 +--
- 3 files changed, 43 insertions(+), 21 deletions(-)
+ 3 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 610503379d..f099380cca 100644
+index 610503379d..e747ef16af 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
-@@ -8,22 +8,31 @@
+@@ -8,18 +8,24 @@
# Compiler-specific settings go into win32-g++/qmake.conf and
# win32-clang-g++/qmake.conf
#
@@ -50,14 +50,7 @@ index 610503379d..f099380cca 100644
# can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
# x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC,
# 'QMAKE_TARGET.arch' is inherently unavailable.
-
-+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h)
-+DEFINES += __INTRINSIC_DEFINED__xgetbv
-+
- QMAKE_LEX = flex
- QMAKE_LEXFLAGS =
- QMAKE_YACC = bison -y
-@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign
+@@ -34,6 +40,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign
QMAKE_CXXFLAGS_RTTI_ON = -frtti
QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
@@ -65,7 +58,7 @@ index 610503379d..f099380cca 100644
QMAKE_INCDIR =
-@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -170,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
-2.17.0
+2.18.0
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 c26ef5b8c3e..6050478bc5c 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,4 +1,4 @@
-From 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001
+From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
@@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.17.0
+2.18.0
diff --git a/0003-Use-external-ANGLE-library.patch b/0003-Use-external-ANGLE-library.patch
index b22e59f7d09..a6af034b736 100644
--- a/0003-Use-external-ANGLE-library.patch
+++ b/0003-Use-external-ANGLE-library.patch
@@ -1,4 +1,4 @@
-From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001
+From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/33] Use external ANGLE library
@@ -93,5 +93,5 @@ index 1f7c5d99c1..24e24ef7f1 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
-2.17.0
+2.18.0
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 7cb589f5ec7..3c4a639d9df 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
@@ -1,4 +1,4 @@
-From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001
+From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
@@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.17.0
+2.18.0
diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch
index 6968e39395d..793cde115fd 100644
--- a/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,4 +1,4 @@
-From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001
+From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
@@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 82573347b6..b9871ff49c 100644
+index 99aecdd8ce..6c614fd868 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
}
QString
@@ -22,7 +22,7 @@ index 82573347b6..b9871ff49c 100644
{
QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
if (ret.isEmpty()) {
-@@ -3171,7 +3171,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
if(fixify) {
if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
ret.prepend(project->first("DESTDIR").toQString());
@@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.17.0
+2.18.0
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 45d79c886e0..45dc92b021f 100644
--- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,4 +1,4 @@
-From 9b80c0d4cabad01097173fd73693417f9461f4e9 Mon Sep 17 00:00:00 2001
+From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
@@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.17.0
+2.18.0
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 8cd33a821bc..d15f39fbba4 100644
--- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001
+From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
@@ -15,10 +15,10 @@ files for the debug build an unique file name.
1 file changed, 3 insertions(+)
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index b9871ff49c..0d07d6c333 100644
+index 6c614fd868..bd87c5bd6d 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (dot != -1)
ret = ret.left(dot);
}
@@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.17.0
+2.18.0
diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch
index ff974a9c485..0d22e8c13aa 100644
--- a/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/0008-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001
+From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/33] Fix linking against shared/static libpng
@@ -23,5 +23,5 @@ index 219385a108..d629a45b92 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
-2.17.0
+2.18.0
diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch
index 385522d894b..85ac9f40c6c 100644
--- a/0009-Fix-linking-against-static-D-Bus.patch
+++ b/0009-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001
+From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/33] Fix linking against static D-Bus
@@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
-index ae2aa22070..baa99a3da9 100644
+index b4a87f5505..c404fd7066 100644
--- a/configure.json
+++ b/configure.json
@@ -172,18 +172,23 @@
@@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
# include <dbus/dbus.h>
#else
--
-2.17.0
+2.18.0
diff --git a/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index a0ee831464b..f26722124e1 100644
--- a/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,4 +1,4 @@
-From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001
+From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
-index baa99a3da9..dfb8835ecb 100644
+index c404fd7066..1488cde728 100644
--- a/configure.json
+++ b/configure.json
@@ -185,7 +185,7 @@
@@ -25,5 +25,5 @@ index baa99a3da9..dfb8835ecb 100644
},
"condition": "config.win32 && features.shared"
--
-2.17.0
+2.18.0
diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch
index afeb125272f..c9fbd7f6ea6 100644
--- a/0011-Fix-linking-against-static-freetype2.patch
+++ b/0011-Fix-linking-against-static-freetype2.patch
@@ -1,4 +1,4 @@
-From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001
+From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/33] Fix linking against static freetype2
@@ -26,5 +26,5 @@ index d629a45b92..afa3d95f39 100644
},
"fontconfig": {
--
-2.17.0
+2.18.0
diff --git a/0012-Fix-linking-against-static-harfbuzz.patch b/0012-Fix-linking-against-static-harfbuzz.patch
index 33e27261250..16e00a6bf0b 100644
--- a/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/0012-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001
+From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/33] Fix linking against static harfbuzz
@@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644
},
"imf": {
--
-2.17.0
+2.18.0
diff --git a/0013-Fix-linking-against-static-pcre.patch b/0013-Fix-linking-against-static-pcre.patch
index 4c94c36c3c5..9d242b1092b 100644
--- a/0013-Fix-linking-against-static-pcre.patch
+++ b/0013-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001
+From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/33] Fix linking against static pcre
@@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644
#include <pcre2.h>
--
-2.17.0
+2.18.0
diff --git a/0014-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch
index 913a0837bcd..22a251aefde 100644
--- a/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001
+From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
@@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.17.0
+2.18.0
diff --git a/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/0015-Fix-linking-against-shared-static-PostgreSQL.patch
index 38d22d9d483..54b11a41bed 100644
--- a/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From 2097d5ad594a291ecf8ca098566681fa52731183 Mon Sep 17 00:00:00 2001
+From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
@@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
]
},
--
-2.17.0
+2.18.0
diff --git a/0016-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch
index d95196cb88b..4208b789359 100644
--- a/0016-Rename-qtmain-to-qt5main.patch
+++ b/0016-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001
+From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/33] Rename qtmain to qt5main
@@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index f099380cca..44c211d176 100644
+index e747ef16af..8b8a4ad240 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
-@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
+@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
@@ -25,7 +25,7 @@ index f099380cca..44c211d176 100644
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 66acedef55..5d553d9ca6 100644
+index 2ed708e085..e67917cc96 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -227,8 +227,8 @@ mac {
@@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
-2.17.0
+2.18.0
diff --git a/0017-Build-dynamic-host-libraries.patch b/0017-Build-dynamic-host-libraries.patch
index 0b364109534..bee22db096d 100644
--- a/0017-Build-dynamic-host-libraries.patch
+++ b/0017-Build-dynamic-host-libraries.patch
@@ -1,4 +1,4 @@
-From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001
+From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/33] Build dynamic host libraries
@@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
-INSTALLS = lib
+INSTALLS += lib
--
-2.17.0
+2.18.0
diff --git a/0018-Enable-rpath-for-build-tools.patch b/0018-Enable-rpath-for-build-tools.patch
index 9a9bcbc0a45..4b5af4bfd18 100644
--- a/0018-Enable-rpath-for-build-tools.patch
+++ b/0018-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001
+From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/33] Enable rpath for build tools
@@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
INSTALLS += target
--
-2.17.0
+2.18.0
diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch
index c41e5725ad6..bfa04928100 100644
--- a/0019-Use-system-zlib-for-build-tools.patch
+++ b/0019-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001
+From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/33] Use system zlib for build tools
@@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644
} else {
CONFIG += no_core_dep
--
-2.17.0
+2.18.0
diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch
index c1473f53674..8dca11673b7 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 b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001
+From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
@@ -11,7 +11,7 @@ mingw-w64 specific mkspec
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 5d553d9ca6..3e5ec55dae 100644
+index e67917cc96..2a94964b49 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -238,8 +238,9 @@ mac {
@@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.17.0
+2.18.0
diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch
index c532a95d455..ad50940b1c2 100644
--- a/0021-Merge-shared-and-static-library-trees.patch
+++ b/0021-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001
+From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 21/33] Merge shared and static library trees
@@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
QMAKE_EXT_YACC = .y
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 0d07d6c333..5e84628e72 100644
+index bd87c5bd6d..736af1c843 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
if (project->isActiveConfig("debug")) {
ret += "d";
}
@@ -114,7 +114,7 @@ index 0d07d6c333..5e84628e72 100644
ret += Option::pkgcfg_ext;
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
-@@ -3336,9 +3339,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile()
t << endl;
// requires
@@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
-2.17.0
+2.18.0
diff --git a/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index d894cf8e30c..59d65864a4a 100644
--- a/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,4 +1,4 @@
-From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001
+From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
@@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644
+
+endif()
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 5e84628e72..43f570fb2c 100644
+index 736af1c843..a1972b7eb0 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644
}
--
-2.17.0
+2.18.0
diff --git a/0023-Allow-usage-of-static-version-with-CMake.patch b/0023-Allow-usage-of-static-version-with-CMake.patch
index 31bf85a14d7..cde35882173 100644
--- a/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/0023-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001
+From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 23/33] Allow usage of static version with CMake
@@ -22,10 +22,10 @@ installed in the same prefix
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 3e5ec55dae..b6c47124cc 100644
+index 2a94964b49..839a51f377 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
-@@ -38,7 +38,7 @@ split_incpath {
+@@ -42,7 +42,7 @@ split_incpath {
$$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}/$$eval(QT.$${MODULE}.VERSION)/Qt$${CMAKE_MODULE_NAME})
cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in
@@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
-2.17.0
+2.18.0
diff --git a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index c0d4180ce96..2b5958cc817 100644
--- a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,4 +1,4 @@
-From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001
+From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 24/33] Adjust linker flags for static build with
@@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
+unset(_isExe)
+!!ENDIF
--
-2.17.0
+2.18.0
diff --git a/0025-Use-correct-pkg-config-static-flag.patch b/0025-Use-correct-pkg-config-static-flag.patch
index b770cfd83e1..53944187304 100644
--- a/0025-Use-correct-pkg-config-static-flag.patch
+++ b/0025-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From f7284cc26542c8d760e0d348be44f1bf947296cb Mon Sep 17 00:00:00 2001
+From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 25/33] Use correct pkg-config --static flag
@@ -22,5 +22,5 @@ index c3ce522e4f..59a9b1e88a 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.17.0
+2.18.0
diff --git a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
index 23e7c6f99f3..46fba5b4d79 100644
--- a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,4 +1,4 @@
-From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001
+From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
@@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 1627de4002..ed0f6555a7 100644
+index 819b48f973..f11a61be6b 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.17.0
+2.18.0
diff --git a/0027-Ignore-errors-about-missing-feature-static.patch b/0027-Ignore-errors-about-missing-feature-static.patch
index e7d0f24ddf5..a685f5980e5 100644
--- a/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/0027-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001
+From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 27/33] Ignore errors about missing feature static
@@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.17.0
+2.18.0
diff --git a/0028-Enable-and-fix-use-of-iconv.patch b/0028-Enable-and-fix-use-of-iconv.patch
index 72ac55163b1..6dbec1ec4c8 100644
--- a/0028-Enable-and-fix-use-of-iconv.patch
+++ b/0028-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001
+From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 28/33] Enable and fix use of iconv
@@ -63,7 +63,7 @@ index 330eb7c038..88a782b863 100644
#else
char **inBytesPtr = &inBytes;
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 5e48024def..15e7372dcb 100644
+index dfb575da0d..a630d7abf3 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -539,9 +539,9 @@
@@ -79,5 +79,5 @@ index 5e48024def..15e7372dcb 100644
},
"icu": {
--
-2.17.0
+2.18.0
diff --git a/0029-Ignore-failing-pkg-config-test.patch b/0029-Ignore-failing-pkg-config-test.patch
index 61caf681d8a..cd156a3a68e 100644
--- a/0029-Ignore-failing-pkg-config-test.patch
+++ b/0029-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001
+From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 29/33] Ignore failing pkg-config test
@@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
-index dfb8835ecb..f9735f59cd 100644
+index 1488cde728..a52c1c9c95 100644
--- a/configure.json
+++ b/configure.json
@@ -597,7 +597,6 @@
@@ -21,5 +21,5 @@ index dfb8835ecb..f9735f59cd 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.17.0
+2.18.0
diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 38f184dfaaf..6b9077cc5ec 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 a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001
+From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
@@ -11,7 +11,7 @@ static freetype2 and harfbuzz
2 files changed, 6 insertions(+)
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 30f99174f8..154edd67d4 100644
+index 894020d2bd..5f57d6f5cb 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
for (int i = 0; lflags[i]; i++) {
--
-2.17.0
+2.18.0
diff --git a/0031-Hardcode-linker-flags-for-platform-plugins.patch b/0031-Hardcode-linker-flags-for-platform-plugins.patch
index 6f873f40eb9..ad6fa90ba10 100644
--- a/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0031-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001
+From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
@@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644
include(windows.pri)
--
-2.17.0
+2.18.0
diff --git a/0032-Fix-linking-against-static-plugins-with-qmake.patch b/0032-Fix-linking-against-static-plugins-with-qmake.patch
index 92b0abe8e2b..d437395dc98 100644
--- a/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0032-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,4 +1,4 @@
-From af66aa78320b37f4c5100e2822eceb3ecd0a703a Mon Sep 17 00:00:00 2001
+From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 32/33] Fix linking against static plugins with qmake
@@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644
# Check if the plugin is known to Qt. We can use this to determine
# the plugin path. Unknown plugins must rely on the default link path.
--
-2.17.0
+2.18.0
diff --git a/0033-Disable-hardware-randomizer-for-32-bit.patch b/0033-Disable-hardware-randomizer-for-32-bit.patch
index d7cf9b4b1e8..c3b291a1f0a 100644
--- a/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/0033-Disable-hardware-randomizer-for-32-bit.patch
@@ -1,4 +1,4 @@
-From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001
+From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 26 May 2018 03:47:14 +0200
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
@@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
#else
return false;
--
-2.17.0
+2.18.0
diff --git a/PKGBUILD b/PKGBUILD
index 6bf45ece9ab..9aefec773d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,7 +36,7 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base
-pkgver=5.11.0
+pkgver=5.11.1
pkgrel=1
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
@@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0031-Hardcode-linker-flags-for-platform-plugins.patch'
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
'0033-Disable-hardware-randomizer-for-32-bit.patch')
-sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66'
- 'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3'
- '29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2'
- '58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e'
- '3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27'
- '2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905'
- '5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0'
- '164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd'
- '351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc'
- 'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e'
- '844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39'
- 'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447'
- '7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb'
- '1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117'
- '504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff'
- 'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d'
- 'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242'
- 'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5'
- 'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a'
- '83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831'
- 'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf'
- '7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17'
- 'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2'
- '29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d'
- '0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76'
- 'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e'
- '08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384'
- '20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f'
- 'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a'
- 'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75'
- 'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec'
- '65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173'
- '178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0'
- '704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3')
+sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
+ 'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039'
+ '46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e'
+ '48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b'
+ 'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d'
+ '765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c'
+ '80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169'
+ '22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce'
+ '1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f'
+ 'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7'
+ 'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d'
+ 'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8'
+ '7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f'
+ '03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4'
+ '910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590'
+ 'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5'
+ '613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a'
+ '3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde'
+ '9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98'
+ '90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f'
+ '37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c'
+ '4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f'
+ '3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d'
+ 'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3'
+ 'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7'
+ 'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1'
+ 'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444'
+ 'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c'
+ '241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876'
+ 'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505'
+ '5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c'
+ 'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982'
+ '60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8'
+ '7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@@ -143,25 +143,12 @@ if ! isDefault; then
fi
fi
-patch() {
- local input_found=
- local patch_file=
- for arg in $@; do
- if [[ $input_found ]]; then
- patch_file="$arg"
- break
- fi
- [[ $arg == -i ]] && input_found=1
- done
- msg2 "Applying patch $patch_file"
- /usr/bin/patch $@
-}
-
prepare() {
cd "${srcdir}/${_pkgfqn}"
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
+ msg2 "Applying patch $patch"
patch -p1 -i "$patch"
done