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

Update mingw-w64-qt5 packages to 5.11.0

This commit is contained in:
Martchus 2018-05-23 20:56:49 +02:00
parent 6eec6d28e9
commit 1e7aea297a
197 changed files with 3007 additions and 1886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
angleproject/mingw-w64/PKGBUILD
View File

@ -83,7 +83,7 @@ prepare() {
python2 scripts/bootstrap.py
gclient sync --deps=all
# Apply patches; further descriptions can be found in patch files itself
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
patch -p1 -i "$patch"
done

2
devel/qt5/logs/qtvirtualkeyboard-compile-error.log Normal file
View File

@ -0,0 +1,2 @@
cd /build/mingw-w64-qt5-virtualkeyboard/src/qtvirtualkeyboard-everywhere-src-5.11.0/build-i686-w64-mingw32-shared/src/virtualkeyboard
i686-w64-mingw32-g++ -g -shared -Wl,-subsystem,windows -Wl,--out-implib,/build/mingw-w64-qt5-virtualkeyboard/src/qtvirtualkeyboard-everywhere-src-5.11.0/build-i686-w64-mingw32-shared/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.dll.a -o ../../plugins/platforminputcontexts/qtvirtualkeyboardplugin.dll object_script.qtvirtualkeyboardplugin.Release -lglu32 -lopengl32 -lgdi32 -luser32 -lQt5Quick -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L/build/mingw-w64-qt5-virtualkeyboard/src/qtvirtualkeyboard-everywhere-src-5.11.0/build-i686-w64-mingw32-shared/lib -lqtpinyin -lqttcime -lqtopenwnn

20
devel/qt5/logs/qtwinextras-compile-error.log Normal file
View File

File diff suppressed because one or more lines are too long

3
devel/qt5/rebase-patches.sh
View File

@ -13,8 +13,7 @@ oldbranchsuffix="$3"
# determine branch from old version
oldversionbranch="$oldversion-mingw-w64"
if [[ $oldbranchsuffix ]] \
&& oldversionbranch="$oldversionbranch-$oldbranchsuffix"
[[ $oldbranchsuffix ]] && oldversionbranch="$oldversionbranch-$oldbranchsuffix"
if [[ $(git branch | grep "$oldversionbranch" | wc -l) -gt 1 ]]; then
echo 'Which of the following branches was the latest for the old version?'
git branch | grep "$oldversionbranch"

2
passwordmanager/mingw-w64-static/PKGBUILD
View File

@ -7,7 +7,7 @@ _reponame=passwordmanager
pkgname=mingw-w64-passwordmanager-static
_name=${_reponame}
pkgver=3.1.5
pkgrel=2
pkgrel=3
arch=('any')
pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64, static)'
license=('GPL')

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

@ -9,7 +9,7 @@
_qt_module=qt3d
pkgname="mingw-w64-qt5-3d"
pkgver=5.10.1
pkgver=5.11.0
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=('041fb42536a72bbf9be17a6f52d4b73ce93fb98b456fd63503cc47d80d196b3b')
sha256sums=('4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \
@ -67,7 +67,7 @@ package() {
make INSTALL_ROOT="$pkgdir" install
# Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
# 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 {} +
@ -79,19 +79,29 @@ package() {
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 {} \;
# replace library path in *.prl files so it points to the installed location and not the build directory
find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \;
# remove prl files for debug version
if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then
for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do
[ -f "${file%d*}${file##*d}" ] && rm "${file}";
done
fi
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;
[[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
popd
done
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
# 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 e706e77b6b080f3b6fc7bfe82d1770d770e85733 Mon Sep 17 00:00:00 2001
From 500380bde90450867eca41d8c3337c949f99b6fa 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.16.1
2.17.0

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

@ -1,4 +1,4 @@
From a6d1363812cf4d66a40aeba61774f8b29144eea9 Mon Sep 17 00:00:00 2001
From 27154b3c619f5ffeb9925ed7cfcea8bda99bbe12 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:21:08 +0200
Subject: [PATCH 2/2] Handle win64 in dumpcpp and
@ -11,7 +11,7 @@ See https://bugreports.qt.io/browse/QTBUG-46827
2 files changed, 12 insertions(+)
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index aa66398..087b83c 100644
index fa3eacf..8dcd345 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2180,6 +2180,10 @@ void MetaObjectGenerator::readClassInfo()
@ -26,7 +26,7 @@ index aa66398..087b83c 100644
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 1f0cca8..d26bd78 100644
index 8a37f33..66fb3a8 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1539,6 +1539,10 @@ int main(int argc, char **argv)
@ -52,5 +52,5 @@ index 1f0cca8..d26bd78 100644
}
--
2.16.1
2.17.0

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

@ -9,7 +9,7 @@
_qt_module=qtactiveqt
pkgname=mingw-w64-qt5-activeqt
pkgver=5.10.1
pkgver=5.11.0
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=('9021ab7e34b10b30a80d6f5e2474afa8faea10792867d459b53dd11ba23891e4'
'c56ce522532663d48e88f9cc6cbcb839103a2426715dbf6b16d104e0875a30f8'
'17f9d460aad2f8c7143e44ef93ab145bd0d0e5b2ad0c91ff4547f11f55fb6a91')
sha256sums=('69aabe0dd5985bd5491b0ce165470b637087b14e2fd2d8a51eed4f14f1bc3705'
'c9c225647eedd1a2211b5d1123b09070f43135c1cae84049cbecf9ac3ad45157'
'd615831bd87dda340ebc9e8a7c6652202c62e97e1df9072273742ecbfc6a9032')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || \
@ -36,7 +36,7 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
prepare() {
cd "${srcdir}/${_pkgfqn}"
# Apply patches; further descriptions can be found in patch files itself
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
patch -p1 -i "$patch"
done
@ -65,7 +65,7 @@ package() {
make INSTALL_ROOT="$pkgdir" install
# Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
# 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 {} +
@ -77,23 +77,33 @@ package() {
popd
fi
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
# replace library path in *.prl files so it points to the installed location and not the build directory
find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \;
# remove prl files for debug version
if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then
for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do
[ -f "${file%d*}${file##*d}" ] && rm "${file}";
done
fi
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;
[[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
popd
done
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
# 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
# make sure the executables don't conflict with their mingw-qt4 counterpart
for _arch in ${_architectures}; do
for exe_file in "${pkgdir}/usr/${_arch}/bin/"*.exe; do
[[ -f $exe_file ]] && mv "${exe_file}" "${exe_file%.exe}-qt5.exe"

6
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.1
pkgver=5.11.0
pkgrel=1
pkgdesc='A cross-platform application and UI framework (apple-darwin)'
arch=('i686' 'x86_64')
@ -74,7 +74,7 @@ patch() {
prepare() {
cd "${srcdir}/${_pkgfqn}"
# Apply patches; further descriptions can be found in patch files itself
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
patch -p1 -i "$patch"
done
@ -195,6 +195,6 @@ package() {
[[ $APPLE_DARWIN_QT_DEBUG_BUILD ]] || find "${pkgdir}/${_osxcrossprefix}" -iname '*_debug*' -exec rm {} \;
done
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
# drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "$pkgdir/${_osxcrossprefix}" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
}

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

@ -1,7 +1,7 @@
From ef02a56ff99e9c2352d1395b8deada3c3078887f Mon Sep 17 00:00:00 2001
From bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
mingw-w64
Adding a new, separate mkspec instead of patching the existing one
@ -13,35 +13,32 @@ Also see the following issues:
* https://github.com/Martchus/PKGBUILDs/issues/59
* https://github.com/Martchus/PKGBUILDs/issues/60
---
mkspecs/win32-g++/qmake.conf | 56 +++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 19 deletions(-)
mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++---------
mkspecs/win32-clang-g++/qmake.conf | 4 +--
mkspecs/win32-g++/qmake.conf | 4 +--
3 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 9f366e08b8..848837e732 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -1,11 +1,13 @@
#
-# qmake configuration for win32-g++
+# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++
#
-# Written for MinGW-w64 / gcc 5.3 or higher
+# Written for cross compilation with mingw-w64 under GNU/Linux
#
# Cross compile example for i686-w64-mingw32-g++:
-# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
+# configure -xplatform mingw-w64-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index 610503379d..f099380cca 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -8,22 +8,31 @@
# Compiler-specific settings go into win32-g++/qmake.conf and
# win32-clang-g++/qmake.conf
#
+# The device options CROSS_COMPILE_CUSTOM_CONFIG and CROSS_COMPILE_CFLAGS can be used
+# to specify custom config/flags for cross compilation.
+#
load(device_config)
include(../common/gcc-base.conf)
@@ -14,12 +16,11 @@ include(../common/angle.conf)
include(../common/windows-vulkan.conf)
include(gcc-base.conf)
include(g++-base.conf)
+include(angle.conf)
+include(windows-vulkan.conf)
+
# modifications to gcc-base.conf and g++-base.conf
-
MAKEFILE_GENERATOR = MINGW
QMAKE_PLATFORM = win32 mingw
-CONFIG += debug_and_release debug_and_release_target precompile_header
@ -49,20 +46,18 @@ index 9f366e08b8..848837e732 100644
-QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32
+CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG}
+DEFINES += UNICODE _UNICODE
+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
+QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32
# can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
# x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC,
# 'QMAKE_TARGET.arch' is inherently unavailable.
@@ -29,7 +30,7 @@ QMAKE_LEX = flex
+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h)
+DEFINES += __INTRINSIC_DEFINED__xgetbv
+
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = bison -y
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS += -fno-keep-inline-dllexport
+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CFLAGS_SSE2 += -mstackrealign
@@ -40,6 +41,7 @@ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign
QMAKE_CXXFLAGS_RTTI_ON = -frtti
QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
@ -70,10 +65,10 @@ index 9f366e08b8..848837e732 100644
QMAKE_INCDIR =
@@ -50,40 +52,56 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_LINK = $${CROSS_COMPILE}g++
QMAKE_LINK_C = $${CROSS_COMPILE}gcc
+QMAKE_LFLAGS = -g
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-QMAKE_LFLAGS_RELEASE = -Wl,-s
@ -97,20 +92,22 @@ index 9f366e08b8..848837e732 100644
QMAKE_EXTENSION_STATICLIB = a
-QMAKE_LIB_EXTENSIONS = a dll.a
+QMAKE_EXTENSION_IMPORTLIB = dll.a
+
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
QMAKE_LIBS =
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+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)
+ $$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)
+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) \
+ -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+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
@ -133,11 +130,45 @@ index 9f366e08b8..848837e732 100644
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
QMAKE_NM = $${CROSS_COMPILE}nm -P
-
-include(angle.conf)
-include(windows-vulkan.conf)
diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf
index 4630ec4602..4981a28736 100644
--- a/mkspecs/win32-clang-g++/qmake.conf
+++ b/mkspecs/win32-clang-g++/qmake.conf
@@ -14,11 +14,11 @@ include(../common/g++-win32.conf)
QMAKE_COMPILER += clang llvm # clang pretends to be gcc
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
load(qt_config)
QMAKE_CC = $${CROSS_COMPILE}clang
-QMAKE_CFLAGS +=
+QMAKE_CFLAGS += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra -Wno-ignored-attributes
QMAKE_CXX = $${CROSS_COMPILE}clang++
-QMAKE_CXXFLAGS +=
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS}
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_LINK = $${CROSS_COMPILE}clang++
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index ed131c6823..b77d86cd6b 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
# modifications to g++-win32.conf
QMAKE_CC = $${CROSS_COMPILE}gcc
-QMAKE_CFLAGS += -fno-keep-inline-dllexport
+QMAKE_CFLAGS += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CXX = $${CROSS_COMPILE}g++
-QMAKE_CXXFLAGS += -fno-keep-inline-dllexport
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS}
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_LINK = $${CROSS_COMPILE}g++
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From f499d198b99ae5338ab85f7b65bf3dbcf9fba263 Mon Sep 17 00:00:00 2001
From 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
FIXME: Not sure whether this is still required
---
@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
1 file changed, 2 deletions(-)
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 0a5de2c9af..35798a2a28 100644
index 1a43f13d9b..a4c954a453 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -56,9 +56,7 @@
@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From f8025a3fcae7623f8e54299e0842ca45a71fb28d Mon Sep 17 00:00:00 2001
From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/32] Use external ANGLE library
Subject: [PATCH 03/33] Use external ANGLE library
---
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f8cec00b82..d09c9fd49c 100644
index 759d6f3cbf..1ddcf1db78 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@ -54,10 +54,10 @@ index f8cec00b82..d09c9fd49c 100644
include(accessible/accessible.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 742be61a50..5fef69fd3f 100644
index 8b2349ff2f..f5e43c6adc 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
@@ -10,6 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
qtConfig(opengl): CONFIG += opengl
qtConfig(opengles2): CONFIG += opengles2
@ -66,7 +66,7 @@ index 742be61a50..5fef69fd3f 100644
HEADERS += qgl.h \
qgl_p.h \
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
index b7790a66e3..046fe34a06 100644
index f4c396f7c5..fc87e810aa 100644
--- a/src/plugins/platforms/windows/windows.pri
+++ b/src/plugins/platforms/windows/windows.pri
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@ -78,10 +78,10 @@ index b7790a66e3..046fe34a06 100644
mingw: LIBS *= -luuid
# For the dialog helpers:
diff --git a/src/src.pro b/src/src.pro
index a73729a760..32d9f8502a 100644
index 1f7c5d99c1..24e24ef7f1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -180,10 +180,6 @@ qtConfig(gui) {
@@ -189,10 +189,6 @@ qtConfig(gui) {
SUBDIRS += src_3rdparty_harfbuzzng
src_gui.depends += src_3rdparty_harfbuzzng
}
@ -93,5 +93,5 @@ index a73729a760..32d9f8502a 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From da616cd666c43e0189c1998ba827e5da9c189b04 Mon Sep 17 00:00:00 2001
From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/32] Fix too many sections assemler error in OpenGL factory
Subject: [PATCH 04/33] 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 855124059e1ce75c1815a16056bfc7e91705ff93 Mon Sep 17 00:00:00 2001
From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/32] Make sure *.pc files are installed correctly
Subject: [PATCH 05/33] 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.16.2
2.17.0

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

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

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

@ -1,7 +1,7 @@
From 70e8d38009cc5321680ef727ac160316e20161a6 Mon Sep 17 00:00:00 2001
From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/32] Prevent debug library names in pkg-config files
Subject: [PATCH 07/33] 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3ee91c980962788177b41fb49eed40bf74ccf745 Mon Sep 17 00:00:00 2001
From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/32] Fix linking against shared/static libpng
Subject: [PATCH 08/33] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index dab66fafb4..bc501bd3fc 100644
index 219385a108..d629a45b92 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -291,7 +291,8 @@
@ -23,5 +23,5 @@ index dab66fafb4..bc501bd3fc 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From b136f177a24e438a2069c4f9c1d9b3a05db17b5c Mon Sep 17 00:00:00 2001
From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/32] Fix linking against static D-Bus
Subject: [PATCH 09/33] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@ -9,10 +9,10 @@ Subject: [PATCH 09/32] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index a6f3ed66a9..803abf38bb 100644
index ae2aa22070..baa99a3da9 100644
--- a/configure.json
+++ b/configure.json
@@ -171,18 +171,23 @@
@@ -172,18 +172,23 @@
"CONFIG(debug, debug|release): \\",
" LIBS += $$LIBS_DEBUG",
"else: \\",
@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
# include <dbus/dbus.h>
#else
--
2.16.2
2.17.0

