Martchus
/
PKGBUILDs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update mingw-w64-qt5-* packages to 5.15.2

This commit is contained in:
Martchus 2020-11-20 11:45:38 +01:00
parent bd902e4f8d
commit 19060ddf49
296 changed files with 776 additions and 786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
View File

@ -31,7 +31,7 @@
_qt_module=qt<%== $qt_module %>
pkgname=<%= $package_name %>
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
pkgdesc='A cross-platform application and UI framework, <%= $opengl_backend %> OpenGL backend (mingw-w64)'
arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)

2
devel/versions.sh
View File

@ -12,7 +12,7 @@ declare -A versions=(
[blackwidowcontrol]=1.0.2
[dbus-soundrecorder]=1.2.3
[geocoordinatecalculator]=1.1.3
[qt5]=5.15.1
[qt5]=5.15.2
[qt6]=6.0.0-beta4
)
declare -A github_names=(

4
qt5-3d/mingw-w64-static/PKGBUILD
View File

@ -10,7 +10,7 @@
_qt_module=qt3d
pkgname=mingw-w64-qt5-3d-static
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
arch=('any')
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@ -22,7 +22,7 @@ groups=('mingw-w64-qt5')
url='https://www.qt.io/'
_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411')
sha256sums=('03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

2
qt5-3d/mingw-w64-static/qt3d-sha256.txt
View File

@ -1 +1 @@
29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411
03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d

4
qt5-3d/mingw-w64/PKGBUILD
View File

@ -10,7 +10,7 @@
_qt_module=qt3d
pkgname=mingw-w64-qt5-3d
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@ -22,7 +22,7 @@ groups=('mingw-w64-qt5')
url='https://www.qt.io/'
_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411')
sha256sums=('03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

2
qt5-3d/mingw-w64/PKGBUILD.sh.ep
View File

@ -4,7 +4,7 @@
# Contributor: ant32 <antreimer@gmail.com>
% end
\
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"

2
qt5-3d/mingw-w64/qt3d-sha256.txt
View File

@ -1 +1 @@
29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411
03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d

4
qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
View File

@ -1,4 +1,4 @@
From ab2f571f3c72bea8ab6478db089592c301259394 Mon Sep 17 00:00:00 2001
From f3eb4a339ad53d96f59cf172e6e5f356b0d43bbd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:17:46 +0200
Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc
@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644
SOURCES = main.cpp
--
2.28.0
2.29.2

16
qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
View File

@ -1,4 +1,4 @@
From 5652ce8e4225793cb4041be6aadee82d4ac84c27 Mon Sep 17 00:00:00 2001
From 7b74ca5cb9fb9077eb26e73a84822850e8608c50 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:21:08 +0200
Subject: [PATCH 2/2] Handle win64 in dumpcpp and
@ -11,7 +11,7 @@ See https://bugreports.qt.io/browse/QTBUG-46827
2 files changed, 12 insertions(+)
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 3203096..6adf9eb 100644
index 2903cdf..12e3801 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2202,6 +2202,10 @@ void MetaObjectGenerator::readClassInfo()
@ -26,11 +26,11 @@ index 3203096..6adf9eb 100644
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 780d41b..029e10b 100644
index 55aa80b..a1282f2 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1580,6 +1580,10 @@ int main(int argc, char **argv)
typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString();
@@ -1586,6 +1586,10 @@ int main(int argc, char **argv)
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
if (QFile::exists(typeLib))
break;
+ typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray();
@ -40,8 +40,8 @@ index 780d41b..029e10b 100644
}
if (!typeLib.isEmpty())
@@ -1639,6 +1643,10 @@ int main(int argc, char **argv)
+ QLatin1String("/win32/.")).toString();
@@ -1650,6 +1654,10 @@ int main(int argc, char **argv)
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
if (QFile::exists(typeLib))
break;
+ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
@ -52,5 +52,5 @@ index 780d41b..029e10b 100644
}
--
2.28.0
2.29.2

