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

Update mingw-w64-qt5-* packages to 5.10.1

This commit is contained in:
Martchus 2018-02-15 00:14:36 +01:00
parent ff8d87af6c
commit 11f8ccba19
192 changed files with 1569 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devel/qt5/update-patches.sh
View File

@ -13,20 +13,39 @@ if ! [[ $1 ]]; then
exit -1
fi
pkgbuildsdirs=()
if [[ $DEFAULT_PKGBUILDS_DIR ]]; then
# split colon separated path
OIFS=$IFS
IFS=':'
for dir in $DEFAULT_PKGBUILDS_DIR; do
pkgbuildsdirs+=("$dir")
done
IFS=$OIFS
else
pkgbuildsdirs+=("$PWD/pkgbuilds")
fi
pkg="qt5-$1"
repo="qt$1"
variant="${2:-mingw-w64}"
dest="${DEFAULT_PKGBUILDS_DIR}/${pkg}/${variant}"
wd="${QT_GIT_REPOS_DIR}/${repo}"
# find dest dir
for dir in "${pkgbuildsdirs[@]}"; do
dest="${dir}/${pkg}/${variant}"
[[ -d $dest ]] && break || dest=
done
if ! [[ $dest ]]; then
echo "\$DEFAULT_PKGBUILDS_DIR/$pkg/${variant} is no directory."
exit -3
fi
# find repo dir
wd="${QT_GIT_REPOS_DIR}/${repo}"
if ! [[ -d $wd ]]; then
echo "\$QT_GIT_REPOS_DIR/$repo is no directory."
exit -2
fi
if ! [[ -d $dest ]]; then
echo "\$DEFAULT_PKGBUILDS_DIR/$pkg/${variant} is no directory."
exit -3
fi
source "$dest/PKGBUILD"

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

@ -9,7 +9,7 @@
_qt_module=qt3d
pkgname="mingw-w64-qt5-3d"
pkgver=5.10.0
pkgver=5.10.1
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom')
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=('12457e7227c793274329371c60b9028ab3e44db837e875e2c460367c1dbd34ab')
sha256sums=('041fb42536a72bbf9be17a6f52d4b73ce93fb98b456fd63503cc47d80d196b3b')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \
@ -66,6 +66,19 @@ package() {
pushd build-${_arch}-${_config##*=}
make INSTALL_ROOT="$pkgdir" install
# Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
if [[ -d 'lib' ]]; then
pushd 'lib'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
popd
fi
if [[ -d 'plugins' ]]; then
pushd 'plugins'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
popd
fi
# The .dll's are installed in both bindir and libdir, one copy of the .dll's is sufficient
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
@ -77,5 +90,8 @@ package() {
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
popd
done
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
done
}

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

@ -1,4 +1,4 @@
From 5e50bfc8c4dbc276ee4ec189794584f7b8bdf2a2 Mon Sep 17 00:00:00 2001
From e706e77b6b080f3b6fc7bfe82d1770d770e85733 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.15.1
2.16.1

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

@ -1,4 +1,4 @@
From 986644a25ba7d02fb0044b1cb163329e2b8f4e89 Mon Sep 17 00:00:00 2001
From a6d1363812cf4d66a40aeba61774f8b29144eea9 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
@ -52,5 +52,5 @@ index 1f0cca8..d26bd78 100644
}
--
2.15.1
2.16.1

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

@ -9,7 +9,7 @@
_qt_module=qtactiveqt
pkgname=mingw-w64-qt5-activeqt
pkgver=5.10.0
pkgver=5.10.1
pkgrel=1
arch=('any')
pkgdesc="ActiveX integration framework (mingw-w64)"
@ -23,9 +23,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=('f9d74034ffe6e54278f1720d4c8c678f80882b9fffa3b698bd212f0a4b5cd674'
'7e099a0aaa459d25eea88105179237653571ac0a2498c987ab9bdccaf118722b'
'e65bdeeaf11f2e905145ff3aac81a735f5d2f3c68cf5ba69f1ee36ef4b25e50f')
sha256sums=('9021ab7e34b10b30a80d6f5e2474afa8faea10792867d459b53dd11ba23891e4'
'c56ce522532663d48e88f9cc6cbcb839103a2426715dbf6b16d104e0875a30f8'
'17f9d460aad2f8c7143e44ef93ab145bd0d0e5b2ad0c91ff4547f11f55fb6a91')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \
@ -64,6 +64,19 @@ package() {
pushd build-${_arch}-${_config##*=}
make INSTALL_ROOT="$pkgdir" install
# Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
if [[ -d 'lib' ]]; then
pushd 'lib'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
popd
fi
if [[ -d 'plugins' ]]; then
pushd 'plugins'
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
popd
fi
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
@ -75,6 +88,9 @@ package() {
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
popd
done
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
done
# Make sure the executables don't conflict with their mingw-qt4 counterpart

2
qt5-base/apple-darwin/PKGBUILD
View File

@ -5,7 +5,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=apple-darwin-qt5-base
pkgver=5.10.0
pkgver=5.10.1
pkgrel=1
pkgdesc='A cross-platform application and UI framework (apple-darwin)'
arch=('i686' 'x86_64')

30
qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
View File

@ -1,21 +1,21 @@
From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001
From fc85bad55db9fd58860c84e74ba3de1720111ef1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
Subject: [PATCH 01/32] Add profile for cross compilation with mingw-w64
---
mkspecs/mingw-w64-g++/qmake.conf | 126 +++++++++++++++++++++++++++
mkspecs/mingw-w64-g++/qmake.conf | 132 +++++++++++++++++++++++++++++
mkspecs/mingw-w64-g++/qplatformdefs.h | 155 ++++++++++++++++++++++++++++++++++
2 files changed, 281 insertions(+)
2 files changed, 287 insertions(+)
create mode 100644 mkspecs/mingw-w64-g++/qmake.conf
create mode 100644 mkspecs/mingw-w64-g++/qplatformdefs.h
diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf
new file mode 100644
index 0000000000..c49336845b
index 0000000000..978867fa1b
--- /dev/null
+++ b/mkspecs/mingw-w64-g++/qmake.conf
@@ -0,0 +1,126 @@
@@ -0,0 +1,132 @@
+#
+# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++
+#
@ -128,13 +128,19 @@ index 0000000000..c49336845b
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
+QMAKE_LIBS =
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+ $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --libs freetype2)
+QMAKE_LIBS_GUI_STATIC = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
+QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
+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_DBUS = $$system($${QMAKE_PKG_CONFIG} --libs dbus-1)
+QMAKE_LIBS_DBUS_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
+QMAKE_LIBS_WIDGETS_STATIC = -ldwmapi -luxtheme
+QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@ -304,5 +310,5 @@ index 0000000000..c5a70b1445
+
+#endif // QPLATFORMDEFS_H
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001
From e2c07e461564d363b8692b5b5de067c892259a36 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/34] 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
---
@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.15.1
2.16.1

10
qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
View File

@ -1,7 +1,7 @@
From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001
From 84d1b9f6d84e46ee756761d0a9cc264d067b9250 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/34] Use external ANGLE library
Subject: [PATCH 03/32] Use external ANGLE library
---
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
@ -54,7 +54,7 @@ index f8cec00b82..d09c9fd49c 100644
include(accessible/accessible.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 016db46405..02f1204f0f 100644
index 742be61a50..5fef69fd3f 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
@ -78,7 +78,7 @@ index b7790a66e3..046fe34a06 100644
mingw: LIBS *= -luuid
# For the dialog helpers:
diff --git a/src/src.pro b/src/src.pro
index a2064b1362..b9ba606b03 100644
index a73729a760..32d9f8502a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -180,10 +180,6 @@ qtConfig(gui) {
@ -93,5 +93,5 @@ index a2064b1362..b9ba606b03 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001
From b001d0484e9fc4d2f3af20359db96f4d3942d0c7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
Subject: [PATCH 04/32] Fix too many sections assemler error in OpenGL factory
On x86_64 qopenglversionfunctionsfactory.o exceeds the
limit of 32768 sections.
@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001
From 192e4593262474507b9b96424104e130c595e512 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
Subject: [PATCH 05/32] Make sure *.pc files are installed correctly
---
qmake/generators/makefile.cpp | 8 ++++++--
@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001
From 19a847d6ea1601de83ad067ba6c0fcf562273e72 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
Subject: [PATCH 06/32] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config
files contained invalid Libs.private references
@ -11,7 +11,7 @@ like .obj/debug/Qt5Cored_resource_res.o
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 792ffb1997..faf8b5a275 100644
index d6d6b04148..7bb616302f 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
@ -24,5 +24,5 @@ index 792ffb1997..faf8b5a275 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001
From bcb4c82d669d352c183c45e1cb71bd7c0946d1ec Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
Subject: [PATCH 07/32] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually
@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001
From 9914d843bf7833fb04303cb96cff6912cfc7a7f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/34] Fix linking against shared/static libpng
Subject: [PATCH 08/32] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 0a591e110c..4ca919c6da 100644
index dab66fafb4..bc501bd3fc 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -296,7 +296,8 @@
@@ -291,7 +291,8 @@
"sources": [
{ "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng", "condition": "config.msvc" },
@ -23,5 +23,5 @@ index 0a591e110c..4ca919c6da 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001
From 3b501d8fc4dab1c437f18d2d21c64265858e367d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/34] Fix linking against static D-Bus
Subject: [PATCH 09/32] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@ -9,7 +9,7 @@ Subject: [PATCH 09/34] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 26e1572f32..108619634c 100644
index a6f3ed66a9..803abf38bb 100644
--- a/configure.json
+++ b/configure.json
@@ -171,18 +171,23 @@
@ -39,7 +39,7 @@ index 26e1572f32..108619634c 100644
{ "libs": "-ldbus-1", "condition": "!config.win32" }
]
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index cfc0e12046..65f1397cd6 100644
index 9eaebe6d7e..ac1b1d977b 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
# include <dbus/dbus.h>
#else
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001
From 5faa23e98e0fb63f3c2fedf3fe5fb93b2df940df Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
Subject: [PATCH 10/32] Don't try to use debug version of D-Bus library
Required for a debug build of Qt because mingw-w64-dbus
does not contain debug version
@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 108619634c..d668ce0c98 100644
index 803abf38bb..7e0b7ffb56 100644
--- a/configure.json
+++ b/configure.json
@@ -184,7 +184,7 @@
@ -25,5 +25,5 @@ index 108619634c..d668ce0c98 100644
},
"condition": "config.win32 && features.shared"
--
2.15.1
2.16.1

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