10
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 4376a9888da599de6eaa14d1dcf83a0fe41193aa Mon Sep 17 00:00:00 2001
From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/32] Don't try to use debug version of D-Bus library
Subject: [PATCH 10/33] 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 803abf38bb..7e0b7ffb56 100644
index baa99a3da9..dfb8835ecb 100644
--- a/configure.json
+++ b/configure.json
@@ -184,7 +184,7 @@
@@ -185,7 +185,7 @@
{
"libs": "",
"builds": {
@ -25,5 +25,5 @@ index 803abf38bb..7e0b7ffb56 100644
},
"condition": "config.win32 && features.shared"
--
2.16.2
2.17.0

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

@ -1,14 +1,14 @@
From f622ed99d6d99283d7405cb0a96757c9e4922558 Mon Sep 17 00:00:00 2001
From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/32] Fix linking against static freetype2
Subject: [PATCH 11/33] 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 bc501bd3fc..f7a4a39fd4 100644
index d629a45b92..afa3d95f39 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -158,8 +158,11 @@
@ -26,5 +26,5 @@ index bc501bd3fc..f7a4a39fd4 100644
},
"fontconfig": {
--
2.16.2
2.17.0

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

@ -1,14 +1,14 @@
From 9a75cec77d9dfff3d283258b9b323819b9f820ca Mon Sep 17 00:00:00 2001
From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/32] Fix linking against static harfbuzz
Subject: [PATCH 12/33] 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 f7a4a39fd4..5ff8449509 100644
index afa3d95f39..a2b0a00d09 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -218,7 +218,11 @@
@ -25,5 +25,5 @@ index f7a4a39fd4..5ff8449509 100644
},
"imf": {
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From a9af38f04a32f596a168e066cb6d32f82a7154b4 Mon Sep 17 00:00:00 2001
From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/32] Fix linking against static pcre
Subject: [PATCH 13/33] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@ -9,10 +9,10 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index 86bc99716d..5037ae68a1 100644
index 13eff07c04..ea747244da 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -55,6 +55,10 @@
@@ -53,6 +53,10 @@
#include <QtCore/qdatastream.h>
#define PCRE2_CODE_UNIT_WIDTH 16
@ -24,5 +24,5 @@ index 86bc99716d..5037ae68a1 100644
#include <pcre2.h>
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3696e3f38362a701f0f59d3de35c7e0d0cb882ce Mon Sep 17 00:00:00 2001
From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/32] Fix linking against shared/static MariaDB
Subject: [PATCH 14/33] 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.16.2
2.17.0

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

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

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