8
qt5-activeqt/mingw-w64/PKGBUILD
View File

@ -15,7 +15,7 @@
_qt_module=qtactiveqt
pkgname=mingw-w64-qt5-activeqt
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
arch=('any')
pkgdesc="ActiveX integration framework (mingw-w64)"
@ -29,9 +29,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
'0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
'0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
sha256sums=('4f8bbd320349d89ae7867de4bc752cf984f96c6def2b951564dcd5e4f53529c1'
'b76fbe967e7f8af79fd2e4a1d64144edbfcd3ab5e7b70a19410215f93ccc16c1'
'486e1b7856e8b516abe93828edf83ede4f7e557e23ba1f2071034e984569c343')
sha256sums=('868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c'
'05443c9a67b30160a7d4264da9c57b1a2fdbc3c74bab8e9f69c51ac8feeac2cb'
'06aa9413f31edd4f8c51d65cf6a8e1add8d5a6af2588f18bdc2e67164ebdaea7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

2
qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
View File

@ -10,7 +10,7 @@
% end
\
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
arch=('any')
pkgdesc="ActiveX integration framework (mingw-w64)"

2
qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt
View File

@ -1 +1 @@
4f8bbd320349d89ae7867de4bc752cf984f96c6def2b951564dcd5e4f53529c1
868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c

4
qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
View File

@ -1,4 +1,4 @@
From 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001
From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
View File

@ -1,4 +1,4 @@
From 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001
From adbb14a78c0091c81925e5e79644ff8361e7b8e9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
View File

@ -1,4 +1,4 @@
From f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001
From 520b519d962852792bd4ac3c2d1206afa329b65e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch
View File

@ -1,4 +1,4 @@
From dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001
From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
View File

@ -1,4 +1,4 @@
From a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001
From 806b631662ffebfa38085e1f9e708aee2c19f1d9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch
View File

@ -1,4 +1,4 @@
From 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001
From 3d816219968cfcaacfd30b6011263c8bb4d975c0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@ -29,5 +29,5 @@ index e94084381c..8e4d11484f 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch
View File

@ -1,4 +1,4 @@
From 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001
From 77037d64693385c1cdcc2814890567e79548b40d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 07/31] Fix linking against shared/static libpng
@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 1f08795c57..7a5fc6ce7a 100644
index c8c4864eca..be519a6d39 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -399,8 +399,10 @@
@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644
],
"use": [
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch
View File

@ -1,4 +1,4 @@
From 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001
From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 08/31] Fix linking against static D-Bus
@ -9,10 +9,10 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 50d69b740d..2433da3c20 100644
index c273aeeef1..57c40030d8 100644
--- a/configure.json
+++ b/configure.json
@@ -188,18 +188,23 @@
@@ -190,18 +190,23 @@
"dbus": {
"label": "D-Bus >= 1.2",
"test": {
@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
View File

@ -1,4 +1,4 @@
From 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001
From adb495753f647c7b78d923bb512e18003cd309a4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@ -12,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 2433da3c20..bde226843b 100644
index 57c40030d8..2fa3c08440 100644
--- a/configure.json
+++ b/configure.json
@@ -201,7 +201,7 @@
@@ -203,7 +203,7 @@
{
"libs": "",
"builds": {
@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644
},
"condition": "config.win32 && features.shared"
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch
View File

@ -1,4 +1,4 @@
From 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001
From 8a8da9fb5e44acf747985254b8e4a0e663397c15 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 10/31] Fix linking against static freetype2
@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7a5fc6ce7a..b117f6fff6 100644
index be519a6d39..d74fd3bc24 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -238,8 +238,11 @@
@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644
{ "libs": "-lfreetype" }
],
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch
View File

@ -1,4 +1,4 @@
From 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001
From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 11/31] Fix linking against static harfbuzz
@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index b117f6fff6..2a0207920a 100644
index d74fd3bc24..d6759ed96a 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -306,7 +306,11 @@
@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644
},
"imf": {
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch
View File

@ -1,4 +1,4 @@
From f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001
From 3bb30ee7403e468705aa03e1d92f797d6ce38332 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 12/31] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 729269d0f4..128baafd56 100644
index d7e3cc5ee2..e17c19fbae 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644
#include <pcre2.h>
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch
View File