@ -1,14 +1,14 @@
From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001
From 3deafc5a5c28faaafb1f1ec52d32c9fc5df2986d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/34] Fix linking against static freetype2
Subject: [PATCH 11/32] Fix linking against static freetype2
---
src/gui/configure.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 4ca919c6da..5d524b1d73 100644
index bc501bd3fc..f7a4a39fd4 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -158,8 +158,11 @@
@ -26,5 +26,5 @@ index 4ca919c6da..5d524b1d73 100644
},
"fontconfig": {
--
2.15.1
2.16.1

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

@ -1,17 +1,17 @@
From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001
From 61f5c3fcc4d5ad5fb1bad5bc711c2d4e803e655a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/34] Fix linking against static harfbuzz
Subject: [PATCH 12/32] Fix linking against static harfbuzz
---
src/gui/configure.json | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 5d524b1d73..78f1b90d37 100644
index f7a4a39fd4..5ff8449509 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -223,7 +223,11 @@
@@ -218,7 +218,11 @@
]
},
"sources": [
@ -25,5 +25,5 @@ index 5d524b1d73..78f1b90d37 100644
},
"imf": {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001
From c74216cc1ed27e282939c159bc63714f3cd69482 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/34] Fix linking against static pcre
Subject: [PATCH 13/32] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@ -24,5 +24,5 @@ index 86bc99716d..5037ae68a1 100644
#include <pcre2.h>
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001
From d8dca16ee267d09792a232e415cd92ef3ec4b294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
Subject: [PATCH 14/32] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001
From 4900e0717b3f5562150d1ccbd5aaf64c0b4e5359 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
Subject: [PATCH 15/32] Fix linking against shared/static PostgreSQL
---
src/plugins/sqldrivers/configure.json | 5 +++--
@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
]
},
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
View File

@ -1,7 +1,7 @@
From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001
From 810f18a177482cbe7bef0a8674b4f47de6730821 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/34] Rename qtmain to qt5main
Subject: [PATCH 16/32] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
View File

@ -1,7 +1,7 @@
From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001
From b1563b11dbbc5a2ed80ef4aa7a3ee9d21fba7070 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/34] Build dynamic host libraries
Subject: [PATCH 17/32] Build dynamic host libraries
This came initially from Fedora, not sure whether
it makes sense to keep it. Regular Arch package
@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index c0a8dcc251..200fa40840 100644
index e6a0d97f1a..c07c1adc8b 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -24,7 +24,7 @@ requires(!$$skip)
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
-INSTALLS = lib
+INSTALLS += lib
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001
From 056173285f8854856cb9d710cc7af0cfb67ed294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/34] Enable rpath for build tools
Subject: [PATCH 18/32] Enable rpath for build tools
- Required because various tools depend on libQt5Bootstrap.so which resides
in folder /usr/${_arch}/lib
@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
INSTALLS += target
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001
From d268e7908b8cd1509023bdbfd61c9140b5bf1f62 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/34] Use system zlib for build tools
Subject: [PATCH 19/32] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 2 +-
@ -21,5 +21,5 @@ index 042ad7adb9..7e3bc3977a 100644
} else {
CONFIG += no_core_dep
--
2.15.1
2.16.1

26
qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
View File

@ -1,26 +0,0 @@
From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:20:25 +0200
Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
time when building with mingw-w64
---
mkspecs/features/toolchain.prf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index ba41598be1..6416db4d58 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
#
# Get default include and library paths from compiler
#
- gcc {
+ !win32:gcc {
cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
equals(QMAKE_HOST.os, Windows): \
cmd_prefix = "set LC_ALL=C&"
--
2.15.1

6
qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch → qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
View File

@ -1,7 +1,7 @@
From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001
From e01cb55796ac795043b4e3afd6811c8d0bfaf6c1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 21/34] Use *.dll.a as import lib extension
Subject: [PATCH 20/32] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
2.15.1
2.16.1

26
qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch → qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
View File

@ -1,22 +1,22 @@
From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001
From 297f163b0298a45307f397842bca505c860a7fc3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 22/34] Merge shared and static library trees
Subject: [PATCH 21/32] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
configure.pri | 9 +++++++++
mkspecs/features/default_post.prf | 11 +++++++++++
mkspecs/features/qt.prf | 15 +++++++++++++++
mkspecs/features/qt.prf | 17 +++++++++++++++++
mkspecs/features/spec_pre.prf | 11 ++++++++---
qmake/generators/makefile.cpp | 9 ++++++---
5 files changed, 49 insertions(+), 6 deletions(-)
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
index 83c0dee141..a05c3d98e6 100644
index ea482552c4..9da756fb3a 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1212,3 +1212,12 @@ defineTest(createConfigStatus) {
@@ -1225,3 +1225,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -51,10 +51,10 @@ index 7e027325bd..ad0db62b78 100644
!have_target:!force_qt: CONFIG -= qt
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 3ccbbe7061..afaac3dbc4 100644
index b57afcf72d..6eebd068f1 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -255,6 +255,21 @@ for(ever) {
@@ -259,6 +259,23 @@ for(ever) {
!isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
}
@ -64,11 +64,13 @@ index 3ccbbe7061..afaac3dbc4 100644
+ isEqual(MODULE_NAME, QtCore) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_CORE
+ } else:isEqual(MODULE_NAME, QtGui) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_GUI
+ LIBS$$var_sfx += $$QMAKE_LIBS_GUI_STATIC
+ } else:isEqual(MODULE_NAME, QtNetwork) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK_STATIC $$QMAKE_LIBS_NETWORK
+ LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK_STATIC
+ } else:isEqual(MODULE_NAME, QtDBus) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_DBUS
+ LIBS$$var_sfx += $$QMAKE_LIBS_DBUS_STATIC
+ } else:isEqual(MODULE_NAME, QtWidgets) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_WIDGETS_STATIC
+ } else:isEqual(MODULE_NAME, QtOpenGL) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_OPENGL
+ }
@ -126,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
2.15.1
2.16.1

41
qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch → qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
View File

@ -1,7 +1,7 @@
From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001
From 22098826acc64ddaa2dbbeabe2d509fd8a54a6d1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
Subject: [PATCH 22/32] Pull dependencies of static libraries in CMake modules
When doing a static build of Qt, the dependencies of the Qt
libraries and plugins itself must be specified when linking
@ -9,8 +9,8 @@ the final application.
---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++++-----
.../features/data/cmake/Qt5PluginTarget.cmake.in | 11 +-
qmake/generators/makefile.cpp | 7 +
3 files changed, 128 insertions(+), 38 deletions(-)
qmake/generators/makefile.cpp | 16 ++-
3 files changed, 133 insertions(+), 42 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 55c74aad66..b401db5ac2 100644
@ -251,23 +251,32 @@ index 5baf0fdb10..ec5f3cc437 100644
+
+endif()
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5e84628e72..c853d52b27 100644
index 5e84628e72..43f570fb2c 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
t << qv(project->values((*it).toKey()));
t << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = ";
+ QString sep;
+ for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
+ t << sep << project->values((*it).toKey()).join(';').replace('\\', "\\\\");
+ sep = ';';
@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
libs << "QMAKE_LIBS"; //obvious one
if(project->isActiveConfig("staticlib"))
libs << "QMAKE_LIBS_PRIVATE";
- t << "QMAKE_PRL_LIBS =";
- for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
- t << qv(project->values((*it).toKey()));
- t << endl;
+ QStringList libNames;
+ QStringList libNamesCMake;
+ for (const auto &lib : libs) {
+ for (const auto &libName : project->values(lib.toKey())) {
+ libNames << QMakeEvaluator::quoteValue(libName);
+ QString libNameCMake(libName.toQString());
+ libNameCMake.replace(QChar('\\'), QLatin1String("\\\\"));
+ libNamesCMake << libNameCMake;
+ }
+ }
+ t << endl;
+ t << "QMAKE_PRL_LIBS = " << libNames.join(QChar(' ')) << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = " << libNamesCMake.join(QChar(';')) << endl;
}
}
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch → qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch
View File

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

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

@ -1,7 +1,7 @@
From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001
From 61cc992fc37a4f44ada488a9e60514e237e523b5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 25/34] Adjust linker flags for static build with
Subject: [PATCH 24/32] Adjust linker flags for static build with
cmake/mingw-w64
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
+unset(_isExe)
+!!ENDIF
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch → qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch
View File

@ -1,14 +1,14 @@
From 1a11849c5f8ba28bb0e492df01228d57f63974ff Mon Sep 17 00:00:00 2001
From db3d86b75f473d02c5ce6410f7d054f320c7d8f9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 26/34] Use correct pkg-config --static flag
Subject: [PATCH 25/32] Use correct pkg-config --static flag
---
configure.pri | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
index a05c3d98e6..8dc874a74d 100644
index 9da756fb3a..fa2719bb0c 100644
--- a/configure.pri
+++ b/configure.pri
@@ -311,6 +311,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
2.15.1
2.16.1

22
qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch → qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
View File