@ -1,21 +1,34 @@
From d659c5369bd8059643edd4674d21e5b575c95b8e Mon Sep 17 00:00:00 2001
From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/32] Rename qtmain to qt5main
Subject: [PATCH 16/33] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
mkspecs/common/g++-win32.conf | 2 +-
mkspecs/features/create_cmake.prf | 4 ++--
mkspecs/features/win32/windows.prf | 2 +-
mkspecs/win32-g++/qmake.conf | 2 +-
src/winmain/winmain.pro | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index f099380cca..44c211d176 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index bb5083c925..146e83ae67 100644
index 66acedef55..5d553d9ca6 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -225,8 +225,8 @@ mac {
@@ -227,8 +227,8 @@ mac {
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
mingw {
@ -39,19 +52,6 @@ index ecb167bf18..7c9368c3b3 100644
!contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
QMAKE_LIBS += -L$$QT.core.libs
CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 848837e732..ad924a7c2a 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -88,7 +88,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index 4140ae48de..9ae73db74b 100644
--- a/src/winmain/winmain.pro
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 64298314d16b0d4f60a868dff2c379af982b821d Mon Sep 17 00:00:00 2001
From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/32] Build dynamic host libraries
Subject: [PATCH 17/33] 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 e6a0d97f1a..c07c1adc8b 100644
index f8729de947..db23f4ad1d 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 293c66efcd36c6ca5850d91847f0030c182aa336 Mon Sep 17 00:00:00 2001
From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/32] Enable rpath for build tools
Subject: [PATCH 18/33] 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.16.2
2.17.0

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

@ -1,17 +1,17 @@
From 3351283ce62c1d728d245657aa9a81d5e8c43def Mon Sep 17 00:00:00 2001
From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/32] Use system zlib for build tools
Subject: [PATCH 19/33] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 042ad7adb9..7e3bc3977a 100644
index a45382106a..17b9828581 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -132,7 +132,7 @@ macx {
@@ -133,7 +133,7 @@ macx {
../../corelib/io/qstandardpaths_win.cpp
}
@ -21,5 +21,5 @@ index 042ad7adb9..7e3bc3977a 100644
} else {
CONFIG += no_core_dep
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 380f8da75e9bfac1a2542d1ddd61949fb58022d3 Mon Sep 17 00:00:00 2001
From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 20/32] Use *.dll.a as import lib extension
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@ -11,10 +11,10 @@ mingw-w64 specific mkspec
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 146e83ae67..15fc070008 100644
index 5d553d9ca6..3e5ec55dae 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -236,8 +236,9 @@ mac {
@@ -238,8 +238,9 @@ mac {
CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
} else {
@ -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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 4c3092a30e8981125414d71fa481436ea4f917f5 Mon Sep 17 00:00:00 2001
From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 21/32] Merge shared and static library trees
Subject: [PATCH 21/33] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
index ea482552c4..9da756fb3a 100644
index 0512ef0144..c3ce522e4f 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1225,3 +1225,12 @@ defineTest(createConfigStatus) {
@@ -1249,3 +1249,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -30,7 +30,7 @@ index ea482552c4..9da756fb3a 100644
+ CONFIG += no_smart_library_merge
+}
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 7e027325bd..ad0db62b78 100644
index 9eba5bcf00..0f8d03eb2c 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
2.16.2
2.17.0

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

@ -1,22 +1,22 @@
From 9913c74ba93c506abaa5f13e02ac29e6cd82783d Mon Sep 17 00:00:00 2001
From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 22/32] Pull dependencies of static libraries in CMake modules
Subject: [PATCH 22/33] 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
the final application.
---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++++-----
.../features/data/cmake/Qt5PluginTarget.cmake.in | 11 +-
qmake/generators/makefile.cpp | 16 ++-
.../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++----
.../data/cmake/Qt5PluginTarget.cmake.in | 11 +-
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
index 27f4c277d6..358945b758 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -55,35 +55,52 @@ but not all the files it references.
@@ -49,35 +49,52 @@ but not all the files it references.
endmacro()
!!IF !equals(TEMPLATE, aux)
@ -77,7 +77,7 @@ index 55c74aad66..b401db5ac2 100644
)
endif()
!!ENDIF
@@ -227,13 +244,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_STATIC_TYPE)
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -126,7 +126,7 @@ index 55c74aad66..b401db5ac2 100644
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
@@ -245,6 +296,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -235,6 +286,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
@ -183,7 +183,7 @@ index 55c74aad66..b401db5ac2 100644
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
@@ -336,9 +437,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -325,9 +426,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@ -197,7 +197,7 @@ index 55c74aad66..b401db5ac2 100644
!!ENDIF // CMAKE_RELEASE_TYPE
!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
@@ -349,29 +452,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -338,29 +441,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
!!ENDIF // TEMPLATE != aux
@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644
}
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3955f9513c3c34351462b7c868da8b0650043393 Mon Sep 17 00:00:00 2001
From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 23/32] Allow usage of static version with CMake
Subject: [PATCH 23/33] Allow usage of static version with CMake
Allow selecting between dynamic and static Qt versions
installed in the same prefix
@ -11,18 +11,18 @@ installed in the same prefix
- Set USE_STATIC_QT_BY_DEFAULT to use static version
via regular find_package(Qt5Core)
---
mkspecs/features/create_cmake.prf | 103 ++++---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++++-------
.../features/data/cmake/Qt5PluginTarget.cmake.in | 18 +-
.../data/cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
src/corelib/Qt5CoreConfigExtras.cmake.in | 26 +-
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
7 files changed, 314 insertions(+), 152 deletions(-)
mkspecs/features/create_cmake.prf | 103 +++---
.../data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++------
.../data/cmake/Qt5PluginTarget.cmake.in | 18 +-
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
7 files changed, 313 insertions(+), 151 deletions(-)
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 15fc070008..13bd362092 100644
index 3e5ec55dae..b6c47124cc 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -38,7 +38,7 @@ split_incpath {
@ -34,7 +34,7 @@ index 15fc070008..13bd362092 100644
!build_pass:QMAKE_SUBSTITUTES += \
cmake_extra_source_includes
@@ -90,6 +90,8 @@ win32:!static:!staticlib {
@@ -92,6 +92,8 @@ win32:!static:!staticlib {
}
static|staticlib:CMAKE_STATIC_TYPE = true
@ -43,7 +43,7 @@ index 15fc070008..13bd362092 100644
CMAKE_DEBUG_TYPE =
CMAKE_RELEASE_TYPE =
@@ -135,17 +137,19 @@ contains(CONFIG, plugin) {
@@ -137,17 +139,19 @@ contains(CONFIG, plugin) {
CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
win32 {
@ -67,7 +67,7 @@ index 15fc070008..13bd362092 100644
mac {
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
else: CMAKE_PlUGIN_EXT = .a
@@ -161,13 +165,13 @@ contains(CONFIG, plugin) {
@@ -163,13 +167,13 @@ contains(CONFIG, plugin) {
}
}
cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -83,7 +83,7 @@ index 15fc070008..13bd362092 100644
INSTALLS += cmake_qt5_plugin_file
return()
@@ -180,27 +184,36 @@ mod_deps =
@@ -182,27 +186,36 @@ mod_deps =
lib_deps =
aux_mod_deps =
aux_lib_deps =
@ -124,7 +124,7 @@ index 15fc070008..13bd362092 100644
!isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
@@ -228,35 +241,33 @@ mac {
@@ -230,35 +243,33 @@ mac {
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
@ -179,7 +179,7 @@ index 15fc070008..13bd362092 100644
!isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
@@ -276,12 +287,12 @@ mac {
@@ -278,12 +289,12 @@ mac {
INSTALLS += cmake_qt5_module_files
cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -194,7 +194,7 @@ index 15fc070008..13bd362092 100644
!build_pass:QMAKE_SUBSTITUTES += \
cmake_config_file \
@@ -291,11 +302,29 @@ cmake_qt5_module_files.files = \
@@ -293,11 +304,29 @@ cmake_qt5_module_files.files = \
$$cmake_config_file.output \
$$cmake_config_version_file.output
@ -225,7 +225,7 @@ index 15fc070008..13bd362092 100644
!build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
@@ -307,7 +336,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
@@ -309,7 +338,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
exists($$cmake_macros_file.input) {
CMAKE_MODULE_MACROS = "true"
@ -234,7 +234,7 @@ index 15fc070008..13bd362092 100644
cmake_macros_file.CONFIG = verbatim
!build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
@@ -315,7 +344,7 @@ exists($$cmake_macros_file.input) {
@@ -317,7 +346,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@ -244,12 +244,12 @@ index 15fc070008..13bd362092 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index b401db5ac2..e6dd749c9e 100644
index 358945b758..d123edf665 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -9,6 +9,33 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
endif()
!!ENDIF
+!!IF isEmpty(CMAKE_STATIC_TYPE)
+# "redirect" to static package overriding variant prefix so it does not contain "Static" anymore
@ -281,7 +281,7 @@ index b401db5ac2..e6dd749c9e 100644
!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -35,15 +62,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -29,15 +56,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
!!IF !equals(TEMPLATE, aux)
# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
@ -307,7 +307,7 @@ index b401db5ac2..e6dd749c9e 100644
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
@@ -54,23 +85,60 @@ but not all the files it references.
@@ -48,23 +79,60 @@ but not all the files it references.
endif()
endmacro()
@ -371,7 +371,7 @@ index b401db5ac2..e6dd749c9e 100644
\"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
\"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
!!IF !isEmpty(CMAKE_LIB_SONAME)
@@ -80,7 +148,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
\"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
)
!!ELSE
@ -380,7 +380,7 @@ index b401db5ac2..e6dd749c9e 100644
\"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
\"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
!!IF !isEmpty(CMAKE_LIB_SONAME)
@@ -97,9 +165,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
!!ELSE
set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
@ -395,7 +395,7 @@ index b401db5ac2..e6dd749c9e 100644
\"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
)
endif()
@@ -107,8 +179,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
endmacro()
!!ENDIF
@ -406,7 +406,7 @@ index b401db5ac2..e6dd749c9e 100644
!!IF !no_module_headers
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -116,46 +189,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
)
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@ -474,7 +474,7 @@ index b401db5ac2..e6dd749c9e 100644
endforeach()
!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
@@ -164,16 +241,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
if (NOT _check_private STREQUAL -1)
foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -498,8 +498,8 @@ index b401db5ac2..e6dd749c9e 100644
!!ENDIF // TEMPLATE != aux
set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
@@ -183,10 +264,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
!!ENDIF
- set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -511,7 +511,7 @@ index b401db5ac2..e6dd749c9e 100644
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
@@ -194,17 +275,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@ -533,7 +533,7 @@ index b401db5ac2..e6dd749c9e 100644
$$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
@@ -212,28 +293,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
endif()
@ -577,8 +577,7 @@ index b401db5ac2..e6dd749c9e 100644
+!!ENDIF
!!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
@@ -242,8 +327,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
!!ENDIF
!!IF !isEmpty(CMAKE_STATIC_TYPE)
@ -590,7 +589,7 @@ index b401db5ac2..e6dd749c9e 100644
macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
if (EXISTS \"${PRL_FILE_LOCATION}\")
file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
@@ -267,34 +353,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -257,34 +343,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endmacro()
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@ -646,7 +645,7 @@ index b401db5ac2..e6dd749c9e 100644
# Find plugin targets
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
@@ -308,7 +405,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -298,7 +395,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
endif()
@ -658,7 +657,7 @@ index b401db5ac2..e6dd749c9e 100644
set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
@@ -316,7 +417,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -306,7 +407,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
!!ENDIF
@ -670,7 +669,7 @@ index b401db5ac2..e6dd749c9e 100644
set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
\"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
)
@@ -347,7 +452,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -337,16 +442,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -679,10 +678,9 @@ index b401db5ac2..e6dd749c9e 100644
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE)
endif()
@@ -355,9 +460,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST)
- add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
- INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
@ -692,7 +690,7 @@ index b401db5ac2..e6dd749c9e 100644
)
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
@@ -365,66 +470,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -354,66 +459,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
endif()
endforeach()
@ -783,7 +781,7 @@ index b401db5ac2..e6dd749c9e 100644
if (EXISTS
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
@@ -437,7 +544,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -426,7 +533,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@ -792,7 +790,7 @@ index b401db5ac2..e6dd749c9e 100644
endif()
!!ENDIF // CMAKE_STATIC_TYPE
@@ -447,19 +554,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -436,19 +543,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ENDIF // CMAKE_DEBUG_TYPE
!!ELSE // TEMPLATE != aux
@ -870,7 +868,7 @@ index 0000000000..0091940fd2
+set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}")
+
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index 545b9a3d1e..ebe6644dfe 100644
index e0652fdcf9..f0add757bb 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,4 +1,6 @@
@ -902,19 +900,16 @@ index 545b9a3d1e..ebe6644dfe 100644
set(_qt5_corelib_extra_includes)
# Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
@@ -81,9 +83,9 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
if (CMAKE_VERSION VERSION_LESS 2.8.12
AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\"
OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
- set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
+ set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
else()
- set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
+ set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
endif()
@@ -78,7 +80,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
# Applications now need to be compiled with the -fPIC option if the Qt option
# \"reduce relocations\" is active. For backward compatibility only, Qt accepts
# the use of -fPIE for GCC 4.x versions.
-set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
+set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
# Applications using qmake or cmake >= 2.8.12 as their build system will
@@ -103,7 +105,7 @@ endif()
# TODO Qt6: Remove
set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
@@ -86,7 +88,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
!!IF !isEmpty(QT_NAMESPACE)
list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
@ -923,7 +918,7 @@ index 545b9a3d1e..ebe6644dfe 100644
!!ENDIF
!!IF !isEmpty(CMAKE_DISABLED_FEATURES)
@@ -112,9 +114,9 @@ set(Qt5_DISABLED_FEATURES
@@ -95,9 +97,9 @@ set(Qt5_DISABLED_FEATURES
)
!!ENDIF
@ -935,7 +930,7 @@ index 545b9a3d1e..ebe6644dfe 100644
!!IF qtConfig(reduce_exports)
set(QT_VISIBILITY_AVAILABLE \"True\")
@@ -162,14 +164,14 @@ if (NOT TARGET Qt5::WinMain)
@@ -145,14 +147,14 @@ if (NOT TARGET Qt5::WinMain)
set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
@ -997,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 716349466294e9809c92303becf2fede7745f9fd Mon Sep 17 00:00:00 2001
From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 24/32] Adjust linker flags for static build with
Subject: [PATCH 24/33] Adjust linker flags for static build with
cmake/mingw-w64
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@ -10,10 +10,10 @@ Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
1 file changed, 7 insertions(+)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index ebe6644dfe..687d611b3f 100644
index f0add757bb..5328da2e80 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -190,3 +190,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
@@ -173,3 +173,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
_qt5_Core_check_file_exists(${_Qt5CTestMacros})
@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
+unset(_isExe)
+!!ENDIF
--
2.16.2
2.17.0

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

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

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

@ -1,7 +1,7 @@
From b0cbcf49f288bc4e87c055b757505f745423c686 Mon Sep 17 00:00:00 2001
From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 26/32] Fix macro invoking moc, rcc and uic
Subject: [PATCH 26/33] 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 8d3dbe3ecf..f0f0d69309 100644
index 1627de4002..ed0f6555a7 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 8d3dbe3ecf..f0f0d69309 100644
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
@@ -254,8 +255,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
@ -43,7 +43,7 @@ index 8d3dbe3ecf..f0f0d69309 100644
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
@@ -287,8 +289,9 @@ function(QT5_ADD_RESOURCES outfiles )
@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles )
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 43051c0832825089e058715e126baefa9071bc2d Mon Sep 17 00:00:00 2001
From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 27/32] Ignore errors about missing feature static
Subject: [PATCH 27/33] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 76e1d15319..9a1c5cd8b6 100644
index 021036e4f9..16e8aa631d 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -138,5 +138,5 @@ defineTest(qtConfig) {
@@ -140,5 +140,5 @@ defineTest(qtConfig) {
contains(QT.$${module}.disabled_features, $$1): \
return(false)
}
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 64a634598092a7cbeca267f3dc0860a3105ed329 Mon Sep 17 00:00:00 2001
From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 28/32] Enable and fix use of iconv
Subject: [PATCH 28/33] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
@ -24,7 +24,7 @@ index fe4b87b923..be4236436f 100644
size_t inbytes, outbytes;
iconv(x, &inp, &inbytes, &outp, &outbytes);
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index d6362b6fbc..4da4546a24 100644
index 330eb7c038..88a782b863 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv);
@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644
#else
char **inBytesPtr = &inBytes;
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 8cd73d6ce4..dd259157e3 100644
index 5e48024def..15e7372dcb 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -521,9 +521,9 @@
@@ -539,9 +539,9 @@
},
"gnu-libiconv": {
"label": "GNU iconv",
@ -79,5 +79,5 @@ index 8cd73d6ce4..dd259157e3 100644
},
"icu": {
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 9d139e94af7e18e965732684864d75ac1ee015f2 Mon Sep 17 00:00:00 2001
From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 29/32] Ignore failing pkg-config test
Subject: [PATCH 29/33] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best
---
@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
index 7e0b7ffb56..0f098e7b3f 100644
index dfb8835ecb..f9735f59cd 100644
--- a/configure.json
+++ b/configure.json
@@ -725,7 +725,6 @@
@@ -597,7 +597,6 @@
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
@ -21,5 +21,5 @@ index 7e0b7ffb56..0f098e7b3f 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From d360972109bd354d675499efc4e00ee9ed8da3c9 Mon Sep 17 00:00:00 2001
From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 30/32] Prevent qmake from messing static lib dependencies
Subject: [PATCH 30/33] 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.16.2
2.17.0

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

@ -1,19 +1,19 @@
From 28f289f8b87da3bd244f8c63ead918f0922a4358 Mon Sep 17 00:00:00 2001
From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 31/32] Hardcode linker flags for platform plugins
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll
and libqwindows.dll
---
src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++--
src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
src/plugins/platforms/windows/windows.pro | 32 +++++++++++++++++++--------
src/plugins/platforms/minimal/minimal.pro | 15 +++++++--
src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++--
src/plugins/platforms/windows/windows.pro | 32 +++++++++++++------
3 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 8cfb68824e..46834a71fc 100644
index a1a2da547b..7ef91b574d 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,8 +1,19 @@
@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644
include(windows.pri)
--
2.16.2
2.17.0

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

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

49
qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch Normal file
View File

@ -0,0 +1,49 @@
From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 26 May 2018 03:47:14 +0200
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise it fails to compile src/corelib/global/qrandom.cpp:
```
during RTL pass: ira
/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp: In function ‘qsizetype qt_random_cpu(void*, qsizetype)’:
/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp:121:1: internal compiler error: in ix86_compute_frame_layout, at config/i386/i386.c:11693
}
```
---
src/corelib/global/qrandom.cpp | 2 +-
src/corelib/global/qrandom_p.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
index ebf9864b15..2fb04ab12a 100644
--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
@@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
QT_BEGIN_NAMESPACE
-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND)
static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW;
# ifdef Q_PROCESSOR_X86_64
diff --git a/src/corelib/global/qrandom_p.h b/src/corelib/global/qrandom_p.h
index 917a91098e..c770a3e19b 100644
--- a/src/corelib/global/qrandom_p.h
+++ b/src/corelib/global/qrandom_p.h
@@ -81,7 +81,7 @@ enum { qt_randomdevice_control = 0 };
inline bool qt_has_hwrng()
{
-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND)
return qCpuHasFeature(RDRND);
#else
return false;
--
2.17.0

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