@ -1,4 +1,4 @@
From d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001
From 5d301704de074aeee8464bf9933296a437353a6f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch
View File

@ -1,4 +1,4 @@
From 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001
From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
]
},
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
View File

@ -1,4 +1,4 @@
From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001
From 092e86f5dedf3173be832f868b60b1c306c42bfa Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/31] Rename qtmain to qt5main
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch
View File

@ -1,4 +1,4 @@
From 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001
From fc76d4187ab337a5efb96d6b80099f5075df69ee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 16/31] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch
View File

@ -1,4 +1,4 @@
From 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001
From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 17/31] Use system zlib for build tools
@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index c212ccbb6f..1bf9f1e4f9 100644
index 24862a07db..698e6cfb95 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -158,7 +158,9 @@ macx {
@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644
} else {
CONFIG += no_core_dep
--
2.28.0
2.29.2

10
qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch
View File

@ -1,4 +1,4 @@
From 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001
From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 18/31] Merge shared and static library trees
@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
7 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/configure.pri b/configure.pri
index 3dedffcace..89938dfc32 100644
index 49755f7abf..53c67f885b 100644
--- a/configure.pri
+++ b/configure.pri
@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) {
@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) {
defineTest(qtConfOutput_commitOptions) {
# qdevice.pri needs to be written early, because the compile tests require it.
@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644
}
# type (empty or 'host'), option name, default value
@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) {
@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch
View File

@ -1,4 +1,4 @@
From 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001
From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
View File

@ -1,4 +1,4 @@
From 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001
From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
+endif()
\ No newline at end of file
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch
View File

@ -1,4 +1,4 @@
From ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001
From 494194c5b6b2775e756e911f5befde85e9ce13e4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 21/31] Allow usage of static version with CMake
@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
View File

@ -1,4 +1,4 @@
From 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001
From 0f44180723f14ae9861b406238d973e0ca20c405 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 22/31] Adjust linker flags for static build with
@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
+unset(_isExe)
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
View File

@ -1,4 +1,4 @@
From 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001
From 0084c7966f46b5a64cac040a8c50c793ba680930 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/31] Use correct pkg-config --static flag
@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
index 89938dfc32..121064e1f8 100644
index 53c67f885b..8934b72291 100644
--- a/configure.pri
+++ b/configure.pri
@@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
View File

@ -1,4 +1,4 @@
From 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001
From e5389013ff78085fdfdfbf1da5b0644e784c916d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch
View File

@ -1,4 +1,4 @@
From ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001
From d29a2b44643831e439755d11348b69dc9ed6d60b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/31] Ignore errors about missing feature static
@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch
View File

@ -1,4 +1,4 @@
From 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001
From becf49560bdf91b82df7bec0bc06c54d7ab8c948 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 26/31] Enable and fix use of iconv
@ -74,5 +74,5 @@ index c5e0423273..0b12e22351 100644
},
"icu": {
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch
View File

@ -1,4 +1,4 @@
From ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001
From 2fd3c54980c0be5efa03f64c8998287d683ff54f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 27/31] Ignore failing pkg-config test
@ -9,10 +9,10 @@ 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 bde226843b..653ed122d9 100644
index 2fa3c08440..d96d2a6ecb 100644
--- a/configure.json
+++ b/configure.json
@@ -770,7 +770,6 @@
@@ -772,7 +772,6 @@
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
@ -21,5 +21,5 @@ index bde226843b..653ed122d9 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
View File

@ -1,4 +1,4 @@
From c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001
From e6e16f20966d91dd3c0020d4784d04e79b95613f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch
View File

