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

Update mingw-w64-qt5-base* to 5.15.2+kde+r222 

* Add latest patches from KDE
* Fix linking against static brotli which is now a
  dependency of mingw-w64-freetype2
This commit is contained in:
Martchus 2021-08-26 21:24:07 +02:00
parent cb49e66334
commit a1204cd899
39 changed files with 185 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/generator/generate.pl
View File

@ -75,7 +75,8 @@ $mojolicious->helper(expand_libs => sub {
# define revisions of Qt modules from KDE fork # define revisions of Qt modules from KDE fork
my %kde_fork_revisions = ( my %kde_fork_revisions = (
base => [203, 'd23de39db3b84c8c9a80da36d8d0de8da4321566', '6344955d17e17e2398720fe60c34cfc2a4a95208'], # module => [rev, 'commit on KDE fork', 'version bump to be reverted' ],
base => [222, 'd2bd04d9fe03912097d3246b7d03ef14f425256b', '6344955d17e17e2398720fe60c34cfc2a4a95208'],
declarative => [26, '4f08a2da5b0da675cf6a75683a43a106f5a1e7b8', '568763928a78b52373932b01be17e040f7c3fa50'], declarative => [26, '4f08a2da5b0da675cf6a75683a43a106f5a1e7b8', '568763928a78b52373932b01be17e040f7c3fa50'],
tools => [17, '33693a928986006d79c1ee743733cde5966ac402', 'dbe0567470db2b369a9fdb28d9fbac38be3e2d60'], tools => [17, '33693a928986006d79c1ee743733cde5966ac402', 'dbe0567470db2b369a9fdb28d9fbac38be3e2d60'],
svg => [7, 'cfc616978b52a396b2ef6900546f7fc086d7cab3', '9aac88424a1b76e0198b52437af58a6d94aff8e9'], svg => [7, 'cfc616978b52a396b2ef6900546f7fc086d7cab3', '9aac88424a1b76e0198b52437af58a6d94aff8e9'],

1
qt5-base/mingw-w64-static/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch
View File

@ -1 +0,0 @@
../mingw-w64/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch

1
qt5-base/mingw-w64-static/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch Symbolic link
View File

@ -0,0 +1 @@
../mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch

1
qt5-base/mingw-w64-static/0033-Fix-crashes-in-rasterization-code-using-setjmp.patch
View File

@ -1 +0,0 @@
../mingw-w64/0033-Fix-crashes-in-rasterization-code-using-setjmp.patch

72
qt5-base/mingw-w64-static/PKGBUILD
View File

@ -17,9 +17,9 @@
_qt_module=qtbase _qt_module=qtbase
pkgname=mingw-w64-qt5-base-static pkgname=mingw-w64-qt5-base-static
pkgver=5.15.2+kde+r203 pkgver=5.15.2+kde+r222
pkgrel=1 pkgrel=1
_commit=d23de39db3b84c8c9a80da36d8d0de8da4321566 _commit=d2bd04d9fe03912097d3246b7d03ef14f425256b
pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
arch=('any') arch=('any')
url='https://www.qt.io/' url='https://www.qt.io/'
@ -68,42 +68,40 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0029-Hardcode-linker-flags-for-platform-plugins.patch' '0029-Hardcode-linker-flags-for-platform-plugins.patch'
'0030-Fix-linking-against-static-plugins-with-qmake.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
'0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
'0033-Fix-crashes-in-rasterization-code-using-setjmp.patch')
sha256sums=('SKIP' sha256sums=('SKIP'
'8613f8d23c5440a46d4a0f9c4539381005e2818b90ea496193eed92786edb16f' '673d95d4fff53ef4ebfa1313d5cf5f853ef5eb0b38b357fb3c976f09d2bd7136'
'679799aa865366497d7475bab40464a5957328cc3c0e5da28a0db878c8f8573b' 'a668123b178ff8ef787a9f727faea8ef61fc3eff4495cb24117001a8516f3b2f'
'b56fdf550506c9d44838c5fda6652193cf592106779fb54ebe4a45ef320a6af9' '1fa09d3de43f5bd59322b2215a772bd1e2f5cf417c59280e430b78fdaad0fa59'
'30a32bfc481ba0c314d2767cc4a064fbc07802469a641f271629cebd2ac9a761' 'ee1f130f1de5726918820c02e8aecc735b4586854e1974373e8fc81eb9db5acf'
'3144ef696efd1364a24de1badf9bb80b4101c77edb7939fb8718a903d7bf26c2' '85685c1d3b919f1d99f8c270afc649a3440032a498068ab79e1fb18fd61c0557'
'13c2e0c1af4ef8465c7f342c7a5eff418a276de750dc7fabb5c203332ec9e64c' '71e75d9cdb87ff24bb26a56ddf27d059b48b16089b3b90a8d5d2d50075503c7e'
'369919f5b9ceb7cceafc05bd5c65e3c81c35e93a44c735ce3aba7deeb8f424ff' '1a602b36ab940ab4e36f1392e80f084847f04bdd0505b66d0534ac9f1cf7a0d2'
'46bbcc0ff97daba70cda9f2e80b56f929f3e601ad3350ae00c78c68aabed1570' '8a4f74e1e072cc768300c97e9ae98ea4843003e6800acc4abd190277c3bc9567'
'8fafbc2c0b124ab8489a99860062d96f98305b81e9dd91d32b500710ef4ed0af' 'f23ed6dd3092ad25edf75a60cf5874192d258521fa2202d727b8dcecc7d619af'
'5bbce61594fd594cbef497689ffb11df5ef9fdfb1ac568b0e111c1aaf8f4c665' '01ed0f661eae93bae0b389bfd7e371848944a34884c64a89956f80c66cdf7aad'
'97bfd341b18a0c22085ed451351a9709d536b7a93fdf4b994bd171ec5f913ca2' '40d9e763f1bb9e64e3ad061c24fddfd4f1f4380ae082cf41cd4cd02c3a9c1e74'
'0dcba5a7d147fc84cf4e2744a03c268aadbaffba0f2e2958a3fa75d4fa958f1b' '2b4bf3f6f81aff4a69fb458e0ff20d9ae3bce86f0f5a92ff0f3fdba6f6776d98'
'a545af810eab032617aabef87dbd951c2f73019f223180c4b771e3e020dc9edb' '7eda33569fdcc02c2af234b3195de5a48d9160b67ea855e41dd4ffed09b2fef1'
'9f850469676a4b8ba4fc1ee6eefb321ad09a5cd1395e999cb1f765aeb774e1a4' '8f3584e0c42ada309b8cdbb0925e301b60ce1d7a00e1425e954c8459fec6d0fc'
'493bfc5d6db5199648656525780183c6f52f4afb7695b2aa22d2e96cf6d70507' '7597b1e72c1ac6c04b7f9e7a6f05820ad4f00709542b790981362001aef1eeb7'
'ca0888582955a0ccf92b68829c8f0441aa5ece9d0bfec496c3b8d3f8c88bd5ea' '2cb69a4efcb771ccf1a6877eecb56dc934317091cd569c3a6398057a8b279d64'
'da49b774077d4759bbbc5d5c2a5d1ec52b9a3c53621da996d870945d4e393b1c' '382f89931578c6ddf1330dbbc0c1a688d58a6dcaa4308fdf8dffc759dc4323eb'
'4242302b53bd487faf399d4fad193dc312e377a9583ea5ebefa5c0368bf77117' 'c0517268f755f2c2a35f184e79c62e09ba4c0b29d30f7c510ada2cd974adcc47'
'3fed7f019a61ca0ed1df4cb9456c78e75bacf3daa75ac1ab2206d2c8cfce1199' 'efd822a8aed39f243d34e1d0087dc429b03e43351b2dbffdcb765904c8226869'
'eede73419d13d66b093e005f455a657505f6d6063b38de691c8cdb56358f3cb8' '43952eed3a78b13e22761bb2b777f2b76a499678bc483d4f0bafc6a42434db74'
'ea60c37493ec14d9048cefead9dc8dbc7acafb1dca5543b3d480b1ea84280a04' 'b09327ffc2ee055a87f577f8523051eb4cfc9d583d99a5e9b394bf20ca1260f6'
'39ce306ab1d3b264ed567f72f5c3e397c4a9d6c562741ff0df1a1d97a21cc92a' '4466cde0c17e5b5406a59dc12f27c57c22d1ce90b03635c20ef3f451e7cbc9be'
'5ae44f415817a53106ff9a9a3c64aabdb44d8f200bda302bdd51491597b83951' '6fc8cc928c9530a5816e37e9a4f433693d047e99a11060778d6693128c3bba7a'
'1e95190e1cfc9ab7692ad796c0217144a770f3f644697939f2bcb93a0c8aa569' '5d5a473d2020ec13ba100755543fe32bbeca2f328f3a44cf79869b0658fb22a2'
'dec83c48a3d337d47e480e75fbb853a6f2563d0901f39cbb76b84e8c5483f069' 'eb795b524330baa0bc633ba435ff12a854339035b758427c8cb0811b14591ca5'
'680854dabbfa446dc9d50c270be1eeff01faf8fc83594e0cea08f9df6602553a' 'e934e64bd17db6f2baa21494de77f5a28dfb13b191fbc3160fcc354eb36cba6a'
'fa8d9f78d4a6b329303a20d6511b4ee46722536f8621fc77721bf45185244251' '1ebb0893fac53610a54e2f38c88e4771b334ea59f79f7af4230fe0049b960513'
'3e834ad4bc6f4e28fcb9afba31531d91e8ec962775e21014bce977b2467c5054' '5984d1bf12316884bd26ec19153361ff48b0dc0e1d2c021ac22ae84188306985'
'0e3fb673f45ededf99c6b13c922cc8873202f4ba066b9ba05e8c47b529fe027f' '005a89333608ba1b491f35d877f41590a11cd40813c74227d601fb91c61b3f3d'
'8eb6a0e9cd837263728148ed00785a4f98bc524eeb7bdd658880757eeda3250e' '4bd0ef4e5db033a6652e31f68d35ef505a9944e7cc974705bc2322f087d95cd7'
'2aa935715d8415686aaa812e8cea57b0e5e5391bead12219aee424d2aeef17c1' '2d16a3ca82c47ccc3a0b82f9f33b8536bd0159e40410c158ec85936bba7bacd9'
'e1526e6e1ddcccbdf06de55ccc411fb1983c58abfa776fd0112545392e0e9d6e' '7880b548f9d3e87aa93a50ef1d411b682cf70d97420969f854db5ce43ee7e1d8')
'b0a1d82dc22dc02d993224f4391ad297fdd7e992e8d2bcaabb106f28a9f243e6')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

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

@ -1,7 +1,7 @@
From 7c9a1d941889ec1236bc664321db7b2c755d63b4 Mon Sep 17 00:00:00 2001 From 94179eefc9975b63ce7501d37cc67772e5a1ad19 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100 Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
mingw-w64 mingw-w64
Adding a new, separate mkspec instead of patching the existing one Adding a new, separate mkspec instead of patching the existing one
@ -15,13 +15,13 @@ Also see the following issues:
Change-Id: I127bb0516bd4acfea588a5d48c46811525a8fca8 Change-Id: I127bb0516bd4acfea588a5d48c46811525a8fca8
--- ---
mkspecs/common/g++-win32.conf | 50 ++++++++++++++++++++---------- mkspecs/common/g++-win32.conf | 51 ++++++++++++++++++++----------
mkspecs/win32-clang-g++/qmake.conf | 4 +-- mkspecs/win32-clang-g++/qmake.conf | 4 +--
mkspecs/win32-g++/qmake.conf | 4 +-- mkspecs/win32-g++/qmake.conf | 4 +--
3 files changed, 37 insertions(+), 21 deletions(-) 3 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index c3a1f3a373..d852ccc2ad 100644 index c3a1f3a373..793ff540a1 100644
--- a/mkspecs/common/g++-win32.conf --- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf
@@ -8,18 +8,24 @@ @@ -8,18 +8,24 @@
@ -60,7 +60,7 @@ index c3a1f3a373..d852ccc2ad 100644
QMAKE_INCDIR = QMAKE_INCDIR =
@@ -41,40 +48,49 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src @@ -41,40 +48,50 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
@ -95,7 +95,8 @@ index c3a1f3a373..d852ccc2ad 100644
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +QMAKE_LIBS_CORE = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) $$system($${QMAKE_PKG_CONFIG} --libs freetype2) \ +QMAKE_LIBS_GUI = $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) $$system($${QMAKE_PKG_CONFIG} --libs freetype2) \
+ -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 + -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
+QMAKE_LIBS_GUI_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) \ +QMAKE_LIBS_GUI_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz | sed -e "'s/\\([^ ]*\\)brotli\\([^ ]*\\)/\\1brotli\\2-static/g'" ) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2 | sed -e "'s/\\([^ ]*\\)brotli\\([^ ]*\\)/\\1brotli\\2-static/g'" ) \
+ -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ldxgi -ld3d11 + -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ldxgi -ld3d11
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi +QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi +QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
@ -161,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++ QMAKE_LINK = $${CROSS_COMPILE}g++
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 14a16cff351d13b14bfa70f88455999fbdf17c80 Mon Sep 17 00:00:00 2001 From 33434b8619105cd5e794232bf862bc65926e3d6b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200 Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
FIXME: Not sure whether this is still required FIXME: Not sure whether this is still required
--- ---
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h> #include <stdio.h>
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 130b76cebed8dcb0fcf31dae4c29a269f77d2302 Mon Sep 17 00:00:00 2001 From 231d2dc14bced9cd310220637195c9a72c545feb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200 Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 03/33] Fix too many sections assemler error in OpenGL factory Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory
On x86_64 qopenglversionfunctionsfactory.o exceeds the On x86_64 qopenglversionfunctionsfactory.o exceeds the
limit of 32768 sections. limit of 32768 sections.
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \ HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \ opengl/qopengl_p.h \
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From add7cd75298bc870042cf4d847668f16cf4c6af4 Mon Sep 17 00:00:00 2001 From b9778b9bcd2fd2a1ae8462d68bfbf081de21e003 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200 Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 04/33] Make sure *.pc files are installed correctly Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
--- ---
qmake/generators/makefile.cpp | 8 ++++++-- qmake/generators/makefile.cpp | 8 ++++++--
@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
uninst.append("\n\t"); uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From cd00692354e0cb89f562e8677d2dfe60aaad962b Mon Sep 17 00:00:00 2001 From d42eca13bd890c08813b6fe4b9fdca2f020cb568 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200 Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 05/33] Don't add resource files to LIBS parameter Subject: [PATCH 05/32] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config Solves an issue where the generated pkg-config
files contained invalid Libs.private references files contained invalid Libs.private references
@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
if (project->isActiveConfig("dll")) { if (project->isActiveConfig("dll")) {
QString destDir = ""; QString destDir = "";
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 9a6e5a7076f9ae8b8a4adf250a1d256171a2e59b Mon Sep 17 00:00:00 2001 From 4e95a38dac9325acb275190cb51cd52f823fea96 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200 Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/33] Prevent debug library names in pkg-config files Subject: [PATCH 06/32] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually release build and once for the debug build (which we're not actually
@ -29,5 +29,5 @@ index f1e8966123..f45b6c9fd5 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) { if(!subdir.isEmpty()) {
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 7d65ad4667e08a597fb484885e52bcd2c80f091b Mon Sep 17 00:00:00 2001 From 69350056a32494fb87219dc002bf29fc38fa5aa8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100 Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 07/33] Fix linking against shared/static libpng Subject: [PATCH 07/32] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
--- ---
@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644
], ],
"use": [ "use": [
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From c6effb1b9d08d314a3628baf06400d2303100f47 Mon Sep 17 00:00:00 2001 From d9cbf72a6707d583bea38d83b5cb81bd535493a4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100 Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 08/33] Fix linking against static D-Bus Subject: [PATCH 08/32] Fix linking against static D-Bus
--- ---
configure.json | 9 +++++++-- configure.json | 9 +++++++--
@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h> # include <dbus/dbus.h>
#else #else
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 2eddcbb81c70a66086e8aa068ff14e704e6cba48 Mon Sep 17 00:00:00 2001 From 3415803b3ef3de8eadea5372caa3284a7aab9ed6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200 Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library
Required for a debug build of Qt because mingw-w64-dbus Required for a debug build of Qt because mingw-w64-dbus
does not contain debug version does not contain debug version
@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644
}, },
"condition": "config.win32 && features.shared" "condition": "config.win32 && features.shared"
-- --
2.32.0 2.33.0

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