@ -36,8 +36,8 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base-angle
pkgver=5.10.1
pkgrel=2
pkgver=5.11.0
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')
@ -83,40 +83,42 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'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'
'1c482310bbfef78733a2013f42e505657059e720cf139ddcf5ad692c4dbf06b1'
'45a1020a351931b7171e55ef8165d2cc4af3bf2473b142daa51f3b5b15c447f3'
'ceb05dabed9fa2fc781e5abcfb54285960267922bac753df4179831a240da9b7'
'c4138094696342f8f976c01c9ce66919ae38802f36d3280b47883446e8d74bf9'
'2f99ae05056636b434bf7a533db6de7561c6f6e3fe8e854b4e9a182e30c684b3'
'fa69c484d557f45b1929e0b4be6328837717337155477a8fab3f9ea59731c749'
'57de459c6af72293560afcf7a872b1a4b10badd986c1fc1b43d7aaf55caf52c5'
'58e6f6a0271e82be5b7560a247cb70809169148e6413c473e2c3fed97e5d1c45'
'ea39d2b90a848a4c36a7685688283b773ff2ed5e6912be52a943f31376eefc81'
'b8f5a6a707f20cce64d9e5f04c35c555d7d14cd20344510205babc9a5698a15a'
'b1eaea87c7d7b774657feb4745450ab4e423c158ff81c144d724dcd8ac950c6f'
'8092fe23e35906b9a967ec78e1892769f06f1699c4c177ea0814876fb7c423d2'
'4b73f19e254466e5e4d13459088f773a44c9f05033ad5d29995c5116f18f999d'
'6a1411e406efab5521af71b2b8cf122c8443157114799f23d3e2cd1dc59c8e14'
'52b0fc09f05d1ca2efbf3a046cf933e72dae4bfd63026298fd60360103106c5a'
'30b5bded4f2e3ac5e4c83412c92afe0ad604e3eb18a94a3357f220b5e0456d86'
'1a18636d6089fe49ae7e0592dad6d71a1466aa0fc2d033ca926c14e468aff0c9'
'9710090523aefca66211bd8b74bcdc650125299912b735ba4845408e9e860649'
'551f05ad17737fe8b9b00c24a3a5539988455cbb706458e44c3df2df56599f63'
'd2f5aaacd2be586cfab27a23120a9f21749c1ac96664071c399f91097274ec89'
'23878d79148e4db9e1c5ba2e6e6d2ced259b64aa1ba2f1503ab9938863b2104f'
'30f5b6c738609a8ac03f806b86a632c3cf6d85b56e038f812d46358b592cc427'
'2782b7eb4f55cb5905b5bcb8387ad3a7130727b036b0fc482b1294380862f5d1'
'156e720e4ad44f257019dbe2fe1eef7b7a27989307f8a9f53072f4cbe178c655'
'53088ce6f9a22ee1735fb8b7145ce569ac1914ac05fb947ca3afae39d3cb3199'
'e61f2fd0c91c72822c1074844897641ce1c9500423b4c646aa8ae1671f9f967b'
'cccad985154167818657d0561ec349cb75931a0a64a689ab51041337d73a88b8'
'ffbc7f20785904ba64f108498aafe8b5a4c1de76c44aa5353ee3d7202f186408'
'1572c30c43e9e6d23d0f42c99c9501f092eae5d2bad2b0bc0eb694b295c0c473'
'ef96dffc0dd3bb76b237c6e886d6d5cc154e25f5ed4d5f65643e272a58306327'
'73d9df72df2f55c19ddeb9241de818d39c8da3399eee55f306889dc3c11dc934'
'892bb35a340597c77da5310685cc47102cf2522fb01cbc6d1785016babc78727')
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
'0033-Disable-hardware-randomizer-for-32-bit.patch')
sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66'
'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3'
'29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2'
'58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e'
'3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27'
'2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905'
'5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0'
'164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd'
'351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc'
'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e'
'844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39'
'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447'
'7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb'
'1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117'
'504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff'
'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d'
'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242'
'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5'
'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a'
'83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831'
'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf'
'7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17'
'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2'
'29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d'
'0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76'
'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e'
'08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384'
'20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f'
'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a'
'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75'
'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec'
'65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173'
'178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0'
'704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@ -158,39 +160,33 @@ patch() {
prepare() {
cd "${srcdir}/${_pkgfqn}"
# Apply patches; further descriptions can be found in patch files itself
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
patch -p1 -i "$patch"
done
# Make sure the Qt5 build system uses our external ANGLE library
# make sure the Qt 5 build system uses our external ANGLE library
rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,GLES3,KHR}
# As well as our external PCRE library and zlib
# as well as our external PCRE library and zlib
rm -rf src/3rdparty/{pcre,zlib}
}
build() {
cd "${srcdir}/${_pkgfqn}"
# Do not set any flags here, flags are configured via mkspec
# Setting flags here is not appropriate as it does not allow to
# distinguish between flags for native compiler and cross compiler
# do not set any flags here, flags are configured via mkspec
# (Setting flags here is not appropriate as it does not allow to
# distinguish between flags for native compiler and cross compiler.)
unset CFLAGS
unset CXXFLAGS
unset LDFLAGS
unset PKG_CONFIG_PATH
for _arch in ${_architectures}; do
# 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 despite the use of
# pre-compile header
# (sloppiness must be set to pch_defines,time_macros in ccache config)
# define general configure arguments
local qt_configure_args="\
-xplatform mingw-w64-g++ \
-xplatform win32-g++ \
-optimized-qmake \
-verbose \
-opensource \
@ -229,18 +225,22 @@ build() {
-sysconfdir /usr/${_arch}/etc \
-translationdir /usr/${_arch}/share/qt/translations \
-device-option CROSS_COMPILE=${_arch}- \
-device-option CROSS_COMPILE_PREFIX=/usr/${_arch} \
-device-option CROSS_COMPILE_CFLAGS=-fpch-preprocess"
-device-option CROSS_COMPILE_PREFIX=/usr/${_arch}"
# Fix include directory of freetype2 and dbus
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2 dbus-1)"
# allows using ccache despite the use of pre-compile header (sloppiness must be set to pch_defines,time_macros in ccache config for this)
qt_configure_args+=' -device-option CROSS_COMPILE_CFLAGS=-fpch-preprocess'
# Enable debug build if MINGW_W64_QT_DEBUG_BUILD is set (in /etc/makepkg.config)
# add include directory of freetype2 and dbus manually (pkg-config detection in qmake doesn't work which is currently ignored via a patch)
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2 dbus-1 | sed -e "s/-I\/usr\/${_arch}\/include //g")"
# note: The sed is required to prevent -isystem /usr/${_arch}/include (qmake will turn -I into -isystem) which would lead to
# the same issue as here: https://github.com/Martchus/tageditor/issues/22#issuecomment-330899141
# enable debug build if MINGW_W64_QT_DEBUG_BUILD is set (could be set in eg. /etc/makepkg.config if debug build is wanted)
[[ $MINGW_W64_QT_DEBUG_BUILD ]] \
&& qt_configure_args+=' -debug-and-release' \
|| qt_configure_args+=' -release'
# Configure usage of ANGLE/OpenGL
# configure usage of ANGLE/OpenGL
if isOpenGL; then
msg2 'Using native OpenGL backend'
qt_configure_args+=' -opengl desktop'
@ -255,35 +255,38 @@ build() {
msg2 'Using ANGLE as OpenGL backend'
qt_configure_args+=' -angle'
fi
# GL_GLEXT_PROTOTYPES must be defined to enable declarations of GLES functions
# enable declarations of GLES functions
qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
fi
# Fix MariaDB
# add include directory of MariaDB
qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
msg2 'Configure and build qmake'
mkdir -p ../build-${_arch} && pushd ../build-${_arch}
if isStatic; then
export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
../${_pkgfqn}/configure \
$qt_configure_args \
-static \
-openssl-linked
msg2 'Build static Qt libraries'
make
qt_configure_args+=' -static'
# configure static version to use linked OpenSSL
qt_configure_args+=' -openssl-linked'
export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32 -ldnsapi -liphlpapi"
else
# The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this
../${_pkgfqn}/configure \
$qt_configure_args \
-shared \
-openssl-runtime \
-device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
msg2 'Build shared Qt libraries'
LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
qt_configure_args+=' -shared'
# configure shared version to load OpenSSL dynamically
qt_configure_args+=' -openssl-runtime'
qt_configure_args+=' -device-option CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
# override LD_LIBRARY_PATH so libraries for native build tools like libQt5Bootstrap.so are found
export LD_LIBRARY_PATH="$PWD/lib"
export LDFLAGS="-L$PWD/lib"
fi
msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args
msg2 'Build Qt libraries' && make
popd
done
}
@ -293,20 +296,20 @@ 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
# 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 {} +
find -iname '*.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 {} +
find -iname '*.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, ...)
# shared release for Qt5Bootstrap library and tools (qmake, uic, ...).
# Drop Qt5Bootstrap and libraries which are only provided as static lib
# and are hence already present in shared build (such as Qt5OpenGLExtensions)
# drop Qt5Bootstrap and libraries which are only provided as static lib
# and hence already present in shared build (such as Qt5OpenGLExtensions)
rm -f \
"${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
@ -319,9 +322,10 @@ package() {
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5ThemeSupport* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5OpenGLExtensions* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5PlatformSupport* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \
"${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \
# Also ensure config files don't conflict with shared version
# ensure config files don't conflict with shared version
pushd "${pkgdir}/usr/${_arch}/lib/cmake"
for cmake_dir in $(find . ! -path . -type d ! -name 'Static*'); do
mkdir -p "./Static${cmake_dir:2}";
@ -332,56 +336,59 @@ package() {
popd
rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/StaticQt5OpenGLExtensions.pc"
# Create links to static plugins in lib directory
# 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
# keep a couple pri files not found in base
mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}"
# Delete duplicate files that are in the base package
# delete duplicate files that are in the base package
rm -fR "${pkgdir}/usr/${_arch}/"{include,share}
rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs}
# Move pri files back
# move pri files back
mkdir -p "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules"
mv "${pkgdir}/usr/${_arch}/"*.pri "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules"
else # Shared release
# The .dll's are installed in both bindir and libdir, one copy of the .dll's is sufficient
else # shared version
# remove DLLs from libdir (DLLs are installed in both bindir and libdir, one copy is sufficient)
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
# The Qt5OpenGLExtensions module is only available as static library and hence part of the
# shared build
# Create symlinks for tools
# create symlinks for tools
mkdir -p "${pkgdir}/usr/bin"
for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do
ln -s "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-${tool}-qt5"
done
fi
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
# 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
# remove doc
rm -rf "${pkgdir}/usr/${_arch}/share/doc"
# Strip the binaries
# remove prl files for debug version
if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then
for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do
[ -f "${file%d*}${file##*d}" ] && rm "${file}";
done
fi
# replace library path in *.prl files so it points to the installed location and not the build directory
find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \;
# strip binaries, remove unuseful files
if ! isStatic; then
strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*[!.pl]
strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver}
fi
# Applications might be useful as well; keeping them by default will not hurt anybody I suppose
if isStatic || [[ $NO_EXECUTABLES ]]; then
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \;
find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete
else
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
fi
# No use for these files though
find "${pkgdir}/usr/${_arch}" \( -name "*.bat" -o -name "*.def" -o -name "*.exp" \) -exec rm {} \;
# Strip binaries
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.bat' -o -name '*.def' -o -name '*.exp' \) -delete
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;
done
}

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

@ -1,7 +1,7 @@
From ef02a56ff99e9c2352d1395b8deada3c3078887f Mon Sep 17 00:00:00 2001
From bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
mingw-w64
Adding a new, separate mkspec instead of patching the existing one
@ -13,35 +13,32 @@ Also see the following issues:
* https://github.com/Martchus/PKGBUILDs/issues/59
* https://github.com/Martchus/PKGBUILDs/issues/60
---
mkspecs/win32-g++/qmake.conf | 56 +++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 19 deletions(-)
mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++---------
mkspecs/win32-clang-g++/qmake.conf | 4 +--
mkspecs/win32-g++/qmake.conf | 4 +--
3 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 9f366e08b8..848837e732 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -1,11 +1,13 @@
#
-# qmake configuration for win32-g++
+# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++
#
-# Written for MinGW-w64 / gcc 5.3 or higher
+# Written for cross compilation with mingw-w64 under GNU/Linux
#
# Cross compile example for i686-w64-mingw32-g++:
-# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
+# configure -xplatform mingw-w64-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index 610503379d..f099380cca 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -8,22 +8,31 @@
# Compiler-specific settings go into win32-g++/qmake.conf and
# win32-clang-g++/qmake.conf
#
+# The device options CROSS_COMPILE_CUSTOM_CONFIG and CROSS_COMPILE_CFLAGS can be used
+# to specify custom config/flags for cross compilation.
+#
load(device_config)
include(../common/gcc-base.conf)
@@ -14,12 +16,11 @@ include(../common/angle.conf)
include(../common/windows-vulkan.conf)
include(gcc-base.conf)
include(g++-base.conf)
+include(angle.conf)
+include(windows-vulkan.conf)
+
# modifications to gcc-base.conf and g++-base.conf
-
MAKEFILE_GENERATOR = MINGW
QMAKE_PLATFORM = win32 mingw
-CONFIG += debug_and_release debug_and_release_target precompile_header
@ -49,20 +46,18 @@ index 9f366e08b8..848837e732 100644
-QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32
+CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG}
+DEFINES += UNICODE _UNICODE
+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
+QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32
# can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
# x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC,
# 'QMAKE_TARGET.arch' is inherently unavailable.
@@ -29,7 +30,7 @@ QMAKE_LEX = flex
+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h)
+DEFINES += __INTRINSIC_DEFINED__xgetbv
+
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = bison -y
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS += -fno-keep-inline-dllexport
+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CFLAGS_SSE2 += -mstackrealign
@@ -40,6 +41,7 @@ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign
QMAKE_CXXFLAGS_RTTI_ON = -frtti
QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
@ -70,10 +65,10 @@ index 9f366e08b8..848837e732 100644
QMAKE_INCDIR =
@@ -50,40 +52,56 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_LINK = $${CROSS_COMPILE}g++
QMAKE_LINK_C = $${CROSS_COMPILE}gcc
+QMAKE_LFLAGS = -g
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-QMAKE_LFLAGS_RELEASE = -Wl,-s
@ -97,20 +92,22 @@ index 9f366e08b8..848837e732 100644
QMAKE_EXTENSION_STATICLIB = a
-QMAKE_LIB_EXTENSIONS = a dll.a
+QMAKE_EXTENSION_IMPORTLIB = dll.a
+
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
QMAKE_LIBS =
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+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)
+ $$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)
+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) \
+ -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+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
@ -133,11 +130,45 @@ index 9f366e08b8..848837e732 100644
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
QMAKE_NM = $${CROSS_COMPILE}nm -P
-
-include(angle.conf)
-include(windows-vulkan.conf)
diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf
index 4630ec4602..4981a28736 100644
--- a/mkspecs/win32-clang-g++/qmake.conf
+++ b/mkspecs/win32-clang-g++/qmake.conf
@@ -14,11 +14,11 @@ include(../common/g++-win32.conf)
QMAKE_COMPILER += clang llvm # clang pretends to be gcc
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
load(qt_config)
QMAKE_CC = $${CROSS_COMPILE}clang
-QMAKE_CFLAGS +=
+QMAKE_CFLAGS += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra -Wno-ignored-attributes
QMAKE_CXX = $${CROSS_COMPILE}clang++
-QMAKE_CXXFLAGS +=
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS}
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_LINK = $${CROSS_COMPILE}clang++
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index ed131c6823..b77d86cd6b 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
# modifications to g++-win32.conf
QMAKE_CC = $${CROSS_COMPILE}gcc
-QMAKE_CFLAGS += -fno-keep-inline-dllexport
+QMAKE_CFLAGS += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CXX = $${CROSS_COMPILE}g++
-QMAKE_CXXFLAGS += -fno-keep-inline-dllexport
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS}
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_LINK = $${CROSS_COMPILE}g++
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From f499d198b99ae5338ab85f7b65bf3dbcf9fba263 Mon Sep 17 00:00:00 2001
From 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
FIXME: Not sure whether this is still required
---
@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
1 file changed, 2 deletions(-)
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 0a5de2c9af..35798a2a28 100644
index 1a43f13d9b..a4c954a453 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -56,9 +56,7 @@
@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From f8025a3fcae7623f8e54299e0842ca45a71fb28d Mon Sep 17 00:00:00 2001
From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/32] Use external ANGLE library
Subject: [PATCH 03/33] Use external ANGLE library
---
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f8cec00b82..d09c9fd49c 100644
index 759d6f3cbf..1ddcf1db78 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@ -54,10 +54,10 @@ index f8cec00b82..d09c9fd49c 100644
include(accessible/accessible.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 742be61a50..5fef69fd3f 100644
index 8b2349ff2f..f5e43c6adc 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
@@ -10,6 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
qtConfig(opengl): CONFIG += opengl
qtConfig(opengles2): CONFIG += opengles2
@ -66,7 +66,7 @@ index 742be61a50..5fef69fd3f 100644
HEADERS += qgl.h \
qgl_p.h \
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
index b7790a66e3..046fe34a06 100644
index f4c396f7c5..fc87e810aa 100644
--- a/src/plugins/platforms/windows/windows.pri
+++ b/src/plugins/platforms/windows/windows.pri
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@ -78,10 +78,10 @@ index b7790a66e3..046fe34a06 100644
mingw: LIBS *= -luuid
# For the dialog helpers:
diff --git a/src/src.pro b/src/src.pro
index a73729a760..32d9f8502a 100644
index 1f7c5d99c1..24e24ef7f1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -180,10 +180,6 @@ qtConfig(gui) {
@@ -189,10 +189,6 @@ qtConfig(gui) {
SUBDIRS += src_3rdparty_harfbuzzng
src_gui.depends += src_3rdparty_harfbuzzng
}
@ -93,5 +93,5 @@ index a73729a760..32d9f8502a 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From da616cd666c43e0189c1998ba827e5da9c189b04 Mon Sep 17 00:00:00 2001
From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/32] Fix too many sections assemler error in OpenGL factory
Subject: [PATCH 04/33] 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 855124059e1ce75c1815a16056bfc7e91705ff93 Mon Sep 17 00:00:00 2001
From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/32] Make sure *.pc files are installed correctly
Subject: [PATCH 05/33] 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.16.2
2.17.0

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

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

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