@ -1,4 +1,4 @@
From 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001
From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@ -172,5 +172,5 @@ index 50a3bb41a9..53c011642f 100644
include(windows.pri)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch
View File

@ -1,4 +1,4 @@
From ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001
From cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 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.28.0
2.29.2

4
qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
View File

@ -1,4 +1,4 @@
From e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001
From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200
Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk'
@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
2.28.0
2.29.2

64
qt5-base/mingw-w64-angle/PKGBUILD
View File

@ -19,7 +19,7 @@
_qt_module=qtbase
pkgname=mingw-w64-qt5-base-angle
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
pkgdesc='A cross-platform application and UI framework, ANGLE OpenGL backend (mingw-w64)'
arch=('i686' 'x86_64')
@ -73,37 +73,37 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44'
'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e'
'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c'
'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a'
'273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d'
'84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543'
'190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5'
'3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a'
'56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174'
'02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc'
'3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8'
'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b'
'68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2'
'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4'
'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90'
'6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424'
'3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0'
'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6'
'2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8'
'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267'
'3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384'
'19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a'
'5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c'
'84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4'
'85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787'
'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1'
'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8'
'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808'
'4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31'
'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb'
'553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9')
'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e'
'833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266'
'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc'
'944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b'
'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26'
'595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee'
'238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b'
'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c'
'859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e'
'896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb'
'15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4'
'499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548'
'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8'
'3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631'
'2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8'
'6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0'
'27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05'
'0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1'
'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f'
'7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927'
'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039'
'2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c'
'5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285'
'73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109'
'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811'
'3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e'
'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69'
'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943'
'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d'
'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab'
'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

4
qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
View File

@ -1,4 +1,4 @@
From 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001
From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
View File

@ -1,4 +1,4 @@
From 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001
From adbb14a78c0091c81925e5e79644ff8361e7b8e9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
View File

@ -1,4 +1,4 @@
From f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001
From 520b519d962852792bd4ac3c2d1206afa329b65e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch
View File

@ -1,4 +1,4 @@
From dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001
From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
View File

@ -1,4 +1,4 @@
From a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001
From 806b631662ffebfa38085e1f9e708aee2c19f1d9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0006-Prevent-debug-library-names-in-pkg-config-files.patch
View File

@ -1,4 +1,4 @@
From 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001
From 3d816219968cfcaacfd30b6011263c8bb4d975c0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@ -29,5 +29,5 @@ index e94084381c..8e4d11484f 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch
View File

@ -1,4 +1,4 @@
From 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001
From 77037d64693385c1cdcc2814890567e79548b40d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 07/31] Fix linking against shared/static libpng
@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 1f08795c57..7a5fc6ce7a 100644
index c8c4864eca..be519a6d39 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -399,8 +399,10 @@
@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644
],
"use": [
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch
View File

@ -1,4 +1,4 @@
From 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001
From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 08/31] Fix linking against static D-Bus
@ -9,10 +9,10 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 50d69b740d..2433da3c20 100644
index c273aeeef1..57c40030d8 100644
--- a/configure.json
+++ b/configure.json
@@ -188,18 +188,23 @@
@@ -190,18 +190,23 @@
"dbus": {
"label": "D-Bus >= 1.2",
"test": {
@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
View File

@ -1,4 +1,4 @@
From 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001
From adb495753f647c7b78d923bb512e18003cd309a4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@ -12,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 2433da3c20..bde226843b 100644
index 57c40030d8..2fa3c08440 100644
--- a/configure.json
+++ b/configure.json
@@ -201,7 +201,7 @@
@@ -203,7 +203,7 @@
{
"libs": "",
"builds": {
@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644
},
"condition": "config.win32 && features.shared"
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch
View File

@ -1,4 +1,4 @@
From 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001
From 8a8da9fb5e44acf747985254b8e4a0e663397c15 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 10/31] Fix linking against static freetype2
@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7a5fc6ce7a..b117f6fff6 100644
index be519a6d39..d74fd3bc24 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -238,8 +238,11 @@
@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644
{ "libs": "-lfreetype" }
],
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch
View File

@ -1,4 +1,4 @@
From 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001
From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 11/31] Fix linking against static harfbuzz
@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index b117f6fff6..2a0207920a 100644
index d74fd3bc24..d6759ed96a 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -306,7 +306,11 @@
@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644
},
"imf": {
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch
View File

@ -1,4 +1,4 @@
From f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001
From 3bb30ee7403e468705aa03e1d92f797d6ce38332 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 12/31] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 729269d0f4..128baafd56 100644
index d7e3cc5ee2..e17c19fbae 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644
#include <pcre2.h>
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch
View File