@ -1,30 +1,30 @@
From 87bbab7f185fa14c42bd7744eaf4fa507ab8d711 Mon Sep 17 00:00:00 2001 From f634820aef5904589dc2c4e10a79f87d3f72a323 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100 Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 10/33] Fix linking against static freetype2 Subject: [PATCH 10/32] Fix linking against static freetype2
Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f
--- ---
src/gui/configure.json | 7 +++++-- src/gui/configure.json | 6 ++++--
1 file changed, 5 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7a5fc6ce7a..b117f6fff6 100644 index 7a5fc6ce7a..0ec8cbf876 100644
--- a/src/gui/configure.json --- a/src/gui/configure.json
+++ b/src/gui/configure.json +++ b/src/gui/configure.json
@@ -238,8 +238,11 @@ @@ -238,8 +238,10 @@
}, },
"headers": "ft2build.h", "headers": "ft2build.h",
"sources": [ "sources": [
- { "type": "pkgConfig", "args": "freetype2" }, - { "type": "pkgConfig", "args": "freetype2" },
- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, - { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+ { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
+ { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" }, + { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
+ { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, + { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec-static -lbrotlicommon-static -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
+ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
+ { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, + { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
{ "libs": "-lfreetype" } { "libs": "-lfreetype" }
], ],
-- --
2.32.0 2.33.0

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

@ -1,17 +1,17 @@
From a6c798da0571df897d761c9c401dfa2161b3d9a6 Mon Sep 17 00:00:00 2001 From 0d8428e3978921225f0810a863000d3184c25596 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200 Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 11/33] Fix linking against static harfbuzz Subject: [PATCH 11/32] Fix linking against static harfbuzz
--- ---
src/gui/configure.json | 6 +++++- src/gui/configure.json | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json diff --git a/src/gui/configure.json b/src/gui/configure.json
index b117f6fff6..2a0207920a 100644 index 0ec8cbf876..5fecce5401 100644
--- a/src/gui/configure.json --- a/src/gui/configure.json
+++ b/src/gui/configure.json +++ b/src/gui/configure.json
@@ -306,7 +306,11 @@ @@ -305,7 +305,11 @@
}, },
"headers": "harfbuzz/hb.h", "headers": "harfbuzz/hb.h",
"sources": [ "sources": [
@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644
}, },
"imf": { "imf": {
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 9e6f97f8709f80021772435db4b7060aed302731 Mon Sep 17 00:00:00 2001 From 84b33fe8ea3f8351d2907b2a61cac14282a6a1e0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200 Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 12/33] Fix linking against static pcre Subject: [PATCH 12/32] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
--- ---
@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644
#include <pcre2.h> #include <pcre2.h>
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 8e0ec58cc815467e27eba78d1c25097629a048f8 Mon Sep 17 00:00:00 2001 From 7fb7108b51f88ca0a3cc20cb26ee3575d2cd1c76 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200 Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/33] Fix linking against shared/static MariaDB Subject: [PATCH 13/32] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
--- ---
@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 272c994b5d871fe90474346b71365b7aacae2ff4 Mon Sep 17 00:00:00 2001 From f3d9434b92c3df54ecd3a2ce19c51d27960cb2e9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200 Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
--- ---
src/plugins/sqldrivers/configure.json | 4 ++-- src/plugins/sqldrivers/configure.json | 4 ++--
@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
] ]
}, },
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 11ba5d7b2b2cbe6e30c10de9bc1e24de32263cf8 Mon Sep 17 00:00:00 2001 From 05bdef7e0c5ef74172f61ecb463b906ba3b9fbbb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200 Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/33] Rename qtmain to qt5main Subject: [PATCH 15/32] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package Prevents conflict with mingw-w64-qt4 package
--- ---
@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package
4 files changed, 8 insertions(+), 8 deletions(-) 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index d852ccc2ad..11249c1470 100644 index 793ff540a1..4f3bb7e764 100644
--- a/mkspecs/common/g++-win32.conf --- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf
@@ -82,7 +82,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -83,7 +83,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 = -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_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static CONFIG += static
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From be767e4b4f50cb63a54d6584395836fa5550ca51 Mon Sep 17 00:00:00 2001 From bdeac448c60733a0176326c9580128e79a901660 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200 Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 16/33] Enable rpath for build tools Subject: [PATCH 16/32] Enable rpath for build tools
- Required because various tools depend on libQt5Bootstrap.so which resides - Required because various tools depend on libQt5Bootstrap.so which resides
in folder /usr/${_arch}/lib in folder /usr/${_arch}/lib
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target INSTALLS += target
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 07e0162c5efd8621043e7c6fecc815080e406377 Mon Sep 17 00:00:00 2001 From 10c03ee2e63995a02965a9e788c51ced69f18509 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200 Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 17/33] Use system zlib for build tools Subject: [PATCH 17/32] Use system zlib for build tools
--- ---
src/tools/bootstrap/bootstrap.pro | 4 +++- src/tools/bootstrap/bootstrap.pro | 4 +++-
@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644
} else { } else {
CONFIG += no_core_dep CONFIG += no_core_dep
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 1362122e2ccf7f66461ac7eb3e57f401a1520da5 Mon Sep 17 00:00:00 2001 From 7fc83ce1124e927403992ab7f3b715f4f57fc22f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200 Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 18/33] Merge shared and static library trees Subject: [PATCH 18/32] Merge shared and static library trees
Allow installation of shared and static build in the same prefix Allow installation of shared and static build in the same prefix
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs INSTALLS += mkspecs
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 3c6f9d8a92095de476ba005de6c013ed733ff525 Mon Sep 17 00:00:00 2001 From ffa44aca0f4f16a75719bcb70cca2a4c25af0f73 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200 Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 19/33] Use *.dll.a as import lib extension Subject: [PATCH 19/32] Use *.dll.a as import lib extension
The variables used here are provided by The variables used here are provided by
g++-win32.conf g++-win32.conf
@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
+ project->first("QMAKE_EXTENSION_SHLIB")); + project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 56674d9cda43e40fd996377f664a209cd9fa59ba Mon Sep 17 00:00:00 2001 From 9e9dc3a65adefc2e66cc5c685253bf94e309eae8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200 Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules
When doing a static build of Qt, the dependencies of the Qt When doing a static build of Qt, the dependencies of the Qt
libraries and plugins itself must be specified when linking libraries and plugins itself must be specified when linking
@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
+endif() +endif()
\ No newline at end of file \ No newline at end of file
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 0a3673b27f9f405f454c2721455f027b6e76ba29 Mon Sep 17 00:00:00 2001 From 7c16fa7365745aea90d95d88687bcb6e7e6a9c48 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200 Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 21/33] Allow usage of static version with CMake Subject: [PATCH 21/32] Allow usage of static version with CMake
Allow selecting between dynamic and static Qt versions Allow selecting between dynamic and static Qt versions
installed in the same prefix installed in the same prefix
@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
) )
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 591ca364284f36216d94b733199c1c4ecf3875ea Mon Sep 17 00:00:00 2001 From 63bab93ceb6d6d3582614339808baf65fb012938 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200 Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 22/33] Adjust linker flags for static build with Subject: [PATCH 22/32] Adjust linker flags for static build with
cmake/mingw-w64 cmake/mingw-w64
It is not clear anymore where I picked that change up and for It is not clear anymore where I picked that change up and for
@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
+unset(_isExe) +unset(_isExe)
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 4c84df9ca4fd869f6f2e26adabe1bfd43be61bc0 Mon Sep 17 00:00:00 2001 From d1beab36453a2fef697a99540ca54c3f475ca0d0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200 Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/33] Use correct pkg-config --static flag Subject: [PATCH 23/32] Use correct pkg-config --static flag
--- ---
configure.pri | 3 +++ configure.pri | 3 +++
@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644
$$qtConfEvaluate("features.cross_compile") { $$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely # cross compiling, check that pkg-config is set up sanely
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 2b7cabd5dfabde92be857b8a83bb1ae165ddc40b Mon Sep 17 00:00:00 2001 From 8eb6dd55514f6c9be8c0ceef874a46b2812416dc Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100 Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
* Otherwise the arguments aren't passed correctly leading to errors like * Otherwise the arguments aren't passed correctly leading to errors like
``` ```
@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM) MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From dc3330545d086d326388abdfada6944ab40758db Mon Sep 17 00:00:00 2001 From 1b5e0852e54f5423d50710c0dfddbdf380c6f6c9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100 Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/33] Ignore errors about missing feature static Subject: [PATCH 25/32] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best Not sure why this error occurs, let's hope for the best
--- ---
@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.") + !equals($$1, "static"): error("Could not find feature $${1}.")
} }
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 67d5723aa65b298750768d935fd0cf94d0897428 Mon Sep 17 00:00:00 2001 From 92a3c211751ca20bb19781593482400735ed5ec1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100 Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 26/33] Enable and fix use of iconv Subject: [PATCH 26/32] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
--- ---
@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644
}, },
"icu": { "icu": {
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 4ef00b0b3619c16b44c0a9262abc07ab535b2b03 Mon Sep 17 00:00:00 2001 From cd96a8e745f032e99d6ae925876023fe3a11bede Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100 Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 27/33] Ignore failing pkg-config test Subject: [PATCH 27/32] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best Didn't investigate why it fails, let's hope for the best
--- ---
@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644
"publicFeature", "publicFeature",
{ "type": "publicQtConfig", "negative": true }, { "type": "publicQtConfig", "negative": true },
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 1d3c12ff5e8198df944cb9698edffbaab592679e Mon Sep 17 00:00:00 2001 From 87e93f22eb181ef34e5a655ccdb112152174b118 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100 Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz static freetype2 and harfbuzz
@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
int libidx = 0; int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From d938c273c62dfc0c80fbd0385702475dfce16356 Mon Sep 17 00:00:00 2001 From f6480d499b8c6681c8930856b6900a8cde4fd77b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100 Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 29/33] Hardcode linker flags for platform plugins Subject: [PATCH 29/32] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll, when building libqminimal.dll, libqoffscreen.dll,
@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644
include(windows.pri) include(windows.pri)
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From 33c9678920e94ab5793e8d5fab099dd691a394e2 Mon Sep 17 00:00:00 2001 From 9873f7b3644bfd7427f5329b04624c4931ac4a09 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200 Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 30/33] Fix linking against static plugins with qmake Subject: [PATCH 30/32] Fix linking against static plugins with qmake
Required because qtConfig(static) does not work Required because qtConfig(static) does not work
with 'Merge shared and static library trees' with 'Merge shared and static library trees'
@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644
# Check if the plugin is known to Qt. We can use this to determine # 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. # the plugin path. Unknown plugins must rely on the default link path.
-- --
2.32.0 2.33.0

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