@ -1,7 +1,7 @@
From 70e8d38009cc5321680ef727ac160316e20161a6 Mon Sep 17 00:00:00 2001
From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/32] Prevent debug library names in pkg-config files
Subject: [PATCH 07/33] 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3ee91c980962788177b41fb49eed40bf74ccf745 Mon Sep 17 00:00:00 2001
From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/32] Fix linking against shared/static libpng
Subject: [PATCH 08/33] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index dab66fafb4..bc501bd3fc 100644
index 219385a108..d629a45b92 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -291,7 +291,8 @@
@ -23,5 +23,5 @@ index dab66fafb4..bc501bd3fc 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From b136f177a24e438a2069c4f9c1d9b3a05db17b5c Mon Sep 17 00:00:00 2001
From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/32] Fix linking against static D-Bus
Subject: [PATCH 09/33] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@ -9,10 +9,10 @@ Subject: [PATCH 09/32] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index a6f3ed66a9..803abf38bb 100644
index ae2aa22070..baa99a3da9 100644
--- a/configure.json
+++ b/configure.json
@@ -171,18 +171,23 @@
@@ -172,18 +172,23 @@
"CONFIG(debug, debug|release): \\",
" LIBS += $$LIBS_DEBUG",
"else: \\",
@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
# include <dbus/dbus.h>
#else
--
2.16.2
2.17.0

10
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 4376a9888da599de6eaa14d1dcf83a0fe41193aa Mon Sep 17 00:00:00 2001
From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/32] Don't try to use debug version of D-Bus library
Subject: [PATCH 10/33] 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 803abf38bb..7e0b7ffb56 100644
index baa99a3da9..dfb8835ecb 100644
--- a/configure.json
+++ b/configure.json
@@ -184,7 +184,7 @@
@@ -185,7 +185,7 @@
{
"libs": "",
"builds": {
@ -25,5 +25,5 @@ index 803abf38bb..7e0b7ffb56 100644
},
"condition": "config.win32 && features.shared"
--
2.16.2
2.17.0

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

@ -1,14 +1,14 @@
From f622ed99d6d99283d7405cb0a96757c9e4922558 Mon Sep 17 00:00:00 2001
From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/32] Fix linking against static freetype2
Subject: [PATCH 11/33] 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 bc501bd3fc..f7a4a39fd4 100644
index d629a45b92..afa3d95f39 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -158,8 +158,11 @@
@ -26,5 +26,5 @@ index bc501bd3fc..f7a4a39fd4 100644
},
"fontconfig": {
--
2.16.2
2.17.0

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

@ -1,14 +1,14 @@
From 9a75cec77d9dfff3d283258b9b323819b9f820ca Mon Sep 17 00:00:00 2001
From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/32] Fix linking against static harfbuzz
Subject: [PATCH 12/33] 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 f7a4a39fd4..5ff8449509 100644
index afa3d95f39..a2b0a00d09 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -218,7 +218,11 @@
@ -25,5 +25,5 @@ index f7a4a39fd4..5ff8449509 100644
},
"imf": {
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From a9af38f04a32f596a168e066cb6d32f82a7154b4 Mon Sep 17 00:00:00 2001
From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/32] Fix linking against static pcre
Subject: [PATCH 13/33] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@ -9,10 +9,10 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index 86bc99716d..5037ae68a1 100644
index 13eff07c04..ea747244da 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -55,6 +55,10 @@
@@ -53,6 +53,10 @@
#include <QtCore/qdatastream.h>
#define PCRE2_CODE_UNIT_WIDTH 16
@ -24,5 +24,5 @@ index 86bc99716d..5037ae68a1 100644
#include <pcre2.h>
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3696e3f38362a701f0f59d3de35c7e0d0cb882ce Mon Sep 17 00:00:00 2001
From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/32] Fix linking against shared/static MariaDB
Subject: [PATCH 14/33] 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.16.2
2.17.0

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

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

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