@ -1,4 +1,4 @@
From d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001
From 5d301704de074aeee8464bf9933296a437353a6f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch
View File

@ -1,4 +1,4 @@
From 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001
From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
]
},
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch
View File

@ -1,4 +1,4 @@
From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001
From 092e86f5dedf3173be832f868b60b1c306c42bfa Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/31] Rename qtmain to qt5main
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch
View File

@ -1,4 +1,4 @@
From 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001
From fc76d4187ab337a5efb96d6b80099f5075df69ee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 16/31] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch
View File

@ -1,4 +1,4 @@
From 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001
From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 17/31] Use system zlib for build tools
@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index c212ccbb6f..1bf9f1e4f9 100644
index 24862a07db..698e6cfb95 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -158,7 +158,9 @@ macx {
@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644
} else {
CONFIG += no_core_dep
--
2.28.0
2.29.2

10
qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch
View File

@ -1,4 +1,4 @@
From 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001
From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 18/31] Merge shared and static library trees
@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
7 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/configure.pri b/configure.pri
index 3dedffcace..89938dfc32 100644
index 49755f7abf..53c67f885b 100644
--- a/configure.pri
+++ b/configure.pri
@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) {
@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) {
defineTest(qtConfOutput_commitOptions) {
# qdevice.pri needs to be written early, because the compile tests require it.
@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644
}
# type (empty or 'host'), option name, default value
@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) {
@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch
View File

@ -1,4 +1,4 @@
From 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001
From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
View File

@ -1,4 +1,4 @@
From 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001
From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
+endif()
\ No newline at end of file
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch
View File

@ -1,4 +1,4 @@
From ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001
From 494194c5b6b2775e756e911f5befde85e9ce13e4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 21/31] Allow usage of static version with CMake
@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
View File

@ -1,4 +1,4 @@
From 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001
From 0f44180723f14ae9861b406238d973e0ca20c405 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 22/31] Adjust linker flags for static build with
@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
+unset(_isExe)
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch
View File

@ -1,4 +1,4 @@
From 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001
From 0084c7966f46b5a64cac040a8c50c793ba680930 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/31] Use correct pkg-config --static flag
@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
index 89938dfc32..121064e1f8 100644
index 53c67f885b..8934b72291 100644
--- a/configure.pri
+++ b/configure.pri
@@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
View File

@ -1,4 +1,4 @@
From 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001
From e5389013ff78085fdfdfbf1da5b0644e784c916d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch
View File

@ -1,4 +1,4 @@
From ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001
From d29a2b44643831e439755d11348b69dc9ed6d60b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/31] Ignore errors about missing feature static
@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch
View File

@ -1,4 +1,4 @@
From 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001
From becf49560bdf91b82df7bec0bc06c54d7ab8c948 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 26/31] Enable and fix use of iconv
@ -74,5 +74,5 @@ index c5e0423273..0b12e22351 100644
},
"icu": {
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch
View File

@ -1,4 +1,4 @@
From ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001
From 2fd3c54980c0be5efa03f64c8998287d683ff54f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 27/31] Ignore failing pkg-config test
@ -9,10 +9,10 @@ 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 bde226843b..653ed122d9 100644
index 2fa3c08440..d96d2a6ecb 100644
--- a/configure.json
+++ b/configure.json
@@ -770,7 +770,6 @@
@@ -772,7 +772,6 @@
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
@ -21,5 +21,5 @@ index bde226843b..653ed122d9 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
View File