@ -1,7 +1,7 @@
From df5939796b2fd80511bfac5f9deec63b21b3b37a Mon Sep 17 00:00:00 2001 From 3c1281d85bffc86c2f66721101f60e9023f46b59 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200 Date: Mon, 24 Jun 2019 13:51:02 +0200
Subject: [PATCH 31/33] Prevent 'Cannot find feature windows_vulkan_sdk' Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk'
See https://bugreports.qt.io/browse/QTBUG-76660 See https://bugreports.qt.io/browse/QTBUG-76660
--- ---
@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) { for (nu, LD_USES) {
-- --
2.32.0 2.33.0

29
qt5-base/mingw-w64/0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch
View File

@ -1,29 +0,0 @@
From 06f2dfec9162ad46deefb0d6a02a5a3ec0074e9c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 1 Jun 2021 13:00:33 +0200
Subject: [PATCH 32/33] Add missing `#include <limits>` in QOffsetStringArray
header
At least with GCC 10/11 targeting mingw-w64 the compilation
fails otherwise.
Change-Id: Icad20343a58f9aa1293ba443bebf70373e7dc762
---
src/corelib/tools/qoffsetstringarray_p.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
index 4dd9e9603b..e26a57ff43 100644
--- a/src/corelib/tools/qoffsetstringarray_p.h
+++ b/src/corelib/tools/qoffsetstringarray_p.h
@@ -55,6 +55,7 @@
#include <tuple>
#include <array>
+#include <limits>
QT_BEGIN_NAMESPACE
--
2.32.0

6
qt5-base/mingw-w64/0033-Fix-crashes-in-rasterization-code-using-setjmp.patch → qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
View File

@ -1,7 +1,7 @@
From 696ff656d0ec521653a0095db09fd87c859212bb Mon Sep 17 00:00:00 2001 From e05de09d529448fb34ad2255650cf2dba2d8d199 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net> From: Martchus <martchus@gmx.net>
Date: Sat, 26 Jun 2021 22:24:12 +0200 Date: Sat, 26 Jun 2021 22:24:12 +0200
Subject: [PATCH 33/33] Fix crashes in rasterization code using setjmp Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -244,5 +244,5 @@ index 7b16e8c211..38f03b73d8 100644
"Description": "FreeType is a freely available software library to render fonts.", "Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org", "Homepage": "http://www.freetype.org",
-- --
2.32.0 2.33.0

72
qt5-base/mingw-w64/PKGBUILD
View File

@ -17,9 +17,9 @@
_qt_module=qtbase _qt_module=qtbase
pkgname=mingw-w64-qt5-base pkgname=mingw-w64-qt5-base
pkgver=5.15.2+kde+r203 pkgver=5.15.2+kde+r222
pkgrel=1 pkgrel=1
_commit=d23de39db3b84c8c9a80da36d8d0de8da4321566 _commit=d2bd04d9fe03912097d3246b7d03ef14f425256b
pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='https://www.qt.io/' url='https://www.qt.io/'
@ -67,42 +67,40 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
'0029-Hardcode-linker-flags-for-platform-plugins.patch' '0029-Hardcode-linker-flags-for-platform-plugins.patch'
'0030-Fix-linking-against-static-plugins-with-qmake.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
'0032-Add-missing-include-limits-in-QOffsetStringArray-hea.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
'0033-Fix-crashes-in-rasterization-code-using-setjmp.patch')
sha256sums=('SKIP' sha256sums=('SKIP'
'8613f8d23c5440a46d4a0f9c4539381005e2818b90ea496193eed92786edb16f' '673d95d4fff53ef4ebfa1313d5cf5f853ef5eb0b38b357fb3c976f09d2bd7136'
'679799aa865366497d7475bab40464a5957328cc3c0e5da28a0db878c8f8573b' 'a668123b178ff8ef787a9f727faea8ef61fc3eff4495cb24117001a8516f3b2f'
'b56fdf550506c9d44838c5fda6652193cf592106779fb54ebe4a45ef320a6af9' '1fa09d3de43f5bd59322b2215a772bd1e2f5cf417c59280e430b78fdaad0fa59'
'30a32bfc481ba0c314d2767cc4a064fbc07802469a641f271629cebd2ac9a761' 'ee1f130f1de5726918820c02e8aecc735b4586854e1974373e8fc81eb9db5acf'
'3144ef696efd1364a24de1badf9bb80b4101c77edb7939fb8718a903d7bf26c2' '85685c1d3b919f1d99f8c270afc649a3440032a498068ab79e1fb18fd61c0557'
'13c2e0c1af4ef8465c7f342c7a5eff418a276de750dc7fabb5c203332ec9e64c' '71e75d9cdb87ff24bb26a56ddf27d059b48b16089b3b90a8d5d2d50075503c7e'
'369919f5b9ceb7cceafc05bd5c65e3c81c35e93a44c735ce3aba7deeb8f424ff' '1a602b36ab940ab4e36f1392e80f084847f04bdd0505b66d0534ac9f1cf7a0d2'
'46bbcc0ff97daba70cda9f2e80b56f929f3e601ad3350ae00c78c68aabed1570' '8a4f74e1e072cc768300c97e9ae98ea4843003e6800acc4abd190277c3bc9567'
'8fafbc2c0b124ab8489a99860062d96f98305b81e9dd91d32b500710ef4ed0af' 'f23ed6dd3092ad25edf75a60cf5874192d258521fa2202d727b8dcecc7d619af'
'5bbce61594fd594cbef497689ffb11df5ef9fdfb1ac568b0e111c1aaf8f4c665' '01ed0f661eae93bae0b389bfd7e371848944a34884c64a89956f80c66cdf7aad'
'97bfd341b18a0c22085ed451351a9709d536b7a93fdf4b994bd171ec5f913ca2' '40d9e763f1bb9e64e3ad061c24fddfd4f1f4380ae082cf41cd4cd02c3a9c1e74'
'0dcba5a7d147fc84cf4e2744a03c268aadbaffba0f2e2958a3fa75d4fa958f1b' '2b4bf3f6f81aff4a69fb458e0ff20d9ae3bce86f0f5a92ff0f3fdba6f6776d98'
'a545af810eab032617aabef87dbd951c2f73019f223180c4b771e3e020dc9edb' '7eda33569fdcc02c2af234b3195de5a48d9160b67ea855e41dd4ffed09b2fef1'
'9f850469676a4b8ba4fc1ee6eefb321ad09a5cd1395e999cb1f765aeb774e1a4' '8f3584e0c42ada309b8cdbb0925e301b60ce1d7a00e1425e954c8459fec6d0fc'
'493bfc5d6db5199648656525780183c6f52f4afb7695b2aa22d2e96cf6d70507' '7597b1e72c1ac6c04b7f9e7a6f05820ad4f00709542b790981362001aef1eeb7'
'ca0888582955a0ccf92b68829c8f0441aa5ece9d0bfec496c3b8d3f8c88bd5ea' '2cb69a4efcb771ccf1a6877eecb56dc934317091cd569c3a6398057a8b279d64'
'da49b774077d4759bbbc5d5c2a5d1ec52b9a3c53621da996d870945d4e393b1c' '382f89931578c6ddf1330dbbc0c1a688d58a6dcaa4308fdf8dffc759dc4323eb'
'4242302b53bd487faf399d4fad193dc312e377a9583ea5ebefa5c0368bf77117' 'c0517268f755f2c2a35f184e79c62e09ba4c0b29d30f7c510ada2cd974adcc47'
'3fed7f019a61ca0ed1df4cb9456c78e75bacf3daa75ac1ab2206d2c8cfce1199' 'efd822a8aed39f243d34e1d0087dc429b03e43351b2dbffdcb765904c8226869'
'eede73419d13d66b093e005f455a657505f6d6063b38de691c8cdb56358f3cb8' '43952eed3a78b13e22761bb2b777f2b76a499678bc483d4f0bafc6a42434db74'
'ea60c37493ec14d9048cefead9dc8dbc7acafb1dca5543b3d480b1ea84280a04' 'b09327ffc2ee055a87f577f8523051eb4cfc9d583d99a5e9b394bf20ca1260f6'
'39ce306ab1d3b264ed567f72f5c3e397c4a9d6c562741ff0df1a1d97a21cc92a' '4466cde0c17e5b5406a59dc12f27c57c22d1ce90b03635c20ef3f451e7cbc9be'
'5ae44f415817a53106ff9a9a3c64aabdb44d8f200bda302bdd51491597b83951' '6fc8cc928c9530a5816e37e9a4f433693d047e99a11060778d6693128c3bba7a'
'1e95190e1cfc9ab7692ad796c0217144a770f3f644697939f2bcb93a0c8aa569' '5d5a473d2020ec13ba100755543fe32bbeca2f328f3a44cf79869b0658fb22a2'
'dec83c48a3d337d47e480e75fbb853a6f2563d0901f39cbb76b84e8c5483f069' 'eb795b524330baa0bc633ba435ff12a854339035b758427c8cb0811b14591ca5'
'680854dabbfa446dc9d50c270be1eeff01faf8fc83594e0cea08f9df6602553a' 'e934e64bd17db6f2baa21494de77f5a28dfb13b191fbc3160fcc354eb36cba6a'
'fa8d9f78d4a6b329303a20d6511b4ee46722536f8621fc77721bf45185244251' '1ebb0893fac53610a54e2f38c88e4771b334ea59f79f7af4230fe0049b960513'
'3e834ad4bc6f4e28fcb9afba31531d91e8ec962775e21014bce977b2467c5054' '5984d1bf12316884bd26ec19153361ff48b0dc0e1d2c021ac22ae84188306985'
'0e3fb673f45ededf99c6b13c922cc8873202f4ba066b9ba05e8c47b529fe027f' '005a89333608ba1b491f35d877f41590a11cd40813c74227d601fb91c61b3f3d'
'8eb6a0e9cd837263728148ed00785a4f98bc524eeb7bdd658880757eeda3250e' '4bd0ef4e5db033a6652e31f68d35ef505a9944e7cc974705bc2322f087d95cd7'
'2aa935715d8415686aaa812e8cea57b0e5e5391bead12219aee424d2aeef17c1' '2d16a3ca82c47ccc3a0b82f9f33b8536bd0159e40410c158ec85936bba7bacd9'
'e1526e6e1ddcccbdf06de55ccc411fb1983c58abfa776fd0112545392e0e9d6e' '7880b548f9d3e87aa93a50ef1d411b682cf70d97420969f854db5ce43ee7e1d8')
'b0a1d82dc22dc02d993224f4391ad297fdd7e992e8d2bcaabb106f28a9f243e6')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32' _architectures='i686-w64-mingw32 x86_64-w64-mingw32'