@ -1,21 +1,34 @@
From d659c5369bd8059643edd4674d21e5b575c95b8e Mon Sep 17 00:00:00 2001
From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/32] Rename qtmain to qt5main
Subject: [PATCH 16/33] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
mkspecs/common/g++-win32.conf | 2 +-
mkspecs/features/create_cmake.prf | 4 ++--
mkspecs/features/win32/windows.prf | 2 +-
mkspecs/win32-g++/qmake.conf | 2 +-
src/winmain/winmain.pro | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index f099380cca..44c211d176 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index bb5083c925..146e83ae67 100644
index 66acedef55..5d553d9ca6 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -225,8 +225,8 @@ mac {
@@ -227,8 +227,8 @@ mac {
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
mingw {
@ -39,19 +52,6 @@ index ecb167bf18..7c9368c3b3 100644
!contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
QMAKE_LIBS += -L$$QT.core.libs
CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 848837e732..ad924a7c2a 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -88,7 +88,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index 4140ae48de..9ae73db74b 100644
--- a/src/winmain/winmain.pro
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 64298314d16b0d4f60a868dff2c379af982b821d Mon Sep 17 00:00:00 2001
From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/32] Build dynamic host libraries
Subject: [PATCH 17/33] 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 e6a0d97f1a..c07c1adc8b 100644
index f8729de947..db23f4ad1d 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 293c66efcd36c6ca5850d91847f0030c182aa336 Mon Sep 17 00:00:00 2001
From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/32] Enable rpath for build tools
Subject: [PATCH 18/33] 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.16.2
2.17.0

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

@ -1,17 +1,17 @@
From 3351283ce62c1d728d245657aa9a81d5e8c43def Mon Sep 17 00:00:00 2001
From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/32] Use system zlib for build tools
Subject: [PATCH 19/33] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 042ad7adb9..7e3bc3977a 100644
index a45382106a..17b9828581 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -132,7 +132,7 @@ macx {
@@ -133,7 +133,7 @@ macx {
../../corelib/io/qstandardpaths_win.cpp
}
@ -21,5 +21,5 @@ index 042ad7adb9..7e3bc3977a 100644
} else {
CONFIG += no_core_dep
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 380f8da75e9bfac1a2542d1ddd61949fb58022d3 Mon Sep 17 00:00:00 2001
From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 20/32] Use *.dll.a as import lib extension
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@ -11,10 +11,10 @@ mingw-w64 specific mkspec
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 146e83ae67..15fc070008 100644
index 5d553d9ca6..3e5ec55dae 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -236,8 +236,9 @@ mac {
@@ -238,8 +238,9 @@ mac {
CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
} else {
@ -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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 4c3092a30e8981125414d71fa481436ea4f917f5 Mon Sep 17 00:00:00 2001
From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 21/32] Merge shared and static library trees
Subject: [PATCH 21/33] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
index ea482552c4..9da756fb3a 100644
index 0512ef0144..c3ce522e4f 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1225,3 +1225,12 @@ defineTest(createConfigStatus) {
@@ -1249,3 +1249,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -30,7 +30,7 @@ index ea482552c4..9da756fb3a 100644
+ CONFIG += no_smart_library_merge
+}
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 7e027325bd..ad0db62b78 100644
index 9eba5bcf00..0f8d03eb2c 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
2.16.2
2.17.0

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

@ -1,22 +1,22 @@
From 9913c74ba93c506abaa5f13e02ac29e6cd82783d Mon Sep 17 00:00:00 2001
From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 22/32] Pull dependencies of static libraries in CMake modules
Subject: [PATCH 22/33] 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
the final application.
---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++++-----
.../features/data/cmake/Qt5PluginTarget.cmake.in | 11 +-
qmake/generators/makefile.cpp | 16 ++-
.../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++----
.../data/cmake/Qt5PluginTarget.cmake.in | 11 +-
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
index 27f4c277d6..358945b758 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -55,35 +55,52 @@ but not all the files it references.
@@ -49,35 +49,52 @@ but not all the files it references.
endmacro()
!!IF !equals(TEMPLATE, aux)
@ -77,7 +77,7 @@ index 55c74aad66..b401db5ac2 100644
)
endif()
!!ENDIF
@@ -227,13 +244,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_STATIC_TYPE)
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -126,7 +126,7 @@ index 55c74aad66..b401db5ac2 100644
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
@@ -245,6 +296,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -235,6 +286,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
@ -183,7 +183,7 @@ index 55c74aad66..b401db5ac2 100644
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
@@ -336,9 +437,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -325,9 +426,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@ -197,7 +197,7 @@ index 55c74aad66..b401db5ac2 100644
!!ENDIF // CMAKE_RELEASE_TYPE
!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
@@ -349,29 +452,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -338,29 +441,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
!!ENDIF // TEMPLATE != aux
@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644
}
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3955f9513c3c34351462b7c868da8b0650043393 Mon Sep 17 00:00:00 2001
From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 23/32] Allow usage of static version with CMake
Subject: [PATCH 23/33] Allow usage of static version with CMake
Allow selecting between dynamic and static Qt versions
installed in the same prefix
@ -11,18 +11,18 @@ installed in the same prefix
- Set USE_STATIC_QT_BY_DEFAULT to use static version
via regular find_package(Qt5Core)
---
mkspecs/features/create_cmake.prf | 103 ++++---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++++-------
.../features/data/cmake/Qt5PluginTarget.cmake.in | 18 +-
.../data/cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
src/corelib/Qt5CoreConfigExtras.cmake.in | 26 +-
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
7 files changed, 314 insertions(+), 152 deletions(-)
mkspecs/features/create_cmake.prf | 103 +++---
.../data/cmake/Qt5BasicConfig.cmake.in | 298 ++++++++++++------
.../data/cmake/Qt5PluginTarget.cmake.in | 18 +-
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
7 files changed, 313 insertions(+), 151 deletions(-)
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 15fc070008..13bd362092 100644
index 3e5ec55dae..b6c47124cc 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -38,7 +38,7 @@ split_incpath {
@ -34,7 +34,7 @@ index 15fc070008..13bd362092 100644
!build_pass:QMAKE_SUBSTITUTES += \
cmake_extra_source_includes
@@ -90,6 +90,8 @@ win32:!static:!staticlib {
@@ -92,6 +92,8 @@ win32:!static:!staticlib {
}
static|staticlib:CMAKE_STATIC_TYPE = true
@ -43,7 +43,7 @@ index 15fc070008..13bd362092 100644
CMAKE_DEBUG_TYPE =
CMAKE_RELEASE_TYPE =
@@ -135,17 +137,19 @@ contains(CONFIG, plugin) {
@@ -137,17 +139,19 @@ contains(CONFIG, plugin) {
CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
win32 {
@ -67,7 +67,7 @@ index 15fc070008..13bd362092 100644
mac {
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
else: CMAKE_PlUGIN_EXT = .a
@@ -161,13 +165,13 @@ contains(CONFIG, plugin) {
@@ -163,13 +167,13 @@ contains(CONFIG, plugin) {
}
}
cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -83,7 +83,7 @@ index 15fc070008..13bd362092 100644
INSTALLS += cmake_qt5_plugin_file
return()
@@ -180,27 +184,36 @@ mod_deps =
@@ -182,27 +186,36 @@ mod_deps =
lib_deps =
aux_mod_deps =
aux_lib_deps =
@ -124,7 +124,7 @@ index 15fc070008..13bd362092 100644
!isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
@@ -228,35 +241,33 @@ mac {
@@ -230,35 +243,33 @@ mac {
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
@ -179,7 +179,7 @@ index 15fc070008..13bd362092 100644
!isEmpty(CMAKE_STATIC_TYPE) {
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
@@ -276,12 +287,12 @@ mac {
@@ -278,12 +289,12 @@ mac {
INSTALLS += cmake_qt5_module_files
cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -194,7 +194,7 @@ index 15fc070008..13bd362092 100644
!build_pass:QMAKE_SUBSTITUTES += \
cmake_config_file \
@@ -291,11 +302,29 @@ cmake_qt5_module_files.files = \
@@ -293,11 +304,29 @@ cmake_qt5_module_files.files = \
$$cmake_config_file.output \
$$cmake_config_version_file.output
@ -225,7 +225,7 @@ index 15fc070008..13bd362092 100644
!build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
@@ -307,7 +336,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
@@ -309,7 +338,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
exists($$cmake_macros_file.input) {
CMAKE_MODULE_MACROS = "true"
@ -234,7 +234,7 @@ index 15fc070008..13bd362092 100644
cmake_macros_file.CONFIG = verbatim
!build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
@@ -315,7 +344,7 @@ exists($$cmake_macros_file.input) {
@@ -317,7 +346,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@ -244,12 +244,12 @@ index 15fc070008..13bd362092 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index b401db5ac2..e6dd749c9e 100644
index 358945b758..d123edf665 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -9,6 +9,33 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
endif()
!!ENDIF
+!!IF isEmpty(CMAKE_STATIC_TYPE)
+# "redirect" to static package overriding variant prefix so it does not contain "Static" anymore
@ -281,7 +281,7 @@ index b401db5ac2..e6dd749c9e 100644
!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -35,15 +62,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -29,15 +56,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
!!IF !equals(TEMPLATE, aux)
# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
@ -307,7 +307,7 @@ index b401db5ac2..e6dd749c9e 100644
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
@@ -54,23 +85,60 @@ but not all the files it references.
@@ -48,23 +79,60 @@ but not all the files it references.
endif()
endmacro()
@ -371,7 +371,7 @@ index b401db5ac2..e6dd749c9e 100644
\"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
\"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
!!IF !isEmpty(CMAKE_LIB_SONAME)
@@ -80,7 +148,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
\"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
)
!!ELSE
@ -380,7 +380,7 @@ index b401db5ac2..e6dd749c9e 100644
\"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
\"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
!!IF !isEmpty(CMAKE_LIB_SONAME)
@@ -97,9 +165,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
!!ELSE
set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
@ -395,7 +395,7 @@ index b401db5ac2..e6dd749c9e 100644
\"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
)
endif()
@@ -107,8 +179,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
endmacro()
!!ENDIF
@ -406,7 +406,7 @@ index b401db5ac2..e6dd749c9e 100644
!!IF !no_module_headers
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -116,46 +189,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
)
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@ -474,7 +474,7 @@ index b401db5ac2..e6dd749c9e 100644
endforeach()
!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
@@ -164,16 +241,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
if (NOT _check_private STREQUAL -1)
foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -498,8 +498,8 @@ index b401db5ac2..e6dd749c9e 100644
!!ENDIF // TEMPLATE != aux
set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
@@ -183,10 +264,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
!!ENDIF
- set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -511,7 +511,7 @@ index b401db5ac2..e6dd749c9e 100644
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
@@ -194,17 +275,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@ -533,7 +533,7 @@ index b401db5ac2..e6dd749c9e 100644
$$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
@@ -212,28 +293,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
endif()
@ -577,8 +577,7 @@ index b401db5ac2..e6dd749c9e 100644
+!!ENDIF
!!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
@@ -242,8 +327,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
!!ENDIF
!!IF !isEmpty(CMAKE_STATIC_TYPE)
@ -590,7 +589,7 @@ index b401db5ac2..e6dd749c9e 100644
macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
if (EXISTS \"${PRL_FILE_LOCATION}\")
file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
@@ -267,34 +353,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -257,34 +343,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endmacro()
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@ -646,7 +645,7 @@ index b401db5ac2..e6dd749c9e 100644
# Find plugin targets
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
@@ -308,7 +405,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -298,7 +395,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
endif()
@ -658,7 +657,7 @@ index b401db5ac2..e6dd749c9e 100644
set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
@@ -316,7 +417,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -306,7 +407,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
!!ENDIF
@ -670,7 +669,7 @@ index b401db5ac2..e6dd749c9e 100644
set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
\"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
)
@@ -347,7 +452,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -337,16 +442,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -679,10 +678,9 @@ index b401db5ac2..e6dd749c9e 100644
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST FALSE)
endif()
@@ -355,9 +460,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST)
- add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
- INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
@ -692,7 +690,7 @@ index b401db5ac2..e6dd749c9e 100644
)
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
@@ -365,66 +470,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -354,66 +459,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
endif()
endforeach()
@ -783,7 +781,7 @@ index b401db5ac2..e6dd749c9e 100644
if (EXISTS
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
@@ -437,7 +544,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -426,7 +533,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@ -792,7 +790,7 @@ index b401db5ac2..e6dd749c9e 100644
endif()
!!ENDIF // CMAKE_STATIC_TYPE
@@ -447,19 +554,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -436,19 +543,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ENDIF // CMAKE_DEBUG_TYPE
!!ELSE // TEMPLATE != aux
@ -870,7 +868,7 @@ index 0000000000..0091940fd2
+set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}")
+
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index 545b9a3d1e..ebe6644dfe 100644
index e0652fdcf9..f0add757bb 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,4 +1,6 @@
@ -902,19 +900,16 @@ index 545b9a3d1e..ebe6644dfe 100644
set(_qt5_corelib_extra_includes)
# Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
@@ -81,9 +83,9 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
if (CMAKE_VERSION VERSION_LESS 2.8.12
AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\"
OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
- set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
+ set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
else()
- set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
+ set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
endif()
@@ -78,7 +80,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
# Applications now need to be compiled with the -fPIC option if the Qt option
# \"reduce relocations\" is active. For backward compatibility only, Qt accepts
# the use of -fPIE for GCC 4.x versions.
-set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
+set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
# Applications using qmake or cmake >= 2.8.12 as their build system will
@@ -103,7 +105,7 @@ endif()
# TODO Qt6: Remove
set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
@@ -86,7 +88,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
!!IF !isEmpty(QT_NAMESPACE)
list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
@ -923,7 +918,7 @@ index 545b9a3d1e..ebe6644dfe 100644
!!ENDIF
!!IF !isEmpty(CMAKE_DISABLED_FEATURES)
@@ -112,9 +114,9 @@ set(Qt5_DISABLED_FEATURES
@@ -95,9 +97,9 @@ set(Qt5_DISABLED_FEATURES
)
!!ENDIF
@ -935,7 +930,7 @@ index 545b9a3d1e..ebe6644dfe 100644
!!IF qtConfig(reduce_exports)
set(QT_VISIBILITY_AVAILABLE \"True\")
@@ -162,14 +164,14 @@ if (NOT TARGET Qt5::WinMain)
@@ -145,14 +147,14 @@ if (NOT TARGET Qt5::WinMain)
set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
@ -997,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 716349466294e9809c92303becf2fede7745f9fd Mon Sep 17 00:00:00 2001
From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 24/32] Adjust linker flags for static build with
Subject: [PATCH 24/33] Adjust linker flags for static build with
cmake/mingw-w64
Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
@ -10,10 +10,10 @@ Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d
1 file changed, 7 insertions(+)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index ebe6644dfe..687d611b3f 100644
index f0add757bb..5328da2e80 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -190,3 +190,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
@@ -173,3 +173,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
_qt5_Core_check_file_exists(${_Qt5CTestMacros})
@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644
+unset(_isExe)
+!!ENDIF
--
2.16.2
2.17.0

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

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

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

@ -1,7 +1,7 @@
From b0cbcf49f288bc4e87c055b757505f745423c686 Mon Sep 17 00:00:00 2001
From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 26/32] Fix macro invoking moc, rcc and uic
Subject: [PATCH 26/33] 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 8d3dbe3ecf..f0f0d69309 100644
index 1627de4002..ed0f6555a7 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 8d3dbe3ecf..f0f0d69309 100644
DEPENDS ${infile} ${moc_depends}
${_moc_working_dir}
VERBATIM)
@@ -254,8 +255,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target )
set(rc_depends ${rc_depends} ${_rc_depends})
endforeach()
@ -43,7 +43,7 @@ index 8d3dbe3ecf..f0f0d69309 100644
ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
add_custom_target(${target} ALL DEPENDS ${rcc_destination})
@@ -287,8 +289,9 @@ function(QT5_ADD_RESOURCES outfiles )
@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles )
_QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 43051c0832825089e058715e126baefa9071bc2d Mon Sep 17 00:00:00 2001
From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 27/32] Ignore errors about missing feature static
Subject: [PATCH 27/33] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 76e1d15319..9a1c5cd8b6 100644
index 021036e4f9..16e8aa631d 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -138,5 +138,5 @@ defineTest(qtConfig) {
@@ -140,5 +140,5 @@ defineTest(qtConfig) {
contains(QT.$${module}.disabled_features, $$1): \
return(false)
}
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 64a634598092a7cbeca267f3dc0860a3105ed329 Mon Sep 17 00:00:00 2001
From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 28/32] Enable and fix use of iconv
Subject: [PATCH 28/33] Enable and fix use of iconv
Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
---
@ -24,7 +24,7 @@ index fe4b87b923..be4236436f 100644
size_t inbytes, outbytes;
iconv(x, &inp, &inbytes, &outp, &outbytes);
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index d6362b6fbc..4da4546a24 100644
index 330eb7c038..88a782b863 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -49,7 +49,6 @@ QT_REQUIRE_CONFIG(iconv);
@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644
#else
char **inBytesPtr = &inBytes;
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 8cd73d6ce4..dd259157e3 100644
index 5e48024def..15e7372dcb 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -521,9 +521,9 @@
@@ -539,9 +539,9 @@
},
"gnu-libiconv": {
"label": "GNU iconv",
@ -79,5 +79,5 @@ index 8cd73d6ce4..dd259157e3 100644
},
"icu": {
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 9d139e94af7e18e965732684864d75ac1ee015f2 Mon Sep 17 00:00:00 2001
From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 29/32] Ignore failing pkg-config test
Subject: [PATCH 29/33] Ignore failing pkg-config test
Didn't investigate why it fails, let's hope for the best
---
@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
index 7e0b7ffb56..0f098e7b3f 100644
index dfb8835ecb..f9735f59cd 100644
--- a/configure.json
+++ b/configure.json
@@ -725,7 +725,6 @@
@@ -597,7 +597,6 @@
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
@ -21,5 +21,5 @@ index 7e0b7ffb56..0f098e7b3f 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From d360972109bd354d675499efc4e00ee9ed8da3c9 Mon Sep 17 00:00:00 2001
From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 30/32] Prevent qmake from messing static lib dependencies
Subject: [PATCH 30/33] 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.16.2
2.17.0

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

@ -1,19 +1,19 @@
From 28f289f8b87da3bd244f8c63ead918f0922a4358 Mon Sep 17 00:00:00 2001
From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 31/32] Hardcode linker flags for platform plugins
Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
Otherwise incorrect order of libs leads to errors
when building libqminimal.dll, libqoffscreen.dll
and libqwindows.dll
---
src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++--
src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++--
src/plugins/platforms/windows/windows.pro | 32 +++++++++++++++++++--------
src/plugins/platforms/minimal/minimal.pro | 15 +++++++--
src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++--
src/plugins/platforms/windows/windows.pro | 32 +++++++++++++------
3 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 8cfb68824e..46834a71fc 100644
index a1a2da547b..7ef91b574d 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,8 +1,19 @@
@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644
include(windows.pri)
--
2.16.2
2.17.0

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

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

49
qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch Normal file
View File

@ -0,0 +1,49 @@
From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 26 May 2018 03:47:14 +0200
Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise it fails to compile src/corelib/global/qrandom.cpp:
```
during RTL pass: ira
/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp: In function ‘qsizetype qt_random_cpu(void*, qsizetype)’:
/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp:121:1: internal compiler error: in ix86_compute_frame_layout, at config/i386/i386.c:11693
}
```
---
src/corelib/global/qrandom.cpp | 2 +-
src/corelib/global/qrandom_p.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
index ebf9864b15..2fb04ab12a 100644
--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
@@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
QT_BEGIN_NAMESPACE
-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND)
static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW;
# ifdef Q_PROCESSOR_X86_64
diff --git a/src/corelib/global/qrandom_p.h b/src/corelib/global/qrandom_p.h
index 917a91098e..c770a3e19b 100644
--- a/src/corelib/global/qrandom_p.h
+++ b/src/corelib/global/qrandom_p.h
@@ -81,7 +81,7 @@ enum { qt_randomdevice_control = 0 };
inline bool qt_has_hwrng()
{
-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND)
+#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND)
return qCpuHasFeature(RDRND);
#else
return false;
--
2.17.0

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