@ -1,4 +1,4 @@
From c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001
From e6e16f20966d91dd3c0020d4784d04e79b95613f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch
View File

@ -1,4 +1,4 @@
From 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001
From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@ -172,5 +172,5 @@ index 50a3bb41a9..53c011642f 100644
include(windows.pri)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch
View File

@ -1,4 +1,4 @@
From ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001
From cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 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.28.0
2.29.2

4
qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
View File

@ -1,4 +1,4 @@
From e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001
From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200
Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk'
@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
2.28.0
2.29.2

64
qt5-base/mingw-w64-dynamic/PKGBUILD
View File

@ -19,7 +19,7 @@
_qt_module=qtbase
pkgname=mingw-w64-qt5-base-dynamic
pkgver=5.15.1
pkgver=5.15.2
pkgrel=1
pkgdesc='A cross-platform application and UI framework, dynamic OpenGL backend (mingw-w64)'
arch=('i686' 'x86_64')
@ -73,37 +73,37 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44'
'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e'
'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c'
'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a'
'273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d'
'84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543'
'190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5'
'3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a'
'56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174'
'02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc'
'3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8'
'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b'
'68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2'
'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4'
'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90'
'6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424'
'3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0'
'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6'
'2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8'
'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267'
'3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384'
'19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a'
'5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c'
'84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4'
'85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787'
'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1'
'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8'
'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808'
'4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31'
'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb'
'553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9')
'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e'
'833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266'
'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc'
'944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b'
'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26'
'595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee'
'238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b'
'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c'
'859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e'
'896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb'
'15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4'
'499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548'
'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8'
'3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631'
'2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8'
'6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0'
'27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05'
'0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1'
'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f'
'7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927'
'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039'
'2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c'
'5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285'
'73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109'
'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811'
'3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e'
'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69'
'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943'
'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d'
'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab'
'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

4
qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
View File

@ -1,4 +1,4 @@
From 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001
From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
View File

@ -1,4 +1,4 @@
From 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001
From adbb14a78c0091c81925e5e79644ff8361e7b8e9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
View File

@ -1,4 +1,4 @@
From f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001
From 520b519d962852792bd4ac3c2d1206afa329b65e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch
View File

@ -1,4 +1,4 @@
From dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001
From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
View File

@ -1,4 +1,4 @@
From a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001
From 806b631662ffebfa38085e1f9e708aee2c19f1d9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch
View File

@ -1,4 +1,4 @@
From 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001
From 3d816219968cfcaacfd30b6011263c8bb4d975c0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@ -29,5 +29,5 @@ index e94084381c..8e4d11484f 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch
View File