@ -1,7 +1,7 @@
From d585e369c2274af65dc82c53f2ec6ad16c9a124b Mon Sep 17 00:00:00 2001
From 14e1e2026e3e5bc255c717ecde076f54e0e107b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic
Subject: [PATCH 26/32] Fix macro invoking moc, rcc and uic
* Otherwise the arguments aren't passed correctly leading to errors like
```
@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
index 489bc75511..c980f4220d 100644
index 8d3dbe3ecf..f0f0d69309 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@ -32,7 +32,7 @@ index 489bc75511..c980f4220d 100644
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
@@ -251,8 +252,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
@@ -254,8 +255,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
@ -41,11 +41,11 @@ index 489bc75511..c980f4220d 100644
- COMMAND ${Qt5Core_RCC_EXECUTABLE}
+ COMMAND ${RCC_LOC}
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
DEPENDS ${rc_depends} ${out_depends} VERBATIM)
@@ -284,8 +286,9 @@ function(QT5_ADD_RESOURCES outfiles )
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
@@ -287,8 +289,9 @@ function(QT5_ADD_RESOURCES outfiles )
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
+ get_target_property(MOC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${outfile}
@ -55,7 +55,7 @@ index 489bc75511..c980f4220d 100644
MAIN_DEPENDENCY ${infile}
DEPENDS ${_rc_depends} "${out_depends}" VERBATIM)
diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake
index f5e7b7f050..18d120f0c7 100644
index 737371a5ad..d103278cdf 100644
--- a/src/widgets/Qt5WidgetsMacros.cmake
+++ b/src/widgets/Qt5WidgetsMacros.cmake
@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles )
@ -68,7 +68,7 @@ index f5e7b7f050..18d120f0c7 100644
+ COMMAND ${UIC_LOC}
ARGS ${ui_options} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile} VERBATIM)
list(APPEND ${outfiles} ${outfile})
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch → qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch
View File

@ -1,7 +1,7 @@
From b605147e73b0b0c36bfd21b94920310b7279898f Mon Sep 17 00:00:00 2001
From 98d20d4f7bdf5a8b364dbfbccfd17caa12092feb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 28/34] Ignore errors about missing feature static
Subject: [PATCH 27/32] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch → qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch
View File

@ -1,7 +1,7 @@
From 8be581dab1e7b0ebba897ccd5d3c71a7e4c9b74b Mon Sep 17 00:00:00 2001
From d7e459560199395f4ee339490ca5afebb7b5168a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 29/34] Enable and fix use of iconv
Subject: [PATCH 28/32] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
@ -63,7 +63,7 @@ index d6362b6fbc..4da4546a24 100644
#else
char **inBytesPtr = &inBytes;
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index bf44f2649d..90f0450902 100644
index 8cd73d6ce4..dd259157e3 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -521,9 +521,9 @@
@ -79,5 +79,5 @@ index bf44f2649d..90f0450902 100644
},
"icu": {
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch → qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch
View File

@ -1,7 +1,7 @@
From 69ce42a2cc5631a99b78c0468d0a4e8f2cb856f4 Mon Sep 17 00:00:00 2001
From 519d6c020b8daa90bd64b4556f603c657cd30594 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 30/34] Ignore failing pkg-config test
Subject: [PATCH 29/32] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best
---
@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
index d668ce0c98..2d36a60cd3 100644
index 7e0b7ffb56..0f098e7b3f 100644
--- a/configure.json
+++ b/configure.json
@@ -725,7 +725,6 @@
@ -21,5 +21,5 @@ index d668ce0c98..2d36a60cd3 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch → qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
View File

@ -1,7 +1,7 @@
From 51684a7002b3da41428107ca80b8c360ce00c0b8 Mon Sep 17 00:00:00 2001
From 8f96fb6b8b9ebeb7643cbab4420bef214b617aae Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies
Subject: [PATCH 30/32] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
for (int i = 0; lflags[i]; i++) {
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch → qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch
View File

@ -1,7 +1,7 @@
From dd8af708953214aee7128b6448a98fdbea123cd1 Mon Sep 17 00:00:00 2001
From 299bb52899d3970ff33698305e4de8ae3ac26dae Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 32/34] Hardcode linker flags for platform plugins
Subject: [PATCH 31/32] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll
@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644
include(windows.pri)
--
2.15.1
2.16.1

12
qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch → qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch
View File

@ -1,7 +1,7 @@
From ba94765c0830e114e7b1cd269a04e8abac1ecd6a Mon Sep 17 00:00:00 2001
From 715c87c76624306c9b9410dc4efa7b6d64ca6788 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 33/34] Fix linking against static plugins with qmake
Subject: [PATCH 32/32] Fix linking against static plugins with qmake
Required because qtConfig(static) does not work
with 'Merge shared and static library trees'
@ -11,10 +11,10 @@ approach
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index afaac3dbc4..82b02b5113 100644
index 6eebd068f1..310b8713f0 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -65,7 +65,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
QTPLUGIN = $$unique($$list($$lower($$QTPLUGIN)))
@ -23,7 +23,7 @@ index afaac3dbc4..82b02b5113 100644
manualplugs = $$QTPLUGIN # User may specify plugins. Mostly legacy.
autoplugs = # Auto-added plugins.
# First round: explicitly specified modules.
@@ -135,7 +135,7 @@ import_plugins:qtConfig(static) {
@@ -139,7 +139,7 @@ import_plugins:qtConfig(static) {
}
# Only link against plugins in static builds
@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 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.15.1
2.16.1

27
qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch
View File

@ -1,27 +0,0 @@
From 06c69dbc4aa16012b8ab05b586fb2e261405a037 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 9 Dec 2017 00:36:56 +0100
Subject: [PATCH 34/34] Don't use the statx syscall
Otherwise Qt can not be built in a systemd
container
---
src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index 77d154c6b4..6036bae4f1 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
{ return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
# endif
-# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
+# if 0
# include <linux/stat.h>
static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
{ return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
--
2.15.1

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

@ -84,8 +84,8 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base-angle
pkgver=5.10.0
pkgrel=2
pkgver=5.10.1
pkgrel=1
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
# The static variant doesn't contain any executables which need to be executed on the build machine
isStatic && arch=('any') || arch=('i686' 'x86_64')
@ -119,56 +119,52 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0017-Build-dynamic-host-libraries.patch'
'0018-Enable-rpath-for-build-tools.patch'
'0019-Use-system-zlib-for-build-tools.patch'
'0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch'
'0021-Use-.dll.a-as-import-lib-extension.patch'
'0022-Merge-shared-and-static-library-trees.patch'
'0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch'
'0024-Allow-usage-of-static-version-with-CMake.patch'
'0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch'
'0026-Use-correct-pkg-config-static-flag.patch'
'0027-Fix-macro-invoking-moc-rcc-and-uic.patch'
'0028-Ignore-errors-about-missing-feature-static.patch'
'0029-Enable-and-fix-use-of-iconv.patch'
'0030-Ignore-failing-pkg-config-test.patch'
'0031-Prevent-qmake-from-messing-static-lib-dependencies.patch'
'0032-Hardcode-linker-flags-for-platform-plugins.patch'
'0033-Fix-linking-against-static-plugins-with-qmake.patch'
'0034-Don-t-use-the-statx-syscall.patch')
sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
'd10d56c65b632d881f79eda8c0caeffb1a53a4829ac886e80038cdc8929b1669'
'524883f46945ab2ce023e9de1144a7eebafdba936ea8c61e035006deff48fa5b'
'cea0e73f831348e50285ab87149803d4dfb5650c4c96037844b98b3dc1c65159'
'e333d61821a42710a00f9bd4d003d376f513ba6ca41a3739bfcd414c99b8e7dd'
'e8b0bdcc39458105dd0e5c569c98ef53a84d2fe4e9e200e1b1c1b7b749e8e758'
'e14860d560886b600373f639e89e9a60d77de9a536587633ea71e1fd907df3fb'
'447c27f0e87d5cdcbe9883f6d3aac0daefef28e09bd8afe8d07a650375ca8362'
'e2f98037b93aa2970014c1d185912b49d4ab5506c24fa2410cb0e93d4e0a1f54'
'507537c73995715fa1a4e9e0f1ecfdf4afe409b5397366f551d06c6c406e088b'
'760093a185cd77bacec0d85c0c077370d6044b89a4d6f03944524d1aa2b82dfa'
'6052446a675be39dd663ef69ee5339ab67c2805b29ff4ef19bacf0f677a95182'
'60a6e236334d3950b40dbb0501cc733bc7a672b0c7fbf6e4792c0058bf20a859'
'f58391f9407742a1543702fe0234a134883046ff99584c1cfa468893264bf5e9'
'9e406b466c2b447da5d44ea37cafe2b3c3caebfa54936eb71e816e60b186c47d'
'870ed7adb78d4f5b396fa9106777aaeefc2a8af406e1aa1655dfe3405974a1ce'
'b51a2d707a09cce340ca10e4a93c18a0872881889a97dc3ea2aafe73d80dfd46'
'ed206eef70d57cd1aeb31c9e65ceb46fe926bee462c9b6507d22b6daf9b03aff'
'00ea2ef2f2d8868351d857716e60e8e78ed90a294132cd1fbd8039aae50e7344'
'f80e166e5a358cc3d0dca5f0a543b30271a1c536ff9ef73105f1e432b10d3afe'
'12c4ce015c5641376dea7a232f0fc9f8feb10ddee06c65f87e0f00ea2574ab15'
'a3a6a12f94ed4a79b3910623e3a8a11859d7a6a72b4634ff8bd6d1269af615bd'
'6f1f96ec05f049a107f4b5b3fba05e088d47f1c4751fd21851ed48d5f1b5a274'
'2926f77fbab219cb2fe9bb630274b06594a72c9047d374209d96591e481015fd'
'b36b7fce8e101444d17026002f8052be41de887ccd263188a64faeae31cc1c89'
'7bcfe130f6dc47c9fb4d3db6fe9634596ab2c01e421bfc9a0967463487b4b7f0'
'83f6a3fc2489da2686f035563542478fd01e2849e18ea02478d7850bd68f16be'
'7254445b4cea5e1d7efc25b923e755ab3b19856ee8bce2ebe2900b9bf4717841'
'd03a3cc5dab9d9a843e73f241fee2778deffe9ee727e493a0052e62b2266923e'
'd6dc468d67e782b64fbe9ba64dfc3fdf423c5d06205f4a87a0561bb53b35d7fc'
'43c367e31c1560178a1471a80a9e90391c7c93f8dfece8c4c9dfafea4a3ce180'
'2e89aca862a62cbf535faf4b01c00dfed40ad6ccb52ac998913e9e96801491a3'
'8b1402c8ac78c0870af19ccdd8b2603e164cf2ef4fd4446fd03ea40b68a35643'
'81d279b24a508656597fec9bf94bade25cf0d600607febcd35f7fd27d09970eb'
'95a8cd9553ef18e200a85ff6dc5c718525d71be92d4fa49b8cdceae73696e037')
'0020-Use-.dll.a-as-import-lib-extension.patch'
'0021-Merge-shared-and-static-library-trees.patch'
'0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch'
'0023-Allow-usage-of-static-version-with-CMake.patch'
'0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch'
'0025-Use-correct-pkg-config-static-flag.patch'
'0026-Fix-macro-invoking-moc-rcc-and-uic.patch'
'0027-Ignore-errors-about-missing-feature-static.patch'
'0028-Enable-and-fix-use-of-iconv.patch'
'0029-Ignore-failing-pkg-config-test.patch'
'0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
'0031-Hardcode-linker-flags-for-platform-plugins.patch'
'0032-Fix-linking-against-static-plugins-with-qmake.patch')
sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
'6b29d7a3751a506c15155425d6dc213e9f4654ee5b833007a0119bda6a050b28'
'ca10438f4a2d309f496e85d7b974d9eeb88115e068e146ca511b9784db95b822'
'75bf0d8b155f95bad2dfbc5c046f88afd6a5f2233336a1f6d148583ba445fca6'
'd70dcd1c44e751b0120f514af9db4ff20ebb0a327a22a371cf5e8d9453f66953'
'cbad834340bc9e9261704034e9192bd0d7306f9ff02a99fd73fc348948c37ed9'
'3c7cd1839a6f0891b871c75824b8ebeb05e4e61884c342d6b6ab583f10819138'
'c923da99871dac4fc58b8e70bd76c70fba0f421fc676a53bcb8c0187190ba737'
'f9be656281652f72297f1e573f23298c22f4849857d92106096feb4b3fe9244f'
'5add111a9e521159e31ecef4d85ebef86285bbbe2adce5d8cec94fd22822731e'
'7d38e79bc6b2e5d74515291bf78c3a6168f8bc834f7f59bda2c013f65e45bd3e'
'9ab62cc8cd1cf68ee5e87e276d5a2f19c43b04a1c50c10341794924277cfcca5'
'f1926bd51376a95ea1deee933dadd62166296e5780e24ce8312637c9d3eda27b'
'03f7a178af6b630f48da79c76e1239695d96137fd8394ba814e4bdf8c7e0a826'
'dc3e0e3fe4ba979f74ff9dc343b235d32473edb18ca7f8afea3076f613564a95'
'ef64b965a19e1e2848761829a6817dcb9f3ad616faa666f9e52736d810190c66'
'9e0c3848df586ec7decd9b7a6dab86a9e7e5cc7bf5ac06ff97d7d63e370bb05b'
'7dc90045a838f9ebcb7933d582abb3e8bba250644602e1019bf1a03e74cc3b09'
'b5cc23a29e80ec8185da8ca0950ab8a2f12f4ef4b998c763334d352e68b53fc2'
'944cfdbfd9d13285aefb4305596950d2880cc1023b5ad241af08e3d6995daa69'
'5f7498a98912542c39b081c2df1930246df3bdb533c2e30204bf795cea8b885f'
'0b8408d70a4544e43fd573e5b9ac751fb2732d3e4490f21e1737ac09ece25b62'
'08155a41f22c03741096145bf201d5503e38495c2f255f3c81ea658948258cd3'
'7b30d46f739dffa20a1964e09958a92af1749104fe7a88d7ea255aa54e553b25'
'c92d6a124b7b0333175122555ef9f647817eb54563480cf3eaaf47decfd907c3'
'0818c4d59aabb898fed8f313e21085cc8fc576d3f4975383eb73ba3f758c302e'
'ce5d416a3404199072062063d8038084c23bbfe8aa45ed3340c4afb4dfa461e4'
'8d1e93bea1cdcdf1b965f4c061975668334cef6a65130f1b4b528f2b6952a602'
'298ffdcd378e2b07fe8e978cfb5faac29c117a5f79288273545a6938b905f33a'
'7514edba8ecd28b27715650bbafa8649492b68efba1df9c9fa70f06a924fea14'
'7c232c385303b447e17270b946d333b56274312b08b4e76439a5f77cb77aa909'
'acfdf70ae8738a0373bbd93e42048d1c699f666dd72933ad3c09b09620fb0715'
'c3df40da9b2494e59aae786a26ba93d88128b69971d10a64cb6d610045a101f8')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@ -237,7 +233,7 @@ build() {
# To prevent conflicts with the mingw-w64-qt4 package we have
# to put tools in a dedicated folder
# The last device option allows using ccache though the use of
# The last device option allows using ccache despite the use of
# pre-compile header
# (sloppiness must be set to pch_defines,time_macros in ccache config)
@ -345,6 +341,14 @@ package() {
cd "$srcdir/${_pkgfqn}"
make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}"
# Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
pushd "$srcdir/build-${_arch}/lib"
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
popd
pushd "$srcdir/build-${_arch}/plugins"
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
popd
if isStatic; then
# The static release contains only the static libs itself but relies on the
# shared release for Qt5Bootstrap library and tools (qmake, uic, ...)
@ -376,7 +380,7 @@ package() {
popd
rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/StaticQt5OpenGLExtensions.pc"
# Keep various Qt 5 plugins to be used in static builds
# Create links to static plugins in lib directory
pushd "${pkgdir}/usr/${_arch}/lib/" && ln -s "./qt/plugins/"*/*.a . && popd
# Keep a couple pri files not found in base
@ -404,6 +408,9 @@ package() {
done
fi
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Remove doc
rm -rf "${pkgdir}/usr/${_arch}/share/doc"

30
qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
View File

@ -1,21 +1,21 @@
From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001
From fc85bad55db9fd58860c84e74ba3de1720111ef1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
Subject: [PATCH 01/32] Add profile for cross compilation with mingw-w64
---
mkspecs/mingw-w64-g++/qmake.conf | 126 +++++++++++++++++++++++++++
mkspecs/mingw-w64-g++/qmake.conf | 132 +++++++++++++++++++++++++++++
mkspecs/mingw-w64-g++/qplatformdefs.h | 155 ++++++++++++++++++++++++++++++++++
2 files changed, 281 insertions(+)
2 files changed, 287 insertions(+)
create mode 100644 mkspecs/mingw-w64-g++/qmake.conf
create mode 100644 mkspecs/mingw-w64-g++/qplatformdefs.h
diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf
new file mode 100644
index 0000000000..c49336845b
index 0000000000..978867fa1b
--- /dev/null
+++ b/mkspecs/mingw-w64-g++/qmake.conf
@@ -0,0 +1,126 @@
@@ -0,0 +1,132 @@
+#
+# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++
+#
@ -128,13 +128,19 @@ index 0000000000..c49336845b
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
+QMAKE_LIBS =
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+ $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --libs freetype2)
+QMAKE_LIBS_GUI_STATIC = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
+QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
+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_DBUS = $$system($${QMAKE_PKG_CONFIG} --libs dbus-1)
+QMAKE_LIBS_DBUS_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
+QMAKE_LIBS_WIDGETS_STATIC = -ldwmapi -luxtheme
+QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@ -304,5 +310,5 @@ index 0000000000..c5a70b1445
+
+#endif // QPLATFORMDEFS_H
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001
From e2c07e461564d363b8692b5b5de067c892259a36 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/34] 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
---
@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.15.1
2.16.1

10
qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
View File

@ -1,7 +1,7 @@
From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001
From 84d1b9f6d84e46ee756761d0a9cc264d067b9250 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/34] Use external ANGLE library
Subject: [PATCH 03/32] Use external ANGLE library
---
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
@ -54,7 +54,7 @@ index f8cec00b82..d09c9fd49c 100644
include(accessible/accessible.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 016db46405..02f1204f0f 100644
index 742be61a50..5fef69fd3f 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
@ -78,7 +78,7 @@ index b7790a66e3..046fe34a06 100644
mingw: LIBS *= -luuid
# For the dialog helpers:
diff --git a/src/src.pro b/src/src.pro
index a2064b1362..b9ba606b03 100644
index a73729a760..32d9f8502a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -180,10 +180,6 @@ qtConfig(gui) {
@ -93,5 +93,5 @@ index a2064b1362..b9ba606b03 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001
From b001d0484e9fc4d2f3af20359db96f4d3942d0c7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
Subject: [PATCH 04/32] Fix too many sections assemler error in OpenGL factory
On x86_64 qopenglversionfunctionsfactory.o exceeds the
limit of 32768 sections.
@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001
From 192e4593262474507b9b96424104e130c595e512 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
Subject: [PATCH 05/32] Make sure *.pc files are installed correctly
---
qmake/generators/makefile.cpp | 8 ++++++--
@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001
From 19a847d6ea1601de83ad067ba6c0fcf562273e72 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
Subject: [PATCH 06/32] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config
files contained invalid Libs.private references
@ -11,7 +11,7 @@ like .obj/debug/Qt5Cored_resource_res.o
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 792ffb1997..faf8b5a275 100644
index d6d6b04148..7bb616302f 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
@ -24,5 +24,5 @@ index 792ffb1997..faf8b5a275 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001
From bcb4c82d669d352c183c45e1cb71bd7c0946d1ec Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
Subject: [PATCH 07/32] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually
@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001
From 9914d843bf7833fb04303cb96cff6912cfc7a7f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/34] Fix linking against shared/static libpng
Subject: [PATCH 08/32] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 0a591e110c..4ca919c6da 100644
index dab66fafb4..bc501bd3fc 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -296,7 +296,8 @@
@@ -291,7 +291,8 @@
"sources": [
{ "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng", "condition": "config.msvc" },
@ -23,5 +23,5 @@ index 0a591e110c..4ca919c6da 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001
From 3b501d8fc4dab1c437f18d2d21c64265858e367d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/34] Fix linking against static D-Bus
Subject: [PATCH 09/32] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@ -9,7 +9,7 @@ Subject: [PATCH 09/34] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 26e1572f32..108619634c 100644
index a6f3ed66a9..803abf38bb 100644
--- a/configure.json
+++ b/configure.json
@@ -171,18 +171,23 @@
@ -39,7 +39,7 @@ index 26e1572f32..108619634c 100644
{ "libs": "-ldbus-1", "condition": "!config.win32" }
]
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index cfc0e12046..65f1397cd6 100644
index 9eaebe6d7e..ac1b1d977b 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
# include <dbus/dbus.h>
#else
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001
From 5faa23e98e0fb63f3c2fedf3fe5fb93b2df940df Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
Subject: [PATCH 10/32] Don't try to use debug version of D-Bus library
Required for a debug build of Qt because mingw-w64-dbus
does not contain debug version
@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 108619634c..d668ce0c98 100644
index 803abf38bb..7e0b7ffb56 100644
--- a/configure.json
+++ b/configure.json
@@ -184,7 +184,7 @@
@ -25,5 +25,5 @@ index 108619634c..d668ce0c98 100644
},
"condition": "config.win32 && features.shared"
--
2.15.1
2.16.1

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

@ -1,14 +1,14 @@
From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001
From 3deafc5a5c28faaafb1f1ec52d32c9fc5df2986d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/34] Fix linking against static freetype2
Subject: [PATCH 11/32] Fix linking against static freetype2
---
src/gui/configure.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 4ca919c6da..5d524b1d73 100644
index bc501bd3fc..f7a4a39fd4 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -158,8 +158,11 @@
@ -26,5 +26,5 @@ index 4ca919c6da..5d524b1d73 100644
},
"fontconfig": {
--
2.15.1
2.16.1

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

@ -1,17 +1,17 @@
From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001
From 61f5c3fcc4d5ad5fb1bad5bc711c2d4e803e655a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/34] Fix linking against static harfbuzz
Subject: [PATCH 12/32] Fix linking against static harfbuzz
---
src/gui/configure.json | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 5d524b1d73..78f1b90d37 100644
index f7a4a39fd4..5ff8449509 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -223,7 +223,11 @@
@@ -218,7 +218,11 @@
]
},
"sources": [
@ -25,5 +25,5 @@ index 5d524b1d73..78f1b90d37 100644
},
"imf": {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001
From c74216cc1ed27e282939c159bc63714f3cd69482 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/34] Fix linking against static pcre
Subject: [PATCH 13/32] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@ -24,5 +24,5 @@ index 86bc99716d..5037ae68a1 100644
#include <pcre2.h>
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001
From d8dca16ee267d09792a232e415cd92ef3ec4b294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
Subject: [PATCH 14/32] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001
From 4900e0717b3f5562150d1ccbd5aaf64c0b4e5359 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
Subject: [PATCH 15/32] Fix linking against shared/static PostgreSQL
---
src/plugins/sqldrivers/configure.json | 5 +++--
@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
]
},
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
View File

@ -1,7 +1,7 @@
From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001
From 810f18a177482cbe7bef0a8674b4f47de6730821 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/34] Rename qtmain to qt5main
Subject: [PATCH 16/32] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
View File

@ -1,7 +1,7 @@
From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001
From b1563b11dbbc5a2ed80ef4aa7a3ee9d21fba7070 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/34] Build dynamic host libraries
Subject: [PATCH 17/32] Build dynamic host libraries
This came initially from Fedora, not sure whether
it makes sense to keep it. Regular Arch package
@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index c0a8dcc251..200fa40840 100644
index e6a0d97f1a..c07c1adc8b 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -24,7 +24,7 @@ requires(!$$skip)
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
-INSTALLS = lib
+INSTALLS += lib
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001
From 056173285f8854856cb9d710cc7af0cfb67ed294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/34] Enable rpath for build tools
Subject: [PATCH 18/32] Enable rpath for build tools
- Required because various tools depend on libQt5Bootstrap.so which resides
in folder /usr/${_arch}/lib
@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
INSTALLS += target
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001
From d268e7908b8cd1509023bdbfd61c9140b5bf1f62 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/34] Use system zlib for build tools
Subject: [PATCH 19/32] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 2 +-
@ -21,5 +21,5 @@ index 042ad7adb9..7e3bc3977a 100644
} else {
CONFIG += no_core_dep
--
2.15.1
2.16.1

26
qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
View File

@ -1,26 +0,0 @@
From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:20:25 +0200
Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
time when building with mingw-w64
---
mkspecs/features/toolchain.prf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index ba41598be1..6416db4d58 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
#
# Get default include and library paths from compiler
#
- gcc {
+ !win32:gcc {
cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
equals(QMAKE_HOST.os, Windows): \
cmd_prefix = "set LC_ALL=C&"
--
2.15.1

6
qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch → qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
View File

@ -1,7 +1,7 @@
From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001
From e01cb55796ac795043b4e3afd6811c8d0bfaf6c1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 21/34] Use *.dll.a as import lib extension
Subject: [PATCH 20/32] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
2.15.1
2.16.1

26
qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch → qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
View File

@ -1,22 +1,22 @@
From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001
From 297f163b0298a45307f397842bca505c860a7fc3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 22/34] Merge shared and static library trees
Subject: [PATCH 21/32] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
configure.pri | 9 +++++++++
mkspecs/features/default_post.prf | 11 +++++++++++
mkspecs/features/qt.prf | 15 +++++++++++++++
mkspecs/features/qt.prf | 17 +++++++++++++++++
mkspecs/features/spec_pre.prf | 11 ++++++++---
qmake/generators/makefile.cpp | 9 ++++++---
5 files changed, 49 insertions(+), 6 deletions(-)
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
index 83c0dee141..a05c3d98e6 100644
index ea482552c4..9da756fb3a 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1212,3 +1212,12 @@ defineTest(createConfigStatus) {
@@ -1225,3 +1225,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -51,10 +51,10 @@ index 7e027325bd..ad0db62b78 100644
!have_target:!force_qt: CONFIG -= qt
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 3ccbbe7061..afaac3dbc4 100644
index b57afcf72d..6eebd068f1 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -255,6 +255,21 @@ for(ever) {
@@ -259,6 +259,23 @@ for(ever) {
!isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
}
@ -64,11 +64,13 @@ index 3ccbbe7061..afaac3dbc4 100644
+ isEqual(MODULE_NAME, QtCore) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_CORE
+ } else:isEqual(MODULE_NAME, QtGui) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_GUI
+ LIBS$$var_sfx += $$QMAKE_LIBS_GUI_STATIC
+ } else:isEqual(MODULE_NAME, QtNetwork) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK_STATIC $$QMAKE_LIBS_NETWORK
+ LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK_STATIC
+ } else:isEqual(MODULE_NAME, QtDBus) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_DBUS
+ LIBS$$var_sfx += $$QMAKE_LIBS_DBUS_STATIC
+ } else:isEqual(MODULE_NAME, QtWidgets) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_WIDGETS_STATIC
+ } else:isEqual(MODULE_NAME, QtOpenGL) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_OPENGL
+ }
@ -126,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
2.15.1
2.16.1

41
qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch → qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
View File

@ -1,7 +1,7 @@
From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001
From 22098826acc64ddaa2dbbeabe2d509fd8a54a6d1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
Subject: [PATCH 22/32] Pull dependencies of static libraries in CMake modules
When doing a static build of Qt, the dependencies of the Qt
libraries and plugins itself must be specified when linking
@ -9,8 +9,8 @@ the final application.
---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++++-----
.../features/data/cmake/Qt5PluginTarget.cmake.in | 11 +-
qmake/generators/makefile.cpp | 7 +
3 files changed, 128 insertions(+), 38 deletions(-)
qmake/generators/makefile.cpp | 16 ++-
3 files changed, 133 insertions(+), 42 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 55c74aad66..b401db5ac2 100644
@ -251,23 +251,32 @@ index 5baf0fdb10..ec5f3cc437 100644
+
+endif()
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5e84628e72..c853d52b27 100644
index 5e84628e72..43f570fb2c 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
t << qv(project->values((*it).toKey()));
t << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = ";
+ QString sep;
+ for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
+ t << sep << project->values((*it).toKey()).join(';').replace('\\', "\\\\");
+ sep = ';';
@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
libs << "QMAKE_LIBS"; //obvious one
if(project->isActiveConfig("staticlib"))
libs << "QMAKE_LIBS_PRIVATE";
- t << "QMAKE_PRL_LIBS =";
- for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
- t << qv(project->values((*it).toKey()));
- t << endl;
+ QStringList libNames;
+ QStringList libNamesCMake;
+ for (const auto &lib : libs) {
+ for (const auto &libName : project->values(lib.toKey())) {
+ libNames << QMakeEvaluator::quoteValue(libName);
+ QString libNameCMake(libName.toQString());
+ libNameCMake.replace(QChar('\\'), QLatin1String("\\\\"));
+ libNamesCMake << libNameCMake;
+ }
+ }
+ t << endl;
+ t << "QMAKE_PRL_LIBS = " << libNames.join(QChar(' ')) << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = " << libNamesCMake.join(QChar(';')) << endl;
}
}
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch → qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch
View File

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

6
qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch → qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
View File

@ -1,7 +1,7 @@
From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001
From 61cc992fc37a4f44ada488a9e60514e237e523b5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 25/34] Adjust linker flags for static build with
Subject: [PATCH 24/32] Adjust linker flags for static build with
cmake/mingw-w64
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
+unset(_isExe)
+!!ENDIF
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch → qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch
View File

@ -1,14 +1,14 @@
From 1a11849c5f8ba28bb0e492df01228d57f63974ff Mon Sep 17 00:00:00 2001
From db3d86b75f473d02c5ce6410f7d054f320c7d8f9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 26/34] Use correct pkg-config --static flag
Subject: [PATCH 25/32] Use correct pkg-config --static flag
---
configure.pri | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
index a05c3d98e6..8dc874a74d 100644
index 9da756fb3a..fa2719bb0c 100644
--- a/configure.pri
+++ b/configure.pri
@@ -311,6 +311,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
2.15.1
2.16.1

22
qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch → qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
View File

@ -1,7 +1,7 @@
From d585e369c2274af65dc82c53f2ec6ad16c9a124b Mon Sep 17 00:00:00 2001
From 14e1e2026e3e5bc255c717ecde076f54e0e107b1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic
Subject: [PATCH 26/32] Fix macro invoking moc, rcc and uic
* Otherwise the arguments aren't passed correctly leading to errors like
```
@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
index 489bc75511..c980f4220d 100644
index 8d3dbe3ecf..f0f0d69309 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@ -32,7 +32,7 @@ index 489bc75511..c980f4220d 100644
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
@@ -251,8 +252,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
@@ -254,8 +255,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
@ -41,11 +41,11 @@ index 489bc75511..c980f4220d 100644
- COMMAND ${Qt5Core_RCC_EXECUTABLE}
+ COMMAND ${RCC_LOC}
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
DEPENDS ${rc_depends} ${out_depends} VERBATIM)
@@ -284,8 +286,9 @@ function(QT5_ADD_RESOURCES outfiles )
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
@@ -287,8 +289,9 @@ function(QT5_ADD_RESOURCES outfiles )
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
+ get_target_property(MOC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${outfile}
@ -55,7 +55,7 @@ index 489bc75511..c980f4220d 100644
MAIN_DEPENDENCY ${infile}
DEPENDS ${_rc_depends} "${out_depends}" VERBATIM)
diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake
index f5e7b7f050..18d120f0c7 100644
index 737371a5ad..d103278cdf 100644
--- a/src/widgets/Qt5WidgetsMacros.cmake
+++ b/src/widgets/Qt5WidgetsMacros.cmake
@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles )
@ -68,7 +68,7 @@ index f5e7b7f050..18d120f0c7 100644
+ COMMAND ${UIC_LOC}
ARGS ${ui_options} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile} VERBATIM)
list(APPEND ${outfiles} ${outfile})
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch → qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch
View File