@ -36,8 +36,8 @@ isNoOpenGL() {
}
pkgname=mingw-w64-qt5-base-dynamic
pkgver=5.10.1
pkgrel=2
pkgver=5.11.0
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')
@ -83,40 +83,42 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'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'
'1c482310bbfef78733a2013f42e505657059e720cf139ddcf5ad692c4dbf06b1'
'45a1020a351931b7171e55ef8165d2cc4af3bf2473b142daa51f3b5b15c447f3'
'ceb05dabed9fa2fc781e5abcfb54285960267922bac753df4179831a240da9b7'
'c4138094696342f8f976c01c9ce66919ae38802f36d3280b47883446e8d74bf9'
'2f99ae05056636b434bf7a533db6de7561c6f6e3fe8e854b4e9a182e30c684b3'
'fa69c484d557f45b1929e0b4be6328837717337155477a8fab3f9ea59731c749'
'57de459c6af72293560afcf7a872b1a4b10badd986c1fc1b43d7aaf55caf52c5'
'58e6f6a0271e82be5b7560a247cb70809169148e6413c473e2c3fed97e5d1c45'
'ea39d2b90a848a4c36a7685688283b773ff2ed5e6912be52a943f31376eefc81'
'b8f5a6a707f20cce64d9e5f04c35c555d7d14cd20344510205babc9a5698a15a'
'b1eaea87c7d7b774657feb4745450ab4e423c158ff81c144d724dcd8ac950c6f'
'8092fe23e35906b9a967ec78e1892769f06f1699c4c177ea0814876fb7c423d2'
'4b73f19e254466e5e4d13459088f773a44c9f05033ad5d29995c5116f18f999d'
'6a1411e406efab5521af71b2b8cf122c8443157114799f23d3e2cd1dc59c8e14'
'52b0fc09f05d1ca2efbf3a046cf933e72dae4bfd63026298fd60360103106c5a'
'30b5bded4f2e3ac5e4c83412c92afe0ad604e3eb18a94a3357f220b5e0456d86'
'1a18636d6089fe49ae7e0592dad6d71a1466aa0fc2d033ca926c14e468aff0c9'
'9710090523aefca66211bd8b74bcdc650125299912b735ba4845408e9e860649'
'551f05ad17737fe8b9b00c24a3a5539988455cbb706458e44c3df2df56599f63'
'd2f5aaacd2be586cfab27a23120a9f21749c1ac96664071c399f91097274ec89'
'23878d79148e4db9e1c5ba2e6e6d2ced259b64aa1ba2f1503ab9938863b2104f'
'30f5b6c738609a8ac03f806b86a632c3cf6d85b56e038f812d46358b592cc427'
'2782b7eb4f55cb5905b5bcb8387ad3a7130727b036b0fc482b1294380862f5d1'
'156e720e4ad44f257019dbe2fe1eef7b7a27989307f8a9f53072f4cbe178c655'
'53088ce6f9a22ee1735fb8b7145ce569ac1914ac05fb947ca3afae39d3cb3199'
'e61f2fd0c91c72822c1074844897641ce1c9500423b4c646aa8ae1671f9f967b'
'cccad985154167818657d0561ec349cb75931a0a64a689ab51041337d73a88b8'
'ffbc7f20785904ba64f108498aafe8b5a4c1de76c44aa5353ee3d7202f186408'
'1572c30c43e9e6d23d0f42c99c9501f092eae5d2bad2b0bc0eb694b295c0c473'
'ef96dffc0dd3bb76b237c6e886d6d5cc154e25f5ed4d5f65643e272a58306327'
'73d9df72df2f55c19ddeb9241de818d39c8da3399eee55f306889dc3c11dc934'
'892bb35a340597c77da5310685cc47102cf2522fb01cbc6d1785016babc78727')
'0032-Fix-linking-against-static-plugins-with-qmake.patch'
'0033-Disable-hardware-randomizer-for-32-bit.patch')
sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66'
'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3'
'29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2'
'58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e'
'3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27'
'2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905'
'5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0'
'164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd'
'351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc'
'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e'
'844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39'
'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447'
'7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb'
'1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117'
'504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff'
'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d'
'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242'
'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5'
'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a'
'83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831'
'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf'
'7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17'
'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2'
'29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d'
'0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76'
'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e'
'08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384'
'20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f'
'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a'
'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75'
'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec'
'65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173'
'178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0'
'704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@ -158,39 +160,33 @@ patch() {
prepare() {
cd "${srcdir}/${_pkgfqn}"
# Apply patches; further descriptions can be found in patch files itself
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
patch -p1 -i "$patch"
done
# Make sure the Qt5 build system uses our external ANGLE library
# make sure the Qt 5 build system uses our external ANGLE library
rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,GLES3,KHR}
# As well as our external PCRE library and zlib
# as well as our external PCRE library and zlib
rm -rf src/3rdparty/{pcre,zlib}
}
build() {
cd "${srcdir}/${_pkgfqn}"
# Do not set any flags here, flags are configured via mkspec
# Setting flags here is not appropriate as it does not allow to
# distinguish between flags for native compiler and cross compiler
# do not set any flags here, flags are configured via mkspec
# (Setting flags here is not appropriate as it does not allow to
# distinguish between flags for native compiler and cross compiler.)
unset CFLAGS
unset CXXFLAGS
unset LDFLAGS
unset PKG_CONFIG_PATH
for _arch in ${_architectures}; do
# 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 despite the use of
# pre-compile header
# (sloppiness must be set to pch_defines,time_macros in ccache config)
# define general configure arguments
local qt_configure_args="\
-xplatform mingw-w64-g++ \
-xplatform win32-g++ \
-optimized-qmake \
-verbose \
-opensource \
@ -229,18 +225,22 @@ build() {
-sysconfdir /usr/${_arch}/etc \
-translationdir /usr/${_arch}/share/qt/translations \
-device-option CROSS_COMPILE=${_arch}- \
-device-option CROSS_COMPILE_PREFIX=/usr/${_arch} \
-device-option CROSS_COMPILE_CFLAGS=-fpch-preprocess"
-device-option CROSS_COMPILE_PREFIX=/usr/${_arch}"
# Fix include directory of freetype2 and dbus
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2 dbus-1)"
# allows using ccache despite the use of pre-compile header (sloppiness must be set to pch_defines,time_macros in ccache config for this)
qt_configure_args+=' -device-option CROSS_COMPILE_CFLAGS=-fpch-preprocess'
# Enable debug build if MINGW_W64_QT_DEBUG_BUILD is set (in /etc/makepkg.config)
# add include directory of freetype2 and dbus manually (pkg-config detection in qmake doesn't work which is currently ignored via a patch)
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2 dbus-1 | sed -e "s/-I\/usr\/${_arch}\/include //g")"
# note: The sed is required to prevent -isystem /usr/${_arch}/include (qmake will turn -I into -isystem) which would lead to
# the same issue as here: https://github.com/Martchus/tageditor/issues/22#issuecomment-330899141
# enable debug build if MINGW_W64_QT_DEBUG_BUILD is set (could be set in eg. /etc/makepkg.config if debug build is wanted)
[[ $MINGW_W64_QT_DEBUG_BUILD ]] \
&& qt_configure_args+=' -debug-and-release' \
|| qt_configure_args+=' -release'
# Configure usage of ANGLE/OpenGL
# configure usage of ANGLE/OpenGL
if isOpenGL; then
msg2 'Using native OpenGL backend'
qt_configure_args+=' -opengl desktop'
@ -255,35 +255,38 @@ build() {
msg2 'Using ANGLE as OpenGL backend'
qt_configure_args+=' -angle'
fi
# GL_GLEXT_PROTOTYPES must be defined to enable declarations of GLES functions
# enable declarations of GLES functions
qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
fi
# Fix MariaDB
# add include directory of MariaDB
qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
msg2 'Configure and build qmake'
mkdir -p ../build-${_arch} && pushd ../build-${_arch}
if isStatic; then
export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32"
../${_pkgfqn}/configure \
$qt_configure_args \
-static \
-openssl-linked
msg2 'Build static Qt libraries'
make
qt_configure_args+=' -static'
# configure static version to use linked OpenSSL
qt_configure_args+=' -openssl-linked'
export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32 -ldnsapi -liphlpapi"
else
# The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this
../${_pkgfqn}/configure \
$qt_configure_args \
-shared \
-openssl-runtime \
-device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
msg2 'Build shared Qt libraries'
LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make
qt_configure_args+=' -shared'
# configure shared version to load OpenSSL dynamically
qt_configure_args+=' -openssl-runtime'
qt_configure_args+=' -device-option CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
# override LD_LIBRARY_PATH so libraries for native build tools like libQt5Bootstrap.so are found
export LD_LIBRARY_PATH="$PWD/lib"
export LDFLAGS="-L$PWD/lib"
fi
msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args
msg2 'Build Qt libraries' && make
popd
done
}
@ -293,20 +296,20 @@ 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
# 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 {} +
find -iname '*.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 {} +
find -iname '*.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, ...)
# shared release for Qt5Bootstrap library and tools (qmake, uic, ...).
# Drop Qt5Bootstrap and libraries which are only provided as static lib
# and are hence already present in shared build (such as Qt5OpenGLExtensions)
# drop Qt5Bootstrap and libraries which are only provided as static lib
# and hence already present in shared build (such as Qt5OpenGLExtensions)
rm -f \
"${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
@ -319,9 +322,10 @@ package() {
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5ThemeSupport* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5OpenGLExtensions* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5PlatformSupport* \
"${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \
"${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \
# Also ensure config files don't conflict with shared version
# ensure config files don't conflict with shared version
pushd "${pkgdir}/usr/${_arch}/lib/cmake"
for cmake_dir in $(find . ! -path . -type d ! -name 'Static*'); do
mkdir -p "./Static${cmake_dir:2}";
@ -332,56 +336,59 @@ package() {
popd
rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/StaticQt5OpenGLExtensions.pc"
# Create links to static plugins in lib directory
# 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
# keep a couple pri files not found in base
mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}"
# Delete duplicate files that are in the base package
# delete duplicate files that are in the base package
rm -fR "${pkgdir}/usr/${_arch}/"{include,share}
rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs}
# Move pri files back
# move pri files back
mkdir -p "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules"
mv "${pkgdir}/usr/${_arch}/"*.pri "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules"
else # Shared release
# The .dll's are installed in both bindir and libdir, one copy of the .dll's is sufficient
else # shared version
# remove DLLs from libdir (DLLs are installed in both bindir and libdir, one copy is sufficient)
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
# The Qt5OpenGLExtensions module is only available as static library and hence part of the
# shared build
# Create symlinks for tools
# create symlinks for tools
mkdir -p "${pkgdir}/usr/bin"
for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do
ln -s "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-${tool}-qt5"
done
fi
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
# 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
# remove doc
rm -rf "${pkgdir}/usr/${_arch}/share/doc"
# Strip the binaries
# remove prl files for debug version
if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then
for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do
[ -f "${file%d*}${file##*d}" ] && rm "${file}";
done
fi
# replace library path in *.prl files so it points to the installed location and not the build directory
find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \;
# strip binaries, remove unuseful files
if ! isStatic; then
strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*[!.pl]
strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver}
fi
# Applications might be useful as well; keeping them by default will not hurt anybody I suppose
if isStatic || [[ $NO_EXECUTABLES ]]; then
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \;
find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete
else
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
fi
# No use for these files though
find "${pkgdir}/usr/${_arch}" \( -name "*.bat" -o -name "*.def" -o -name "*.exp" \) -exec rm {} \;
# Strip binaries
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.bat' -o -name '*.def' -o -name '*.exp' \) -delete
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;
done
}

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