@ -1,4 +1,4 @@
From 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001
From 77037d64693385c1cdcc2814890567e79548b40d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 07/31] Fix linking against shared/static libpng
@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 1f08795c57..7a5fc6ce7a 100644
index c8c4864eca..be519a6d39 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -399,8 +399,10 @@
@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644
],
"use": [
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch
View File

@ -1,4 +1,4 @@
From 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001
From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 08/31] Fix linking against static D-Bus
@ -9,10 +9,10 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 50d69b740d..2433da3c20 100644
index c273aeeef1..57c40030d8 100644
--- a/configure.json
+++ b/configure.json
@@ -188,18 +188,23 @@
@@ -190,18 +190,23 @@
"dbus": {
"label": "D-Bus >= 1.2",
"test": {
@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
2.28.0
2.29.2

8
qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
View File

@ -1,4 +1,4 @@
From 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001
From adb495753f647c7b78d923bb512e18003cd309a4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@ -12,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 2433da3c20..bde226843b 100644
index 57c40030d8..2fa3c08440 100644
--- a/configure.json
+++ b/configure.json
@@ -201,7 +201,7 @@
@@ -203,7 +203,7 @@
{
"libs": "",
"builds": {
@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644
},
"condition": "config.win32 && features.shared"
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch
View File

@ -1,4 +1,4 @@
From 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001
From 8a8da9fb5e44acf747985254b8e4a0e663397c15 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 10/31] Fix linking against static freetype2
@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7a5fc6ce7a..b117f6fff6 100644
index be519a6d39..d74fd3bc24 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -238,8 +238,11 @@
@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644
{ "libs": "-lfreetype" }
],
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch
View File

@ -1,4 +1,4 @@
From 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001
From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 11/31] Fix linking against static harfbuzz
@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index b117f6fff6..2a0207920a 100644
index d74fd3bc24..d6759ed96a 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -306,7 +306,11 @@
@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644
},
"imf": {
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch
View File

@ -1,4 +1,4 @@
From f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001
From 3bb30ee7403e468705aa03e1d92f797d6ce38332 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 12/31] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 729269d0f4..128baafd56 100644
index d7e3cc5ee2..e17c19fbae 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644
#include <pcre2.h>
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch
View File

@ -1,4 +1,4 @@
From d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001
From 5d301704de074aeee8464bf9933296a437353a6f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch
View File

@ -1,4 +1,4 @@
From 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001
From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
]
},
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
View File

@ -1,4 +1,4 @@
From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001
From 092e86f5dedf3173be832f868b60b1c306c42bfa Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/31] Rename qtmain to qt5main
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch
View File

@ -1,4 +1,4 @@
From 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001
From fc76d4187ab337a5efb96d6b80099f5075df69ee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 16/31] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch
View File

@ -1,4 +1,4 @@
From 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001
From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 17/31] Use system zlib for build tools
@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index c212ccbb6f..1bf9f1e4f9 100644
index 24862a07db..698e6cfb95 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -158,7 +158,9 @@ macx {
@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644
} else {
CONFIG += no_core_dep
--
2.28.0
2.29.2

10
qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch
View File

@ -1,4 +1,4 @@
From 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001
From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 18/31] Merge shared and static library trees
@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
7 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/configure.pri b/configure.pri
index 3dedffcace..89938dfc32 100644
index 49755f7abf..53c67f885b 100644
--- a/configure.pri
+++ b/configure.pri
@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) {
@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) {
defineTest(qtConfOutput_commitOptions) {
# qdevice.pri needs to be written early, because the compile tests require it.
@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644
}
# type (empty or 'host'), option name, default value
@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) {
@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch
View File

@ -1,4 +1,4 @@
From 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001
From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
View File

@ -1,4 +1,4 @@
From 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001
From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
+endif()
\ No newline at end of file
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch
View File

@ -1,4 +1,4 @@
From ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001
From 494194c5b6b2775e756e911f5befde85e9ce13e4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 21/31] Allow usage of static version with CMake
@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
View File

@ -1,4 +1,4 @@
From 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001
From 0f44180723f14ae9861b406238d973e0ca20c405 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 22/31] Adjust linker flags for static build with
@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
+unset(_isExe)
--
2.28.0
2.29.2

6
qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch
View File

@ -1,4 +1,4 @@
From 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001
From 0084c7966f46b5a64cac040a8c50c793ba680930 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/31] Use correct pkg-config --static flag
@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
index 89938dfc32..121064e1f8 100644
index 53c67f885b..8934b72291 100644
--- a/configure.pri
+++ b/configure.pri
@@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
2.28.0
2.29.2

4
qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
View File

@ -1,4 +1,4 @@
From 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001
From e5389013ff78085fdfdfbf1da5b0644e784c916d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.28.0
2.29.2

Some files were not shown because too many files have changed in this diff Show More