@ -1,7 +1,7 @@
From b605147e73b0b0c36bfd21b94920310b7279898f Mon Sep 17 00:00:00 2001
From 98d20d4f7bdf5a8b364dbfbccfd17caa12092feb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 28/34] Ignore errors about missing feature static
Subject: [PATCH 27/32] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
2.15.1
2.16.1

8
qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch → qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch
View File

@ -1,7 +1,7 @@
From 8be581dab1e7b0ebba897ccd5d3c71a7e4c9b74b Mon Sep 17 00:00:00 2001
From d7e459560199395f4ee339490ca5afebb7b5168a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 29/34] Enable and fix use of iconv
Subject: [PATCH 28/32] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
@ -63,7 +63,7 @@ index d6362b6fbc..4da4546a24 100644
#else
char **inBytesPtr = &inBytes;
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index bf44f2649d..90f0450902 100644
index 8cd73d6ce4..dd259157e3 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -521,9 +521,9 @@
@ -79,5 +79,5 @@ index bf44f2649d..90f0450902 100644
},
"icu": {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 69ce42a2cc5631a99b78c0468d0a4e8f2cb856f4 Mon Sep 17 00:00:00 2001
From 519d6c020b8daa90bd64b4556f603c657cd30594 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 30/34] Ignore failing pkg-config test
Subject: [PATCH 29/32] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best
---
@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
index d668ce0c98..2d36a60cd3 100644
index 7e0b7ffb56..0f098e7b3f 100644
--- a/configure.json
+++ b/configure.json
@@ -725,7 +725,6 @@
@ -21,5 +21,5 @@ index d668ce0c98..2d36a60cd3 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
2.15.1
2.16.1