@ -1,7 +1,7 @@
From ef02a56ff99e9c2352d1395b8deada3c3078887f Mon Sep 17 00:00:00 2001
From bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
mingw-w64
Adding a new, separate mkspec instead of patching the existing one
@ -13,35 +13,32 @@ Also see the following issues:
* https://github.com/Martchus/PKGBUILDs/issues/59
* https://github.com/Martchus/PKGBUILDs/issues/60
---
mkspecs/win32-g++/qmake.conf | 56 +++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 19 deletions(-)
mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++---------
mkspecs/win32-clang-g++/qmake.conf | 4 +--
mkspecs/win32-g++/qmake.conf | 4 +--
3 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 9f366e08b8..848837e732 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -1,11 +1,13 @@
#
-# qmake configuration for win32-g++
+# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++
#
-# Written for MinGW-w64 / gcc 5.3 or higher
+# Written for cross compilation with mingw-w64 under GNU/Linux
#
# Cross compile example for i686-w64-mingw32-g++:
-# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
+# configure -xplatform mingw-w64-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index 610503379d..f099380cca 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -8,22 +8,31 @@
# Compiler-specific settings go into win32-g++/qmake.conf and
# win32-clang-g++/qmake.conf
#
+# The device options CROSS_COMPILE_CUSTOM_CONFIG and CROSS_COMPILE_CFLAGS can be used
+# to specify custom config/flags for cross compilation.
+#
load(device_config)
include(../common/gcc-base.conf)
@@ -14,12 +16,11 @@ include(../common/angle.conf)
include(../common/windows-vulkan.conf)
include(gcc-base.conf)
include(g++-base.conf)
+include(angle.conf)
+include(windows-vulkan.conf)
+
# modifications to gcc-base.conf and g++-base.conf
-
MAKEFILE_GENERATOR = MINGW
QMAKE_PLATFORM = win32 mingw
-CONFIG += debug_and_release debug_and_release_target precompile_header
@ -49,20 +46,18 @@ index 9f366e08b8..848837e732 100644
-QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32
+CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG}
+DEFINES += UNICODE _UNICODE
+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
+QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32
# can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
# x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC,
# 'QMAKE_TARGET.arch' is inherently unavailable.
@@ -29,7 +30,7 @@ QMAKE_LEX = flex
+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h)
+DEFINES += __INTRINSIC_DEFINED__xgetbv
+
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = bison -y
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS += -fno-keep-inline-dllexport
+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CFLAGS_SSE2 += -mstackrealign
@@ -40,6 +41,7 @@ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign
QMAKE_CXXFLAGS_RTTI_ON = -frtti
QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
@ -70,10 +65,10 @@ index 9f366e08b8..848837e732 100644
QMAKE_INCDIR =
@@ -50,40 +52,56 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_LINK = $${CROSS_COMPILE}g++
QMAKE_LINK_C = $${CROSS_COMPILE}gcc
+QMAKE_LFLAGS = -g
QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-QMAKE_LFLAGS_RELEASE = -Wl,-s
@ -97,20 +92,22 @@ index 9f366e08b8..848837e732 100644
QMAKE_EXTENSION_STATICLIB = a
-QMAKE_LIB_EXTENSIONS = a dll.a
+QMAKE_EXTENSION_IMPORTLIB = dll.a
+
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
QMAKE_LIBS =
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+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)
+ $$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)
+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \
+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2)
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) \
+ -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi
+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
@ -133,11 +130,45 @@ index 9f366e08b8..848837e732 100644
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
QMAKE_NM = $${CROSS_COMPILE}nm -P
-
-include(angle.conf)
-include(windows-vulkan.conf)
diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf
index 4630ec4602..4981a28736 100644
--- a/mkspecs/win32-clang-g++/qmake.conf
+++ b/mkspecs/win32-clang-g++/qmake.conf
@@ -14,11 +14,11 @@ include(../common/g++-win32.conf)
QMAKE_COMPILER += clang llvm # clang pretends to be gcc
+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+
load(qt_config)
QMAKE_CC = $${CROSS_COMPILE}clang
-QMAKE_CFLAGS +=
+QMAKE_CFLAGS += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra -Wno-ignored-attributes
QMAKE_CXX = $${CROSS_COMPILE}clang++
-QMAKE_CXXFLAGS +=
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS}
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_LINK = $${CROSS_COMPILE}clang++
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index ed131c6823..b77d86cd6b 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
# modifications to g++-win32.conf
QMAKE_CC = $${CROSS_COMPILE}gcc
-QMAKE_CFLAGS += -fno-keep-inline-dllexport
+QMAKE_CFLAGS += -g -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CXX = $${CROSS_COMPILE}g++
-QMAKE_CXXFLAGS += -fno-keep-inline-dllexport
+QMAKE_CXXFLAGS += $${QMAKE_CFLAGS}
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_LINK = $${CROSS_COMPILE}g++
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From f499d198b99ae5338ab85f7b65bf3dbcf9fba263 Mon Sep 17 00:00:00 2001
From 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
FIXME: Not sure whether this is still required
---
@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
1 file changed, 2 deletions(-)
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 0a5de2c9af..35798a2a28 100644
index 1a43f13d9b..a4c954a453 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -56,9 +56,7 @@
@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From f8025a3fcae7623f8e54299e0842ca45a71fb28d Mon Sep 17 00:00:00 2001
From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:41:38 +0200
Subject: [PATCH 03/32] Use external ANGLE library
Subject: [PATCH 03/33] Use external ANGLE library
---
src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++--
@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f8cec00b82..d09c9fd49c 100644
index 759d6f3cbf..1ddcf1db78 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@ -54,10 +54,10 @@ index f8cec00b82..d09c9fd49c 100644
include(accessible/accessible.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 742be61a50..5fef69fd3f 100644
index 8b2349ff2f..f5e43c6adc 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,6 +11,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
@@ -10,6 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
qtConfig(opengl): CONFIG += opengl
qtConfig(opengles2): CONFIG += opengles2
@ -66,7 +66,7 @@ index 742be61a50..5fef69fd3f 100644
HEADERS += qgl.h \
qgl_p.h \
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
index b7790a66e3..046fe34a06 100644
index f4c396f7c5..fc87e810aa 100644
--- a/src/plugins/platforms/windows/windows.pri
+++ b/src/plugins/platforms/windows/windows.pri
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@ -78,10 +78,10 @@ index b7790a66e3..046fe34a06 100644
mingw: LIBS *= -luuid
# For the dialog helpers:
diff --git a/src/src.pro b/src/src.pro
index a73729a760..32d9f8502a 100644
index 1f7c5d99c1..24e24ef7f1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -180,10 +180,6 @@ qtConfig(gui) {
@@ -189,10 +189,6 @@ qtConfig(gui) {
SUBDIRS += src_3rdparty_harfbuzzng
src_gui.depends += src_3rdparty_harfbuzzng
}
@ -93,5 +93,5 @@ index a73729a760..32d9f8502a 100644
SUBDIRS += src_3rdparty_libpng
src_3rdparty_freetype.depends += src_3rdparty_libpng
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From da616cd666c43e0189c1998ba827e5da9c189b04 Mon Sep 17 00:00:00 2001
From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 04/32] Fix too many sections assemler error in OpenGL factory
Subject: [PATCH 04/33] 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 855124059e1ce75c1815a16056bfc7e91705ff93 Mon Sep 17 00:00:00 2001
From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 05/32] Make sure *.pc files are installed correctly
Subject: [PATCH 05/33] 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.16.2
2.17.0

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

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

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

@ -1,7 +1,7 @@
From 70e8d38009cc5321680ef727ac160316e20161a6 Mon Sep 17 00:00:00 2001
From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 07/32] Prevent debug library names in pkg-config files
Subject: [PATCH 07/33] 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3ee91c980962788177b41fb49eed40bf74ccf745 Mon Sep 17 00:00:00 2001
From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 08/32] Fix linking against shared/static libpng
Subject: [PATCH 08/33] Fix linking against shared/static libpng
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index dab66fafb4..bc501bd3fc 100644
index 219385a108..d629a45b92 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -291,7 +291,8 @@
@ -23,5 +23,5 @@ index dab66fafb4..bc501bd3fc 100644
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From b136f177a24e438a2069c4f9c1d9b3a05db17b5c Mon Sep 17 00:00:00 2001
From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 09/32] Fix linking against static D-Bus
Subject: [PATCH 09/33] Fix linking against static D-Bus
---
configure.json | 9 +++++++--
@ -9,10 +9,10 @@ Subject: [PATCH 09/32] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
index a6f3ed66a9..803abf38bb 100644
index ae2aa22070..baa99a3da9 100644
--- a/configure.json
+++ b/configure.json
@@ -171,18 +171,23 @@
@@ -172,18 +172,23 @@
"CONFIG(debug, debug|release): \\",
" LIBS += $$LIBS_DEBUG",
"else: \\",
@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
# include <dbus/dbus.h>
#else
--
2.16.2
2.17.0

10
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 4376a9888da599de6eaa14d1dcf83a0fe41193aa Mon Sep 17 00:00:00 2001
From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 10/32] Don't try to use debug version of D-Bus library
Subject: [PATCH 10/33] 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
index 803abf38bb..7e0b7ffb56 100644
index baa99a3da9..dfb8835ecb 100644
--- a/configure.json
+++ b/configure.json
@@ -184,7 +184,7 @@
@@ -185,7 +185,7 @@
{
"libs": "",
"builds": {
@ -25,5 +25,5 @@ index 803abf38bb..7e0b7ffb56 100644
},
"condition": "config.win32 && features.shared"
--
2.16.2
2.17.0

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

@ -1,14 +1,14 @@
From f622ed99d6d99283d7405cb0a96757c9e4922558 Mon Sep 17 00:00:00 2001
From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 11/32] Fix linking against static freetype2
Subject: [PATCH 11/33] 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 bc501bd3fc..f7a4a39fd4 100644
index d629a45b92..afa3d95f39 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -158,8 +158,11 @@
@ -26,5 +26,5 @@ index bc501bd3fc..f7a4a39fd4 100644
},
"fontconfig": {
--
2.16.2
2.17.0

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

@ -1,14 +1,14 @@
From 9a75cec77d9dfff3d283258b9b323819b9f820ca Mon Sep 17 00:00:00 2001
From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 12/32] Fix linking against static harfbuzz
Subject: [PATCH 12/33] 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 f7a4a39fd4..5ff8449509 100644
index afa3d95f39..a2b0a00d09 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -218,7 +218,11 @@
@ -25,5 +25,5 @@ index f7a4a39fd4..5ff8449509 100644
},
"imf": {
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From a9af38f04a32f596a168e066cb6d32f82a7154b4 Mon Sep 17 00:00:00 2001
From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 13/32] Fix linking against static pcre
Subject: [PATCH 13/33] Fix linking against static pcre
Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
---
@ -9,10 +9,10 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index 86bc99716d..5037ae68a1 100644
index 13eff07c04..ea747244da 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -55,6 +55,10 @@
@@ -53,6 +53,10 @@
#include <QtCore/qdatastream.h>
#define PCRE2_CODE_UNIT_WIDTH 16
@ -24,5 +24,5 @@ index 86bc99716d..5037ae68a1 100644
#include <pcre2.h>
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 3696e3f38362a701f0f59d3de35c7e0d0cb882ce Mon Sep 17 00:00:00 2001
From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/32] Fix linking against shared/static MariaDB
Subject: [PATCH 14/33] 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.16.2
2.17.0

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

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

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

@ -1,21 +1,34 @@
From d659c5369bd8059643edd4674d21e5b575c95b8e Mon Sep 17 00:00:00 2001
From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 16/32] Rename qtmain to qt5main
Subject: [PATCH 16/33] Rename qtmain to qt5main
Prevents conflict with mingw-w64-qt4 package
---
mkspecs/common/g++-win32.conf | 2 +-
mkspecs/features/create_cmake.prf | 4 ++--
mkspecs/features/win32/windows.prf | 2 +-
mkspecs/win32-g++/qmake.conf | 2 +-
src/winmain/winmain.pro | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index f099380cca..44c211d176 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index bb5083c925..146e83ae67 100644
index 66acedef55..5d553d9ca6 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -225,8 +225,8 @@ mac {
@@ -227,8 +227,8 @@ mac {
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
mingw {
@ -39,19 +52,6 @@ index ecb167bf18..7c9368c3b3 100644
!contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
QMAKE_LIBS += -L$$QT.core.libs
CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 848837e732..ad924a7c2a 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -88,7 +88,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index 4140ae48de..9ae73db74b 100644
--- a/src/winmain/winmain.pro
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
CONFIG += static
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 64298314d16b0d4f60a868dff2c379af982b821d Mon Sep 17 00:00:00 2001
From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:27:28 +0200
Subject: [PATCH 17/32] Build dynamic host libraries
Subject: [PATCH 17/33] 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 e6a0d97f1a..c07c1adc8b 100644
index f8729de947..db23f4ad1d 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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 293c66efcd36c6ca5850d91847f0030c182aa336 Mon Sep 17 00:00:00 2001
From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 18/32] Enable rpath for build tools
Subject: [PATCH 18/33] 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.16.2
2.17.0

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

@ -1,17 +1,17 @@
From 3351283ce62c1d728d245657aa9a81d5e8c43def Mon Sep 17 00:00:00 2001
From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 19/32] Use system zlib for build tools
Subject: [PATCH 19/33] Use system zlib for build tools
---
src/tools/bootstrap/bootstrap.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 042ad7adb9..7e3bc3977a 100644
index a45382106a..17b9828581 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -132,7 +132,7 @@ macx {
@@ -133,7 +133,7 @@ macx {
../../corelib/io/qstandardpaths_win.cpp
}
@ -21,5 +21,5 @@ index 042ad7adb9..7e3bc3977a 100644
} else {
CONFIG += no_core_dep
--
2.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 380f8da75e9bfac1a2542d1ddd61949fb58022d3 Mon Sep 17 00:00:00 2001
From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 20/32] Use *.dll.a as import lib extension
Subject: [PATCH 20/33] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@ -11,10 +11,10 @@ mingw-w64 specific mkspec
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 146e83ae67..15fc070008 100644
index 5d553d9ca6..3e5ec55dae 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -236,8 +236,9 @@ mac {
@@ -238,8 +238,9 @@ mac {
CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
} else {
@ -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.16.2
2.17.0

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

@ -1,7 +1,7 @@
From 4c3092a30e8981125414d71fa481436ea4f917f5 Mon Sep 17 00:00:00 2001
From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 21/32] Merge shared and static library trees
Subject: [PATCH 21/33] Merge shared and static library trees
Allow installation of shared and static build in the same prefix
---
@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix
5 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/configure.pri b/configure.pri
index ea482552c4..9da756fb3a 100644
index 0512ef0144..c3ce522e4f 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1225,3 +1225,12 @@ defineTest(createConfigStatus) {
@@ -1249,3 +1249,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@ -30,7 +30,7 @@ index ea482552c4..9da756fb3a 100644
+ CONFIG += no_smart_library_merge
+}
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 7e027325bd..ad0db62b78 100644
index 9eba5bcf00..0f8d03eb2c 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644
t << endl;
--
2.16.2
2.17.0

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

@ -1,22 +1,22 @@
From 9913c74ba93c506abaa5f13e02ac29e6cd82783d Mon Sep 17 00:00:00 2001
From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 22/32] Pull dependencies of static libraries in CMake modules
Subject: [PATCH 22/33] 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
the final application.
---
.../features/data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++++-----
.../features/data/cmake/Qt5PluginTarget.cmake.in | 11 +-
qmake/generators/makefile.cpp | 16 ++-
.../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++----
.../data/cmake/Qt5PluginTarget.cmake.in | 11 +-
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
index 27f4c277d6..358945b758 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -55,35 +55,52 @@ but not all the files it references.
@@ -49,35 +49,52 @@ but not all the files it references.
endmacro()
!!IF !equals(TEMPLATE, aux)
@ -77,7 +77,7 @@ index 55c74aad66..b401db5ac2 100644
)
endif()
!!ENDIF
@@ -227,13 +244,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !isEmpty(CMAKE_STATIC_TYPE)
add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -126,7 +126,7 @@ index 55c74aad66..b401db5ac2 100644
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
@@ -245,6 +296,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -235,6 +286,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
@ -183,7 +183,7 @@ index 55c74aad66..b401db5ac2 100644
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
@@ -336,9 +437,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -325,9 +426,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@ -197,7 +197,7 @@ index 55c74aad66..b401db5ac2 100644
!!ENDIF // CMAKE_RELEASE_TYPE
!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
@@ -349,29 +452,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -338,29 +441,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
!!ENDIF // TEMPLATE != aux
@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644
}
--
2.16.2
2.17.0

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