6
qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch → qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
View File

@ -1,7 +1,7 @@
From 51684a7002b3da41428107ca80b8c360ce00c0b8 Mon Sep 17 00:00:00 2001
From 8f96fb6b8b9ebeb7643cbab4420bef214b617aae Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies
Subject: [PATCH 30/32] Prevent qmake from messing static lib dependencies
In particular, it messes resolving cyclic dependency between
static freetype2 and harfbuzz
@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644
static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
for (int i = 0; lflags[i]; i++) {
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch → qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch
View File

@ -1,7 +1,7 @@
From dd8af708953214aee7128b6448a98fdbea123cd1 Mon Sep 17 00:00:00 2001
From 299bb52899d3970ff33698305e4de8ae3ac26dae Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 32/34] Hardcode linker flags for platform plugins
Subject: [PATCH 31/32] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll
@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644
include(windows.pri)
--
2.15.1
2.16.1

12
qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch → qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch
View File

@ -1,7 +1,7 @@
From ba94765c0830e114e7b1cd269a04e8abac1ecd6a Mon Sep 17 00:00:00 2001
From 715c87c76624306c9b9410dc4efa7b6d64ca6788 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 33/34] Fix linking against static plugins with qmake
Subject: [PATCH 32/32] Fix linking against static plugins with qmake
Required because qtConfig(static) does not work
with 'Merge shared and static library trees'
@ -11,10 +11,10 @@ approach
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index afaac3dbc4..82b02b5113 100644
index 6eebd068f1..310b8713f0 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -65,7 +65,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
QTPLUGIN = $$unique($$list($$lower($$QTPLUGIN)))
@ -23,7 +23,7 @@ index afaac3dbc4..82b02b5113 100644
manualplugs = $$QTPLUGIN # User may specify plugins. Mostly legacy.
autoplugs = # Auto-added plugins.
# First round: explicitly specified modules.
@@ -135,7 +135,7 @@ import_plugins:qtConfig(static) {
@@ -139,7 +139,7 @@ import_plugins:qtConfig(static) {
}
# Only link against plugins in static builds
@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 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.15.1
2.16.1

27
qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch
View File

@ -1,27 +0,0 @@
From 06c69dbc4aa16012b8ab05b586fb2e261405a037 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 9 Dec 2017 00:36:56 +0100
Subject: [PATCH 34/34] Don't use the statx syscall
Otherwise Qt can not be built in a systemd
container
---
src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index 77d154c6b4..6036bae4f1 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp
{ return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
# endif
-# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
+# if 0
# include <linux/stat.h>
static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
{ return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
--
2.15.1

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

@ -84,8 +84,8 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base-dynamic
pkgver=5.10.0
pkgrel=2
pkgver=5.10.1
pkgrel=1
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
# The static variant doesn't contain any executables which need to be executed on the build machine
isStatic && arch=('any') || arch=('i686' 'x86_64')
@ -119,56 +119,52 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0017-Build-dynamic-host-libraries.patch'
'0018-Enable-rpath-for-build-tools.patch'
'0019-Use-system-zlib-for-build-tools.patch'
'0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch'
'0021-Use-.dll.a-as-import-lib-extension.patch'
'0022-Merge-shared-and-static-library-trees.patch'
'0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch'
'0024-Allow-usage-of-static-version-with-CMake.patch'
'0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch'
'0026-Use-correct-pkg-config-static-flag.patch'
'0027-Fix-macro-invoking-moc-rcc-and-uic.patch'
'0028-Ignore-errors-about-missing-feature-static.patch'
'0029-Enable-and-fix-use-of-iconv.patch'
'0030-Ignore-failing-pkg-config-test.patch'
'0031-Prevent-qmake-from-messing-static-lib-dependencies.patch'
'0032-Hardcode-linker-flags-for-platform-plugins.patch'
'0033-Fix-linking-against-static-plugins-with-qmake.patch'
'0034-Don-t-use-the-statx-syscall.patch')
sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
'd10d56c65b632d881f79eda8c0caeffb1a53a4829ac886e80038cdc8929b1669'
'524883f46945ab2ce023e9de1144a7eebafdba936ea8c61e035006deff48fa5b'
'cea0e73f831348e50285ab87149803d4dfb5650c4c96037844b98b3dc1c65159'
'e333d61821a42710a00f9bd4d003d376f513ba6ca41a3739bfcd414c99b8e7dd'
'e8b0bdcc39458105dd0e5c569c98ef53a84d2fe4e9e200e1b1c1b7b749e8e758'
'e14860d560886b600373f639e89e9a60d77de9a536587633ea71e1fd907df3fb'
'447c27f0e87d5cdcbe9883f6d3aac0daefef28e09bd8afe8d07a650375ca8362'
'e2f98037b93aa2970014c1d185912b49d4ab5506c24fa2410cb0e93d4e0a1f54'
'507537c73995715fa1a4e9e0f1ecfdf4afe409b5397366f551d06c6c406e088b'
'760093a185cd77bacec0d85c0c077370d6044b89a4d6f03944524d1aa2b82dfa'
'6052446a675be39dd663ef69ee5339ab67c2805b29ff4ef19bacf0f677a95182'
'60a6e236334d3950b40dbb0501cc733bc7a672b0c7fbf6e4792c0058bf20a859'
'f58391f9407742a1543702fe0234a134883046ff99584c1cfa468893264bf5e9'
'9e406b466c2b447da5d44ea37cafe2b3c3caebfa54936eb71e816e60b186c47d'
'870ed7adb78d4f5b396fa9106777aaeefc2a8af406e1aa1655dfe3405974a1ce'
'b51a2d707a09cce340ca10e4a93c18a0872881889a97dc3ea2aafe73d80dfd46'
'ed206eef70d57cd1aeb31c9e65ceb46fe926bee462c9b6507d22b6daf9b03aff'
'00ea2ef2f2d8868351d857716e60e8e78ed90a294132cd1fbd8039aae50e7344'
'f80e166e5a358cc3d0dca5f0a543b30271a1c536ff9ef73105f1e432b10d3afe'
'12c4ce015c5641376dea7a232f0fc9f8feb10ddee06c65f87e0f00ea2574ab15'
'a3a6a12f94ed4a79b3910623e3a8a11859d7a6a72b4634ff8bd6d1269af615bd'
'6f1f96ec05f049a107f4b5b3fba05e088d47f1c4751fd21851ed48d5f1b5a274'
'2926f77fbab219cb2fe9bb630274b06594a72c9047d374209d96591e481015fd'
'b36b7fce8e101444d17026002f8052be41de887ccd263188a64faeae31cc1c89'
'7bcfe130f6dc47c9fb4d3db6fe9634596ab2c01e421bfc9a0967463487b4b7f0'
'83f6a3fc2489da2686f035563542478fd01e2849e18ea02478d7850bd68f16be'
'7254445b4cea5e1d7efc25b923e755ab3b19856ee8bce2ebe2900b9bf4717841'
'd03a3cc5dab9d9a843e73f241fee2778deffe9ee727e493a0052e62b2266923e'
'd6dc468d67e782b64fbe9ba64dfc3fdf423c5d06205f4a87a0561bb53b35d7fc'
'43c367e31c1560178a1471a80a9e90391c7c93f8dfece8c4c9dfafea4a3ce180'
'2e89aca862a62cbf535faf4b01c00dfed40ad6ccb52ac998913e9e96801491a3'
'8b1402c8ac78c0870af19ccdd8b2603e164cf2ef4fd4446fd03ea40b68a35643'
'81d279b24a508656597fec9bf94bade25cf0d600607febcd35f7fd27d09970eb'
'95a8cd9553ef18e200a85ff6dc5c718525d71be92d4fa49b8cdceae73696e037')
'0020-Use-.dll.a-as-import-lib-extension.patch'
'0021-Merge-shared-and-static-library-trees.patch'
'0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch'
'0023-Allow-usage-of-static-version-with-CMake.patch'
'0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch'
'0025-Use-correct-pkg-config-static-flag.patch'
'0026-Fix-macro-invoking-moc-rcc-and-uic.patch'
'0027-Ignore-errors-about-missing-feature-static.patch'
'0028-Enable-and-fix-use-of-iconv.patch'
'0029-Ignore-failing-pkg-config-test.patch'
'0030-Prevent-qmake-from-messing-static-lib-dependencies.patch'
'0031-Hardcode-linker-flags-for-platform-plugins.patch'
'0032-Fix-linking-against-static-plugins-with-qmake.patch')
sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
'6b29d7a3751a506c15155425d6dc213e9f4654ee5b833007a0119bda6a050b28'
'ca10438f4a2d309f496e85d7b974d9eeb88115e068e146ca511b9784db95b822'
'75bf0d8b155f95bad2dfbc5c046f88afd6a5f2233336a1f6d148583ba445fca6'
'd70dcd1c44e751b0120f514af9db4ff20ebb0a327a22a371cf5e8d9453f66953'
'cbad834340bc9e9261704034e9192bd0d7306f9ff02a99fd73fc348948c37ed9'
'3c7cd1839a6f0891b871c75824b8ebeb05e4e61884c342d6b6ab583f10819138'
'c923da99871dac4fc58b8e70bd76c70fba0f421fc676a53bcb8c0187190ba737'
'f9be656281652f72297f1e573f23298c22f4849857d92106096feb4b3fe9244f'
'5add111a9e521159e31ecef4d85ebef86285bbbe2adce5d8cec94fd22822731e'
'7d38e79bc6b2e5d74515291bf78c3a6168f8bc834f7f59bda2c013f65e45bd3e'
'9ab62cc8cd1cf68ee5e87e276d5a2f19c43b04a1c50c10341794924277cfcca5'
'f1926bd51376a95ea1deee933dadd62166296e5780e24ce8312637c9d3eda27b'
'03f7a178af6b630f48da79c76e1239695d96137fd8394ba814e4bdf8c7e0a826'
'dc3e0e3fe4ba979f74ff9dc343b235d32473edb18ca7f8afea3076f613564a95'
'ef64b965a19e1e2848761829a6817dcb9f3ad616faa666f9e52736d810190c66'
'9e0c3848df586ec7decd9b7a6dab86a9e7e5cc7bf5ac06ff97d7d63e370bb05b'
'7dc90045a838f9ebcb7933d582abb3e8bba250644602e1019bf1a03e74cc3b09'
'b5cc23a29e80ec8185da8ca0950ab8a2f12f4ef4b998c763334d352e68b53fc2'
'944cfdbfd9d13285aefb4305596950d2880cc1023b5ad241af08e3d6995daa69'
'5f7498a98912542c39b081c2df1930246df3bdb533c2e30204bf795cea8b885f'
'0b8408d70a4544e43fd573e5b9ac751fb2732d3e4490f21e1737ac09ece25b62'
'08155a41f22c03741096145bf201d5503e38495c2f255f3c81ea658948258cd3'
'7b30d46f739dffa20a1964e09958a92af1749104fe7a88d7ea255aa54e553b25'
'c92d6a124b7b0333175122555ef9f647817eb54563480cf3eaaf47decfd907c3'
'0818c4d59aabb898fed8f313e21085cc8fc576d3f4975383eb73ba3f758c302e'
'ce5d416a3404199072062063d8038084c23bbfe8aa45ed3340c4afb4dfa461e4'
'8d1e93bea1cdcdf1b965f4c061975668334cef6a65130f1b4b528f2b6952a602'
'298ffdcd378e2b07fe8e978cfb5faac29c117a5f79288273545a6938b905f33a'
'7514edba8ecd28b27715650bbafa8649492b68efba1df9c9fa70f06a924fea14'
'7c232c385303b447e17270b946d333b56274312b08b4e76439a5f77cb77aa909'
'acfdf70ae8738a0373bbd93e42048d1c699f666dd72933ad3c09b09620fb0715'
'c3df40da9b2494e59aae786a26ba93d88128b69971d10a64cb6d610045a101f8')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@ -237,7 +233,7 @@ build() {
# To prevent conflicts with the mingw-w64-qt4 package we have
# to put tools in a dedicated folder
# The last device option allows using ccache though the use of
# The last device option allows using ccache despite the use of
# pre-compile header
# (sloppiness must be set to pch_defines,time_macros in ccache config)
@ -345,6 +341,14 @@ package() {
cd "$srcdir/${_pkgfqn}"
make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}"
# Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
pushd "$srcdir/build-${_arch}/lib"
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
popd
pushd "$srcdir/build-${_arch}/plugins"
find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
popd
if isStatic; then
# The static release contains only the static libs itself but relies on the
# shared release for Qt5Bootstrap library and tools (qmake, uic, ...)
@ -376,7 +380,7 @@ package() {
popd
rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/StaticQt5OpenGLExtensions.pc"
# Keep various Qt 5 plugins to be used in static builds
# Create links to static plugins in lib directory
pushd "${pkgdir}/usr/${_arch}/lib/" && ln -s "./qt/plugins/"*/*.a . && popd
# Keep a couple pri files not found in base
@ -404,6 +408,9 @@ package() {
done
fi
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Remove doc
rm -rf "${pkgdir}/usr/${_arch}/share/doc"

30
qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch
View File

@ -1,21 +1,21 @@
From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001
From fc85bad55db9fd58860c84e74ba3de1720111ef1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64
Subject: [PATCH 01/32] Add profile for cross compilation with mingw-w64
---
mkspecs/mingw-w64-g++/qmake.conf | 126 +++++++++++++++++++++++++++
mkspecs/mingw-w64-g++/qmake.conf | 132 +++++++++++++++++++++++++++++
mkspecs/mingw-w64-g++/qplatformdefs.h | 155 ++++++++++++++++++++++++++++++++++
2 files changed, 281 insertions(+)
2 files changed, 287 insertions(+)
create mode 100644 mkspecs/mingw-w64-g++/qmake.conf
create mode 100644 mkspecs/mingw-w64-g++/qplatformdefs.h
diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf
new file mode 100644
index 0000000000..c49336845b
index 0000000000..978867fa1b
--- /dev/null
+++ b/mkspecs/mingw-w64-g++/qmake.conf
@@ -0,0 +1,126 @@
@@ -0,0 +1,132 @@
+#
+# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++
+#
@ -128,13 +128,19 @@ index 0000000000..c49336845b
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
+QMAKE_LIBS =
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+QMAKE_LIBS_CORE = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+QMAKE_LIBS_GUI = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+ $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --libs freetype2)
+QMAKE_LIBS_GUI_STATIC = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi
+QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
+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_DBUS = $$system($${QMAKE_PKG_CONFIG} --libs dbus-1)
+QMAKE_LIBS_DBUS_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1)
+QMAKE_LIBS_WIDGETS_STATIC = -ldwmapi -luxtheme
+QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
+QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
@ -304,5 +310,5 @@ index 0000000000..c5a70b1445
+
+#endif // QPLATFORMDEFS_H
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001
From e2c07e461564d363b8692b5b5de067c892259a36 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/34] 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
---
@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.15.1
2.16.1

10
qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
View File

@ -1,7 +1,7 @@
From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001
From 84d1b9f6d84e46ee756761d0a9cc264d067b9250 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/34] Use external ANGLE library
Subject: [PATCH 03/32] Use external ANGLE library
---
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
@ -54,7 +54,7 @@ index f8cec00b82..d09c9fd49c 100644
include(accessible/accessible.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 016db46405..02f1204f0f 100644
index 742be61a50..5fef69fd3f 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
@ -78,7 +78,7 @@ index b7790a66e3..046fe34a06 100644
mingw: LIBS *= -luuid
# For the dialog helpers:
diff --git a/src/src.pro b/src/src.pro
index a2064b1362..b9ba606b03 100644
index a73729a760..32d9f8502a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -180,10 +180,6 @@ qtConfig(gui) {
@ -93,5 +93,5 @@ index a2064b1362..b9ba606b03 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001
From b001d0484e9fc4d2f3af20359db96f4d3942d0c7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory
Subject: [PATCH 04/32] Fix too many sections assemler error in OpenGL factory
On x86_64 qopenglversionfunctionsfactory.o exceeds the
limit of 32768 sections.
@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001
From 192e4593262474507b9b96424104e130c595e512 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
Subject: [PATCH 05/32] Make sure *.pc files are installed correctly
---
qmake/generators/makefile.cpp | 8 ++++++--
@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001
From 19a847d6ea1601de83ad067ba6c0fcf562273e72 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
Subject: [PATCH 06/32] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config
files contained invalid Libs.private references
@ -11,7 +11,7 @@ like .obj/debug/Qt5Cored_resource_res.o
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 792ffb1997..faf8b5a275 100644
index d6d6b04148..7bb616302f 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init()
@ -24,5 +24,5 @@ index 792ffb1997..faf8b5a275 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001
From bcb4c82d669d352c183c45e1cb71bd7c0946d1ec Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/34] Prevent debug library names in pkg-config files
Subject: [PATCH 07/32] Prevent debug library names in pkg-config files
qmake generates the pkgconfig .pc files two times, once for the
release build and once for the debug build (which we're not actually
@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001
From 9914d843bf7833fb04303cb96cff6912cfc7a7f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/34] Fix linking against shared/static libpng
Subject: [PATCH 08/32] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 0a591e110c..4ca919c6da 100644
index dab66fafb4..bc501bd3fc 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -296,7 +296,8 @@
@@ -291,7 +291,8 @@
"sources": [
{ "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng", "condition": "config.msvc" },
@ -23,5 +23,5 @@ index 0a591e110c..4ca919c6da 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001
From 3b501d8fc4dab1c437f18d2d21c64265858e367d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/34] Fix linking against static D-Bus
Subject: [PATCH 09/32] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@ -9,7 +9,7 @@ Subject: [PATCH 09/34] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index 26e1572f32..108619634c 100644
index a6f3ed66a9..803abf38bb 100644
--- a/configure.json
+++ b/configure.json
@@ -171,18 +171,23 @@
@ -39,7 +39,7 @@ index 26e1572f32..108619634c 100644
{ "libs": "-ldbus-1", "condition": "!config.win32" }
]
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index cfc0e12046..65f1397cd6 100644
index 9eaebe6d7e..ac1b1d977b 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644
# include <dbus/dbus.h>
#else
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001
From 5faa23e98e0fb63f3c2fedf3fe5fb93b2df940df Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
Subject: [PATCH 10/32] Don't try to use debug version of D-Bus library
Required for a debug build of Qt because mingw-w64-dbus
does not contain debug version
@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 108619634c..d668ce0c98 100644
index 803abf38bb..7e0b7ffb56 100644
--- a/configure.json
+++ b/configure.json
@@ -184,7 +184,7 @@
@ -25,5 +25,5 @@ index 108619634c..d668ce0c98 100644
},
"condition": "config.win32 && features.shared"
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch
View File

@ -1,14 +1,14 @@
From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001
From 3deafc5a5c28faaafb1f1ec52d32c9fc5df2986d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/34] Fix linking against static freetype2
Subject: [PATCH 11/32] Fix linking against static freetype2
---
src/gui/configure.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 4ca919c6da..5d524b1d73 100644
index bc501bd3fc..f7a4a39fd4 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -158,8 +158,11 @@
@ -26,5 +26,5 @@ index 4ca919c6da..5d524b1d73 100644
},
"fontconfig": {
--
2.15.1
2.16.1

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

@ -1,17 +1,17 @@
From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001
From 61f5c3fcc4d5ad5fb1bad5bc711c2d4e803e655a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/34] Fix linking against static harfbuzz
Subject: [PATCH 12/32] Fix linking against static harfbuzz
---
src/gui/configure.json | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 5d524b1d73..78f1b90d37 100644
index f7a4a39fd4..5ff8449509 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -223,7 +223,11 @@
@@ -218,7 +218,11 @@
]
},
"sources": [
@ -25,5 +25,5 @@ index 5d524b1d73..78f1b90d37 100644
},
"imf": {
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001
From c74216cc1ed27e282939c159bc63714f3cd69482 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/34] Fix linking against static pcre
Subject: [PATCH 13/32] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@ -24,5 +24,5 @@ index 86bc99716d..5037ae68a1 100644
#include <pcre2.h>
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001
From d8dca16ee267d09792a232e415cd92ef3ec4b294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/34] Fix linking against shared/static MariaDB
Subject: [PATCH 14/32] Fix linking against shared/static MariaDB
Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001
From 4900e0717b3f5562150d1ccbd5aaf64c0b4e5359 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
Subject: [PATCH 15/32] Fix linking against shared/static PostgreSQL
---
src/plugins/sqldrivers/configure.json | 5 +++--
@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
]
},
--
2.15.1
2.16.1

6
qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
View File

@ -1,7 +1,7 @@
From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001
From 810f18a177482cbe7bef0a8674b4f47de6730821 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/34] Rename qtmain to qt5main
Subject: [PATCH 16/32] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
2.15.1
2.16.1

8
qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
View File

@ -1,7 +1,7 @@
From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001
From b1563b11dbbc5a2ed80ef4aa7a3ee9d21fba7070 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/34] Build dynamic host libraries
Subject: [PATCH 17/32] Build dynamic host libraries
This came initially from Fedora, not sure whether
it makes sense to keep it. Regular Arch package
@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index c0a8dcc251..200fa40840 100644
index e6a0d97f1a..c07c1adc8b 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -24,7 +24,7 @@ requires(!$$skip)
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
-INSTALLS = lib
+INSTALLS += lib
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001
From 056173285f8854856cb9d710cc7af0cfb67ed294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/34] Enable rpath for build tools
Subject: [PATCH 18/32] Enable rpath for build tools
- Required because various tools depend on libQt5Bootstrap.so which resides
in folder /usr/${_arch}/lib
@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
INSTALLS += target
--
2.15.1
2.16.1

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

@ -1,7 +1,7 @@
From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001
From d268e7908b8cd1509023bdbfd61c9140b5bf1f62 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/34] Use system zlib for build tools
Subject: [PATCH 19/32] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 2 +-
@ -21,5 +21,5 @@ index 042ad7adb9..7e3bc3977a 100644
} else {
CONFIG += no_core_dep
--
2.15.1
2.16.1

26
qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch
View File

@ -1,26 +0,0 @@
From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:20:25 +0200
Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake
time when building with mingw-w64
---
mkspecs/features/toolchain.prf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index ba41598be1..6416db4d58 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) {
#
# Get default include and library paths from compiler
#
- gcc {
+ !win32:gcc {
cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE"
equals(QMAKE_HOST.os, Windows): \
cmd_prefix = "set LC_ALL=C&"
--
2.15.1

6
qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch → qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
View File

@ -1,7 +1,7 @@
From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001
From e01cb55796ac795043b4e3afd6811c8d0bfaf6c1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 21/34] Use *.dll.a as import lib extension
Subject: [PATCH 20/32] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
2.15.1
2.16.1

26
qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch → qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
View File

@ -1,22 +1,22 @@
From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001
From 297f163b0298a45307f397842bca505c860a7fc3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 22/34] Merge shared and static library trees
Subject: [PATCH 21/32] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
configure.pri | 9 +++++++++
mkspecs/features/default_post.prf | 11 +++++++++++
mkspecs/features/qt.prf | 15 +++++++++++++++
mkspecs/features/qt.prf | 17 +++++++++++++++++
mkspecs/features/spec_pre.prf | 11 ++++++++---
qmake/generators/makefile.cpp | 9 ++++++---
5 files changed, 49 insertions(+), 6 deletions(-)
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
index 83c0dee141..a05c3d98e6 100644
index ea482552c4..9da756fb3a 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1212,3 +1212,12 @@ defineTest(createConfigStatus) {
@@ -1225,3 +1225,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -51,10 +51,10 @@ index 7e027325bd..ad0db62b78 100644
!have_target:!force_qt: CONFIG -= qt
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 3ccbbe7061..afaac3dbc4 100644
index b57afcf72d..6eebd068f1 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -255,6 +255,21 @@ for(ever) {
@@ -259,6 +259,23 @@ for(ever) {
!isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
}
@ -64,11 +64,13 @@ index 3ccbbe7061..afaac3dbc4 100644
+ isEqual(MODULE_NAME, QtCore) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_CORE
+ } else:isEqual(MODULE_NAME, QtGui) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_GUI
+ LIBS$$var_sfx += $$QMAKE_LIBS_GUI_STATIC
+ } else:isEqual(MODULE_NAME, QtNetwork) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK_STATIC $$QMAKE_LIBS_NETWORK
+ LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK_STATIC
+ } else:isEqual(MODULE_NAME, QtDBus) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_DBUS
+ LIBS$$var_sfx += $$QMAKE_LIBS_DBUS_STATIC
+ } else:isEqual(MODULE_NAME, QtWidgets) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_WIDGETS_STATIC
+ } else:isEqual(MODULE_NAME, QtOpenGL) {
+ LIBS$$var_sfx += $$QMAKE_LIBS_OPENGL
+ }
@ -126,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
2.15.1
2.16.1

41
qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch → qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
View File

@ -1,7 +1,7 @@
From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001
From 22098826acc64ddaa2dbbeabe2d509fd8a54a6d1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules
Subject: [PATCH 22/32] Pull dependencies of static libraries in CMake modules
When doing a static build of Qt, the dependencies of the Qt
libraries and plugins itself must be specified when linking
@ -9,8 +9,8 @@ the final application.
---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++++-----
.../features/data/cmake/Qt5PluginTarget.cmake.in | 11 +-
qmake/generators/makefile.cpp | 7 +
3 files changed, 128 insertions(+), 38 deletions(-)
qmake/generators/makefile.cpp | 16 ++-
3 files changed, 133 insertions(+), 42 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 55c74aad66..b401db5ac2 100644
@ -251,23 +251,32 @@ index 5baf0fdb10..ec5f3cc437 100644
+
+endif()
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5e84628e72..c853d52b27 100644
index 5e84628e72..43f570fb2c 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t)
for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
t << qv(project->values((*it).toKey()));
t << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = ";
+ QString sep;
+ for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
+ t << sep << project->values((*it).toKey()).join(';').replace('\\', "\\\\");
+ sep = ';';
@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
libs << "QMAKE_LIBS"; //obvious one
if(project->isActiveConfig("staticlib"))
libs << "QMAKE_LIBS_PRIVATE";
- t << "QMAKE_PRL_LIBS =";
- for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
- t << qv(project->values((*it).toKey()));
- t << endl;
+ QStringList libNames;
+ QStringList libNamesCMake;
+ for (const auto &lib : libs) {
+ for (const auto &libName : project->values(lib.toKey())) {
+ libNames << QMakeEvaluator::quoteValue(libName);
+ QString libNameCMake(libName.toQString());
+ libNameCMake.replace(QChar('\\'), QLatin1String("\\\\"));
+ libNamesCMake << libNameCMake;
+ }
+ }
+ t << endl;
+ t << "QMAKE_PRL_LIBS = " << libNames.join(QChar(' ')) << endl;
+ t << "QMAKE_PRL_LIBS_FOR_CMAKE = " << libNamesCMake.join(QChar(';')) << endl;
}
}
--
2.15.1
2.16.1

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

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

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