Update mingw-w64-qt5-* to 5.6.1

This commit is contained in:
Martchus 2016-06-14 23:48:54 +02:00
parent f4b8cb6bde
commit 81da051776
44 changed files with 260 additions and 206 deletions

128
devel/qt5/5.6.1/md5sums.txt Normal file
View File

@ -0,0 +1,128 @@
52b1fddceac7158a28d9e91e6370cb82 qt3d-opensource-src-5.6.1.7z
a9c67caab7354dc3b9e754ae8a6a32ef qt3d-opensource-src-5.6.1.tar.gz
8227248e5800be8d684a2700fca143e6 qt3d-opensource-src-5.6.1.tar.xz
31f9c2a8340493d33c9e1e4d06bf40a2 qt3d-opensource-src-5.6.1.zip
142a23c934e65ee5b3a18e117e5530c1 qtactiveqt-opensource-src-5.6.1.7z
df0b7416d774cb19197252e5535a6f31 qtactiveqt-opensource-src-5.6.1.tar.gz
f3d32afadb76c55d1f0ebf9182579307 qtactiveqt-opensource-src-5.6.1.tar.xz
9e56f6fa31f40a61945411268f029bec qtactiveqt-opensource-src-5.6.1.zip
237301004ca512a04db5741377c71be7 qtandroidextras-opensource-src-5.6.1.7z
369bcd93edd5d566f3d0a92bf886c9b2 qtandroidextras-opensource-src-5.6.1.tar.gz
503343cc4307b98d39bccaf44a67bfd8 qtandroidextras-opensource-src-5.6.1.tar.xz
0142192bafe82a2c34ae44bcaf8064e1 qtandroidextras-opensource-src-5.6.1.zip
66c26ec0a732ab0258dd59d6ad8d0ba4 qtbase-opensource-src-5.6.1.7z
3c26259e72c6e56f0a4a2512276325be qtbase-opensource-src-5.6.1.tar.gz
b23232190a3df61fe1ba81636987b036 qtbase-opensource-src-5.6.1.tar.xz
ce3c5acfd2db257f6f38685270782068 qtbase-opensource-src-5.6.1.zip
5185405e80c0800d3e264e296e3e401d qtcanvas3d-opensource-src-5.6.1.7z
3681ab014024514f6da700d0213eb812 qtcanvas3d-opensource-src-5.6.1.tar.gz
4116b1b78d373441f1eae47526347f59 qtcanvas3d-opensource-src-5.6.1.tar.xz
6dd24413e24f1edd9f9b44b97350a1ca qtcanvas3d-opensource-src-5.6.1.zip
4d0fe53f57c05da1a48239b1295d1c6d qtconnectivity-opensource-src-5.6.1.7z
e02b7e1598709de3820c28bd9c5a9fd4 qtconnectivity-opensource-src-5.6.1.tar.gz
ad7b5e4e4c033c9d5adcd7a5c83b2007 qtconnectivity-opensource-src-5.6.1.tar.xz
4a8a8200e199e9c2ba39d4e59d5c93fb qtconnectivity-opensource-src-5.6.1.zip
f5c76ec7390331ce03a288e8ce8a5297 qtdeclarative-opensource-src-5.6.1.7z
b01d9caa7fe5546def06c2c1333f228f qtdeclarative-opensource-src-5.6.1.tar.gz
ea2a2602b8a91f2618a36be09bcd79e9 qtdeclarative-opensource-src-5.6.1.tar.xz
38f1d6a97905796c9598e14188af04f6 qtdeclarative-opensource-src-5.6.1.zip
8ae5b4e89c981d83702c77d0886f69ef qtdeclarative-render2d-opensource-src-5.6.1.7z
970ea50de53dce12afbf12a308ad842e qtdeclarative-render2d-opensource-src-5.6.1.tar.gz
5d9d6c3272f2e3cd0163aa1d5cfd528d qtdeclarative-render2d-opensource-src-5.6.1.tar.xz
b26b5299a840cfd128c6272df58152ef qtdeclarative-render2d-opensource-src-5.6.1.zip
f3c6ade66af9caaf9fc73b14fdfc9f99 qtdoc-opensource-src-5.6.1.7z
39615dda8df600cf5acd713c1cc705c2 qtdoc-opensource-src-5.6.1.tar.gz
f9fe0fe272bd37b0ffd9f280242d46f7 qtdoc-opensource-src-5.6.1.tar.xz
1c1760b641b8bc8f031ae7ef44df094a qtdoc-opensource-src-5.6.1.zip
1caf45d17713fc0fbb3368d30fc0a013 qtenginio-opensource-src-1.6.1.7z
8e7f57ea42a977344ffb210567fc3125 qtenginio-opensource-src-1.6.1.tar.gz
f5e8a89653355c2f34462468dbf1b05d qtenginio-opensource-src-1.6.1.tar.xz
2e08c2bd31cbf677b0afd36db971d5b8 qtenginio-opensource-src-1.6.1.zip
66a13fbd4c066182a297ac47a0f81fad qtgraphicaleffects-opensource-src-5.6.1.7z
71fb0765330c0d5a108ac9986662b184 qtgraphicaleffects-opensource-src-5.6.1.tar.gz
e4f164b3df516d07bc8e7534a5c72b3d qtgraphicaleffects-opensource-src-5.6.1.tar.xz
4147712bcae48753e24ff51e55d662ed qtgraphicaleffects-opensource-src-5.6.1.zip
8a701ac85104105c6bd49b8b86beb537 qtimageformats-opensource-src-5.6.1.7z
6aa248635ef2d21b24293ae1420813da qtimageformats-opensource-src-5.6.1.tar.gz
3c96ea81db49132eaa4e0d9c9a9db0c2 qtimageformats-opensource-src-5.6.1.tar.xz
b22b5c1c1e48bf10a4bd95b75894347c qtimageformats-opensource-src-5.6.1.zip
90361f347f067026b35ece9d4c205a73 qtlocation-opensource-src-5.6.1.7z
decb079cedcfe56dcd0f64008ef82301 qtlocation-opensource-src-5.6.1.tar.gz
e985bfe7bd544bc7bb44221440f6eaa3 qtlocation-opensource-src-5.6.1.tar.xz
f8e9ba76e7e48a9a21574f1d8eb2c9ee qtlocation-opensource-src-5.6.1.zip
33025648427c663b447de77afe42d016 qtmacextras-opensource-src-5.6.1.7z
64435c2c332b9352a8977d421a1d4dd8 qtmacextras-opensource-src-5.6.1.tar.gz
07c0b4454efd26f2ee9e9622bdf3b3cc qtmacextras-opensource-src-5.6.1.tar.xz
2fcb07709111be6877b159ffc5251fa0 qtmacextras-opensource-src-5.6.1.zip
574568ead1024c22b86b2fc4aa9e72e4 qtmultimedia-opensource-src-5.6.1.7z
9a2ef44a1af73b41e7b2446a2646dcdc qtmultimedia-opensource-src-5.6.1.tar.gz
01e90a2ba304625305170f04cf3e6704 qtmultimedia-opensource-src-5.6.1.tar.xz
fc61200495b077258781c348e5b4b451 qtmultimedia-opensource-src-5.6.1.zip
dad6af4cfdd66d01e464428f3a3b8911 qtquickcontrols2-opensource-src-5.6.1.7z
f681964924a30ed0a3fbd34e0411e77b qtquickcontrols2-opensource-src-5.6.1.tar.gz
b1603c22d51ed5fcc0b896217e40d55b qtquickcontrols2-opensource-src-5.6.1.tar.xz
2e36f50cb3375cab75680fcc2f1264c9 qtquickcontrols2-opensource-src-5.6.1.zip
2af195d2257bd90f142722037b8b5c0e qtquickcontrols-opensource-src-5.6.1.7z
f30e5e4092e4bb49cdec8186577c4370 qtquickcontrols-opensource-src-5.6.1.tar.gz
77717d2f252ae93d5e81fa35b3f0588f qtquickcontrols-opensource-src-5.6.1.tar.xz
066adddb4c2af0c4e6f705abb6ec74ab qtquickcontrols-opensource-src-5.6.1.zip
c977bad35756dccf8743f39825bddcd2 qtscript-opensource-src-5.6.1.7z
43e03c5e88c4410cb8fcfd937f8b8da7 qtscript-opensource-src-5.6.1.tar.gz
631d38f242295dd026541c31d15e3bae qtscript-opensource-src-5.6.1.tar.xz
de00c049711005abf787e6a28409a235 qtscript-opensource-src-5.6.1.zip
f73244dbd73a9825e11c15e627a6f38a qtsensors-opensource-src-5.6.1.7z
d33d444fad8c9997888b495bb44582af qtsensors-opensource-src-5.6.1.tar.gz
1042d90aaab147f854a47697a0ac3419 qtsensors-opensource-src-5.6.1.tar.xz
58da764732ce7bc9f106754ad8f3fc79 qtsensors-opensource-src-5.6.1.zip
82d6d1a0ed02e3683243336a6e1b2539 qtserialbus-opensource-src-5.6.1.7z
394c9cc2bef8d1f83ede039102ef8212 qtserialbus-opensource-src-5.6.1.tar.gz
76b4de84206f3bf7be5f235bd0359959 qtserialbus-opensource-src-5.6.1.tar.xz
423c7e99863f374d4ed15275baa1924b qtserialbus-opensource-src-5.6.1.zip
f7f9f73315bcfea18c7ec20b88ed934e qtserialport-opensource-src-5.6.1.7z
dd57b6953efc578e9c0316c272d5cad8 qtserialport-opensource-src-5.6.1.tar.gz
19d5492f56440398ecea78e8f854433f qtserialport-opensource-src-5.6.1.tar.xz
2bc156530f7e3b672e3247eb01abb6ad qtserialport-opensource-src-5.6.1.zip
d61e10d038531dd22b3db801c1dda4bd qtsvg-opensource-src-5.6.1.7z
247643c4b6cbb6b91b343227d0fa9b44 qtsvg-opensource-src-5.6.1.tar.gz
745d43d334a52a8f27995e37d29fca64 qtsvg-opensource-src-5.6.1.tar.xz
db7c94eb96cf0297318d125d7c364856 qtsvg-opensource-src-5.6.1.zip
c9e152b810b0dbadd909f36c04b3fcc5 qttools-opensource-src-5.6.1.7z
97184bd19261a651fff5183eda25a2ac qttools-opensource-src-5.6.1.tar.gz
bf2cea01e94140524a3fc58c2f2ddebc qttools-opensource-src-5.6.1.tar.xz
23d0671f051e0f991263275fa82e46b4 qttools-opensource-src-5.6.1.zip
f9d7b74c5a7abfd0c5894b5b0cd8fb4a qttranslations-opensource-src-5.6.1.7z
b1ecb94e3e26da199f34f4b291e8bd31 qttranslations-opensource-src-5.6.1.tar.gz
cd589f8a334b3e7ad933babf64ed496e qttranslations-opensource-src-5.6.1.tar.xz
b4176e6e1bf2c4fe4948d095b9d21bc4 qttranslations-opensource-src-5.6.1.zip
0dd49fe5528f13258341952c2028e480 qtwayland-opensource-src-5.6.1.7z
781222b05edb6aeb016533e6f96cd7ae qtwayland-opensource-src-5.6.1.tar.gz
5b7654c9a909eb0de6c41796f16915ca qtwayland-opensource-src-5.6.1.tar.xz
0d233715d0e83bfaa3f0302af4551f05 qtwayland-opensource-src-5.6.1.zip
c6683a29c74776a911ddf30338c14d10 qtwebchannel-opensource-src-5.6.1.7z
f63c997d218e576d4ef40dd716ca6102 qtwebchannel-opensource-src-5.6.1.tar.gz
beb03f280b0b58744713d309f1ceb542 qtwebchannel-opensource-src-5.6.1.tar.xz
1f3c5bd0970ef609c7dc9ef55337761a qtwebchannel-opensource-src-5.6.1.zip
11ab254079ac92664b8e2c1391a8bc78 qtwebengine-opensource-src-5.6.1.7z
b0b3852a92df846c648a22f8944b8e18 qtwebengine-opensource-src-5.6.1.tar.gz
35f168743638b07157e20af0586f39a2 qtwebengine-opensource-src-5.6.1.tar.xz
f504ee2e49f1cedcd8ae17418c8f9a70 qtwebengine-opensource-src-5.6.1.zip
dc60abe24dfa03728fb3b7350d49821d qtwebsockets-opensource-src-5.6.1.7z
a7aa157207a450788b0d01e0386b40fd qtwebsockets-opensource-src-5.6.1.tar.gz
338c3aaf50c174949e3f262ce0c95ff2 qtwebsockets-opensource-src-5.6.1.tar.xz
6617288bad765ddb6be0b6b6e781164b qtwebsockets-opensource-src-5.6.1.zip
15b82caa17da4d320a760f406267ae29 qtwebview-opensource-src-5.6.1.7z
ae85c4d37fe2ecda537e5a8840afff9f qtwebview-opensource-src-5.6.1.tar.gz
96108364143ba69a2d54688ee93a9c43 qtwebview-opensource-src-5.6.1.tar.xz
633856f24f7e8642d967bbd460993bd2 qtwebview-opensource-src-5.6.1.zip
03156c4e27c1960d8138d2310c267588 qtwinextras-opensource-src-5.6.1.7z
bdd781d7b27a8bc27a87c95b76f1d09d qtwinextras-opensource-src-5.6.1.tar.gz
d5ec1fa22195ba0a38ac758787c5595d qtwinextras-opensource-src-5.6.1.tar.xz
b6d17c755dcead6a8f150c99665fb12a qtwinextras-opensource-src-5.6.1.zip
f05dbb83ba97d2402453c6da5fb7bc1f qtx11extras-opensource-src-5.6.1.7z
74f0d8d18556b4f32a5a64ad56bee063 qtx11extras-opensource-src-5.6.1.tar.gz
90ef24c5b949d58f6a39000ede8afc94 qtx11extras-opensource-src-5.6.1.tar.xz
380d31c0d44759679ae91cb014bcd413 qtx11extras-opensource-src-5.6.1.zip
5aa85bd208dc2e89d3074edd7f245e59 qtxmlpatterns-opensource-src-5.6.1.7z
d244080a1f786ecae8b3109d6b7035d5 qtxmlpatterns-opensource-src-5.6.1.tar.gz
f069a704ca16a701a130070f00bca645 qtxmlpatterns-opensource-src-5.6.1.tar.xz
ffee423a01ef582d6beb7ef98497d814 qtxmlpatterns-opensource-src-5.6.1.zip

View File

@ -0,0 +1,4 @@
d332fc64d115eb20b92ab9e9b33d94c6 qtwebkit-opensource-src-5.6.1.7z
8cbb331d64c7fb2628a3afa7fe0dd1ba qtwebkit-opensource-src-5.6.1.tar.gz
9ea7cb557375ba2fc7c62742c522d093 qtwebkit-opensource-src-5.6.1.tar.xz
78f476f8168c28628f8cce0cbce61a3d qtwebkit-opensource-src-5.6.1.zip

View File

@ -6,7 +6,7 @@
_qt_module=qt3d
pkgname="mingw-w64-qt5-3d"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@ -17,7 +17,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('fba04c921d53fc3ec6794e2a2a75ca60')
md5sums=('8227248e5800be8d684a2700fca143e6')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -6,9 +6,9 @@
_qt_module=qtactiveqt
pkgname=mingw-w64-qt5-activeqt
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=(any)
arch=('any')
pkgdesc="ActiveX integration framework (mingw-w64)"
depends=(mingw-w64-qt5-base)
makedepends=(mingw-w64-{gcc,headers,crt,winpthreads} python)
@ -21,7 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
"qt5-activeqt-fix-compilation.patch"
"qtactiveqt-fix-build.patch"
"qtactiveqt-win64.patch")
md5sums=('791e40d20fed235b42029aa54d6f0634'
md5sums=('f3d32afadb76c55d1f0ebf9182579307'
'86c63b9808b0c8c7a8c2203bee73c42b'
'7a7ba436452aa56613b3fbb15684e094'
'1264d0274586aec14f96a978b416b048')

View File

@ -16,9 +16,9 @@ isOpenGL() {
}
pkgname=mingw-w64-qt5-base-opengl
pkgver=5.6.0
pkgrel=4
pkgdesc="A cross-platform application and UI framework (mingw-w64, OpenGL)"
pkgver=5.6.1
pkgrel=1
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
! isStatic && arch=('i686' 'x86_64')
isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
url="https://www.qt.io/"
@ -62,12 +62,11 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
"qt5-use-system-zlib-in-host-libs.patch"
"fix-opengl-to-many-sections.patch"
"fix-static-psql-mysql.patch"
"qt5-fix-QSemaphore-problem.patch"
"qtbase-1-fixes.patch"
"qt5-fix-implib-ext.patch")
md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
md5sums=('b23232190a3df61fe1ba81636987b036'
'bab00ccc19d888997f323c80354a7c3f'
'9916ded318f21afbe8388f0b9822062b'
'f7e1487de6e85116d9c6bde2eac4fb73'
'bc99c4cc6998295d76f37ed681c20d47'
'4fe6523dd1c34398df3aa5a8763530cc'
'f32a768e1acb9785c79c8e93aa266db2'
@ -76,11 +75,10 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'99bb9f51ec684803768f36e407baf486'
'6a6bc88f35ac8080869de39bc128ce5b'
'40de3aaf7d713034e06f4eece665b1ba'
'd0c7198115ff028188ed1759b70fd981'
'a265dea62755caf38187114143999224'
'0186761e13206a32b689f10898e0d536'
'c15d9f480d0248648fa52aeacb46e3c7'
'612a4dfb9f1a3898a1920c28bb999159'
'd0eb81aef1a21c65813fe4ddabbc4206'
'87cbd116c75ced1b075bf266f2455d50'
'62d2977e57fccf1f16d7ea6bf06d3279'
'83139869355c2d46921adb25e47cf0fa')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@ -128,7 +126,7 @@ prepare() {
patch -p1 -i ../qt5-fix-static-dbus-detection.patch
# Patch the win32-g++ mkspecs profile to match our environment
patch -p1 -i ../qt5-use-win32-g++-mkspecs-profile.patch
patch -p0 -i ../qt5-use-win32-g++-mkspecs-profile.patch
# The bundled pcre is built as static library by default
# As we're not using the bundled copy but our own copy
@ -157,13 +155,11 @@ prepare() {
# Build host libs with system zlib. This patch cannot be upstreamed as-is
# due to the other host-libs patches.
patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch
patch -p0 -i ../qt5-use-system-zlib-in-host-libs.patch
# Fix qmake to append .dll.a extension to import libs
patch -p1 -i ../qt5-fix-implib-ext.patch
patch configure ../qt5-fix-QSemaphore-problem.patch
isStatic && patch -p0 -i ../fix-static-psql-mysql.patch
# Make sure the Qt5 build system uses our external ANGLE library

View File

@ -1,11 +1,11 @@
--- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600
+++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600
@@ -145,7 +145,7 @@
--- src/tools/bootstrap/bootstrap.pro.orig 2016-06-14 17:01:24.972134372 +0200
+++ src/tools/bootstrap/bootstrap.pro 2016-05-25 17:46:17.000000000 +0200
@@ -132,7 +132,7 @@
../../corelib/io/qstandardpaths_win.cpp
}
-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
+if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
else:include(../../3rdparty/zlib_dependency.pri)
win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32
-contains(QT_CONFIG, zlib)|cross_compile {
+contains(QT_CONFIG, zlib) {
include(../../3rdparty/zlib.pri)
} else {
CONFIG += no_core_dep

View File

@ -1,5 +1,5 @@
--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200
+++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200
--- mkspecs/win32-g++/qmake.conf.orig 2016-06-14 16:22:02.779947341 +0200
+++ mkspecs/win32-g++/qmake.conf 2016-06-14 16:38:56.298752668 +0200
@@ -25,7 +25,7 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
@ -22,14 +22,14 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
@@ -94,21 +94,26 @@
@@ -95,21 +95,26 @@
QMAKE_LIB_EXTENSIONS = a dll.a
QMAKE_LIBS =
-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng -lharfbuzz -lglib-2.0 -lintl -lwinmm
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
@ -42,9 +42,8 @@
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
-QMAKE_IDL = midl
-QMAKE_LIB = $${CROSS_COMPILE}ar -ru
+QMAKE_IDL = $${CROSS_COMPILE}widl
+QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_RC = $${CROSS_COMPILE}windres
+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
+QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5

View File

@ -1,7 +1,7 @@
diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
--- a/src/gui/gui.pro 2015-06-29 14:04:55.000000000 -0600
+++ b/src/gui/gui.pro 2015-07-18 10:50:02.228227482 -0600
@@ -17,12 +17,6 @@
@@ -17,10 +17,5 @@
imageformats \
egldeviceintegrations
@ -10,8 +10,6 @@ diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
- MODULE_AUX_INCLUDES = \
- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
-}
-
load(qt_module)
# Code coverage with TestCocoon
@@ -35,6 +29,10 @@

View File

@ -16,9 +16,9 @@ isOpenGL() {
}
pkgname=mingw-w64-qt5-base-static
pkgver=5.6.0
pkgrel=4
pkgdesc="A cross-platform application and UI framework (mingw-w64, static)"
pkgver=5.6.1
pkgrel=1
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
! isStatic && arch=('i686' 'x86_64')
isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
url="https://www.qt.io/"
@ -62,12 +62,11 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
"qt5-use-system-zlib-in-host-libs.patch"
"fix-opengl-to-many-sections.patch"
"fix-static-psql-mysql.patch"
"qt5-fix-QSemaphore-problem.patch"
"qtbase-1-fixes.patch"
"qt5-fix-implib-ext.patch")
md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
md5sums=('b23232190a3df61fe1ba81636987b036'
'bab00ccc19d888997f323c80354a7c3f'
'9916ded318f21afbe8388f0b9822062b'
'f7e1487de6e85116d9c6bde2eac4fb73'
'bc99c4cc6998295d76f37ed681c20d47'
'4fe6523dd1c34398df3aa5a8763530cc'
'f32a768e1acb9785c79c8e93aa266db2'
@ -76,11 +75,10 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'99bb9f51ec684803768f36e407baf486'
'6a6bc88f35ac8080869de39bc128ce5b'
'40de3aaf7d713034e06f4eece665b1ba'
'd0c7198115ff028188ed1759b70fd981'
'a265dea62755caf38187114143999224'
'0186761e13206a32b689f10898e0d536'
'c15d9f480d0248648fa52aeacb46e3c7'
'612a4dfb9f1a3898a1920c28bb999159'
'd0eb81aef1a21c65813fe4ddabbc4206'
'87cbd116c75ced1b075bf266f2455d50'
'62d2977e57fccf1f16d7ea6bf06d3279'
'83139869355c2d46921adb25e47cf0fa')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@ -128,7 +126,7 @@ prepare() {
patch -p1 -i ../qt5-fix-static-dbus-detection.patch
# Patch the win32-g++ mkspecs profile to match our environment
patch -p1 -i ../qt5-use-win32-g++-mkspecs-profile.patch
patch -p0 -i ../qt5-use-win32-g++-mkspecs-profile.patch
# The bundled pcre is built as static library by default
# As we're not using the bundled copy but our own copy
@ -157,13 +155,11 @@ prepare() {
# Build host libs with system zlib. This patch cannot be upstreamed as-is
# due to the other host-libs patches.
patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch
patch -p0 -i ../qt5-use-system-zlib-in-host-libs.patch
# Fix qmake to append .dll.a extension to import libs
patch -p1 -i ../qt5-fix-implib-ext.patch
patch configure ../qt5-fix-QSemaphore-problem.patch
isStatic && patch -p0 -i ../fix-static-psql-mysql.patch
# Make sure the Qt5 build system uses our external ANGLE library

View File

@ -1,11 +1,11 @@
--- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600
+++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600
@@ -145,7 +145,7 @@
--- src/tools/bootstrap/bootstrap.pro.orig 2016-06-14 17:01:24.972134372 +0200
+++ src/tools/bootstrap/bootstrap.pro 2016-05-25 17:46:17.000000000 +0200
@@ -132,7 +132,7 @@
../../corelib/io/qstandardpaths_win.cpp
}
-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
+if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
else:include(../../3rdparty/zlib_dependency.pri)
win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32
-contains(QT_CONFIG, zlib)|cross_compile {
+contains(QT_CONFIG, zlib) {
include(../../3rdparty/zlib.pri)
} else {
CONFIG += no_core_dep

View File

@ -1,5 +1,5 @@
--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200
+++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200
--- mkspecs/win32-g++/qmake.conf.orig 2016-06-14 16:22:02.779947341 +0200
+++ mkspecs/win32-g++/qmake.conf 2016-06-14 16:38:56.298752668 +0200
@@ -25,7 +25,7 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
@ -22,14 +22,14 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
@@ -94,21 +94,26 @@
@@ -95,21 +95,26 @@
QMAKE_LIB_EXTENSIONS = a dll.a
QMAKE_LIBS =
-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng -lharfbuzz -lglib-2.0 -lintl -lwinmm
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
@ -42,9 +42,8 @@
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
-QMAKE_IDL = midl
-QMAKE_LIB = $${CROSS_COMPILE}ar -ru
+QMAKE_IDL = $${CROSS_COMPILE}widl
+QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_RC = $${CROSS_COMPILE}windres
+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
+QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5

View File

@ -1,7 +1,7 @@
diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
--- a/src/gui/gui.pro 2015-06-29 14:04:55.000000000 -0600
+++ b/src/gui/gui.pro 2015-07-18 10:50:02.228227482 -0600
@@ -17,12 +17,6 @@
@@ -17,10 +17,5 @@
imageformats \
egldeviceintegrations
@ -10,8 +10,6 @@ diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
- MODULE_AUX_INCLUDES = \
- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
-}
-
load(qt_module)
# Code coverage with TestCocoon
@@ -35,6 +29,10 @@

View File

@ -16,8 +16,8 @@ isOpenGL() {
}
pkgname=mingw-w64-qt5-base
pkgver=5.6.0
pkgrel=4
pkgver=5.6.1
pkgrel=1
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
! isStatic && arch=('i686' 'x86_64')
isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
@ -62,12 +62,11 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
"qt5-use-system-zlib-in-host-libs.patch"
"fix-opengl-to-many-sections.patch"
"fix-static-psql-mysql.patch"
"qt5-fix-QSemaphore-problem.patch"
"qtbase-1-fixes.patch"
"qt5-fix-implib-ext.patch")
md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
md5sums=('b23232190a3df61fe1ba81636987b036'
'bab00ccc19d888997f323c80354a7c3f'
'9916ded318f21afbe8388f0b9822062b'
'f7e1487de6e85116d9c6bde2eac4fb73'
'bc99c4cc6998295d76f37ed681c20d47'
'4fe6523dd1c34398df3aa5a8763530cc'
'f32a768e1acb9785c79c8e93aa266db2'
@ -76,11 +75,10 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'99bb9f51ec684803768f36e407baf486'
'6a6bc88f35ac8080869de39bc128ce5b'
'40de3aaf7d713034e06f4eece665b1ba'
'd0c7198115ff028188ed1759b70fd981'
'a265dea62755caf38187114143999224'
'0186761e13206a32b689f10898e0d536'
'c15d9f480d0248648fa52aeacb46e3c7'
'612a4dfb9f1a3898a1920c28bb999159'
'd0eb81aef1a21c65813fe4ddabbc4206'
'87cbd116c75ced1b075bf266f2455d50'
'62d2977e57fccf1f16d7ea6bf06d3279'
'83139869355c2d46921adb25e47cf0fa')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@ -128,7 +126,7 @@ prepare() {
patch -p1 -i ../qt5-fix-static-dbus-detection.patch
# Patch the win32-g++ mkspecs profile to match our environment
patch -p1 -i ../qt5-use-win32-g++-mkspecs-profile.patch
patch -p0 -i ../qt5-use-win32-g++-mkspecs-profile.patch
# The bundled pcre is built as static library by default
# As we're not using the bundled copy but our own copy
@ -157,13 +155,11 @@ prepare() {
# Build host libs with system zlib. This patch cannot be upstreamed as-is
# due to the other host-libs patches.
patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch
patch -p0 -i ../qt5-use-system-zlib-in-host-libs.patch
# Fix qmake to append .dll.a extension to import libs
patch -p1 -i ../qt5-fix-implib-ext.patch
patch configure ../qt5-fix-QSemaphore-problem.patch
isStatic && patch -p0 -i ../fix-static-psql-mysql.patch
# Make sure the Qt5 build system uses our external ANGLE library

View File

@ -1,9 +0,0 @@
@@ -4456,7 +4456,7 @@
if compileTest unix/ipc_posix "ipc_posix" ; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
else
- if [ "$XPLATFORM_ANDROID" = "no" ] ; then
+ if [ "$XPLATFORM_ANDROID" = "no"] && ["$XPLATFORM_MINGW" = "no" ] ; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY"
fi
fi

View File

@ -1,11 +1,11 @@
--- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600
+++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600
@@ -145,7 +145,7 @@
--- src/tools/bootstrap/bootstrap.pro.orig 2016-06-14 17:01:24.972134372 +0200
+++ src/tools/bootstrap/bootstrap.pro 2016-05-25 17:46:17.000000000 +0200
@@ -132,7 +132,7 @@
../../corelib/io/qstandardpaths_win.cpp
}
-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
+if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
else:include(../../3rdparty/zlib_dependency.pri)
win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32
-contains(QT_CONFIG, zlib)|cross_compile {
+contains(QT_CONFIG, zlib) {
include(../../3rdparty/zlib.pri)
} else {
CONFIG += no_core_dep

View File

@ -1,5 +1,5 @@
--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200
+++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200
--- mkspecs/win32-g++/qmake.conf.orig 2016-06-14 16:22:02.779947341 +0200
+++ mkspecs/win32-g++/qmake.conf 2016-06-14 16:38:56.298752668 +0200
@@ -25,7 +25,7 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
@ -22,14 +22,14 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
@@ -94,21 +94,26 @@
@@ -95,21 +95,26 @@
QMAKE_LIB_EXTENSIONS = a dll.a
QMAKE_LIBS =
-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK = -lws2_32
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng -lharfbuzz -lglib-2.0 -lintl -lwinmm
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
@ -42,9 +42,8 @@
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
-QMAKE_IDL = midl
-QMAKE_LIB = $${CROSS_COMPILE}ar -ru
+QMAKE_IDL = $${CROSS_COMPILE}widl
+QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_RC = $${CROSS_COMPILE}windres
+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
+QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5

View File

@ -1,7 +1,7 @@
diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
--- a/src/gui/gui.pro 2015-06-29 14:04:55.000000000 -0600
+++ b/src/gui/gui.pro 2015-07-18 10:50:02.228227482 -0600
@@ -17,12 +17,6 @@
@@ -17,10 +17,5 @@
imageformats \
egldeviceintegrations
@ -10,8 +10,6 @@ diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
- MODULE_AUX_INCLUDES = \
- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
-}
-
load(qt_module)
# Code coverage with TestCocoon
@@ -35,6 +29,10 @@

View File

@ -5,7 +5,7 @@
_qt_module=qtcanvas3d
pkgname="mingw-w64-qt5-canvas3d"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="A JavaScript 3D rendering API for Qt Quick (mingw-w64)"
@ -16,7 +16,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('73ca1057b64bc99299d2e55c1a35f469')
md5sums=('4116b1b78d373441f1eae47526347f59')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -5,7 +5,7 @@
_qt_module=qtconnectivity
pkgname="mingw-w64-qt5-connectivity"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
@ -16,7 +16,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('38589e8f50dbf835db4fdb5da32a7114')
md5sums=('ad7b5e4e4c033c9d5adcd7a5c83b2007')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,9 +7,9 @@
_qt_module=qtdeclarative
pkgname=mingw-w64-qt5-declarative
pkgver=5.6.0
pkgrel=2
arch=(any)
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Classes for QML and JavaScript languages (mingw-w64)"
depends=(mingw-w64-qt5-base)
makedepends=(mingw-w64-gcc python)
@ -20,7 +20,7 @@ url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
"qt5-build-qmldevtools-as-shared-library.patch")
md5sums=('5eb41d468d88a70574ddc5237b68f7e8'
md5sums=('ea2a2602b8a91f2618a36be09bcd79e9'
'6c445ba7713b69d90f52bb2242303853')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,7 +7,7 @@
_qt_module=qtgraphicaleffects
pkgname="mingw-w64-qt5-graphicaleffects"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
@ -18,7 +18,7 @@ license=('LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-$pkgver"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('6132524e7dbceb3ea634200d4d7cf235')
md5sums=('e4f164b3df516d07bc8e7534a5c72b3d')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,7 +7,7 @@
_qt_module=qtimageformats
pkgname="mingw-w64-qt5-imageformats"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@ -22,7 +22,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('bb57c1db37e89a47f3513859ef04ae97')
md5sums=('3c96ea81db49132eaa4e0d9c9a9db0c2')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -6,9 +6,9 @@
_qt_module=qtlocation
pkgname=mingw-w64-qt5-location
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=(any)
arch=('any')
pkgdesc="Provides access to position, satellite and area monitoring classes (mingw-w64)"
depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative)
makedepends=(mingw-w64-gcc mingw-w64-qt5-quick1)
@ -18,7 +18,7 @@ license=("custom, FDL, GPL3, LGPL")
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('eee764d337854424a30f0356ba04ae6b')
md5sums=('e985bfe7bd544bc7bb44221440f6eaa3')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -5,9 +5,9 @@
_qt_module=qtmultimedia
pkgname=mingw-w64-qt5-multimedia
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=(any)
arch=('any')
pkgdesc="Classes for audio, video, radio and camera functionality (mingw-w64)"
depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative)
makedepends=(mingw-w64-gcc)
@ -18,7 +18,7 @@ url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
"qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch")
md5sums=('c66e500f6d5be693231718cccf997c30'
md5sums=('01e90a2ba304625305170f04cf3e6704'
'c21ff895212a17dc0a748aeadb67601d')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,7 +7,7 @@
_qt_module=qtquickcontrols
pkgname="mingw-w64-qt5-quickcontrols"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
@ -18,7 +18,7 @@ license=('LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-$pkgver"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('f1af1f72ee2860c683a05558d261eece')
md5sums=('77717d2f252ae93d5e81fa35b3f0588f')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,7 +7,7 @@
_qt_module=qtquickcontrols2
pkgname="mingw-w64-qt5-quickcontrols2"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
@ -18,7 +18,7 @@ license=('LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-$pkgver"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('122dd81824cecaa7e327c003469d0df8')
md5sums=('b1603c22d51ed5fcc0b896217e40d55b')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,7 +7,7 @@
_qt_module=qtscript
pkgname="mingw-w64-qt5-script"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)"
@ -18,7 +18,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('779e6083f0adc075b132c2706241e491')
md5sums=('631d38f242295dd026541c31d15e3bae')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,9 +7,9 @@
_qt_module=qtsensors
pkgname=mingw-w64-qt5-sensors
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=(any)
arch=('any')
pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)"
depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative)
makedepends=(mingw-w64-gcc)
@ -19,7 +19,7 @@ groups=(mingw-w64-qt mingw-w64-qt5)
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('1c9a2958e108e8393dbb4427831df647')
md5sums=('1042d90aaab147f854a47697a0ac3419')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -6,7 +6,7 @@
_qt_module=qtserialport
pkgname="mingw-w64-qt5-serialport"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
@ -17,7 +17,7 @@ license=('LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-$pkgver"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/$pkgver/submodules/qtserialport-opensource-src-$pkgver.tar.xz")
md5sums=('a9dfcfbf88034ada5b75f0be59030a37')
md5sums=('19d5492f56440398ecea78e8f854433f')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -6,7 +6,7 @@
_qt_module=qtsvg
pkgname="mingw-w64-qt5-svg"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)"
@ -17,7 +17,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('ab86dafed92185a2f98190fc37afceab')
md5sums=('745d43d334a52a8f27995e37d29fca64')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,8 +7,8 @@
_qt_module=qttools
pkgname="mingw-w64-qt5-tools"
pkgver=5.6.0
pkgrel=3
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
depends=('mingw-w64-qt5-declarative')
@ -18,7 +18,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('5dd6204df7c81c684607f2fc8a5d351a')
md5sums=('bf2cea01e94140524a3fc58c2f2ddebc')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -7,7 +7,7 @@
_qt_module=qttranslations
pkgname="mingw-w64-qt5-translations"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)"
@ -18,7 +18,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('62b3b6191f902466d97e09df48c27534')
md5sums=('cd589f8a334b3e7ad933babf64ed496e')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -17,7 +17,7 @@ url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
groups=(mingw-w64-qt mingw-w64-qt5)
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('1ba293366dcf67f8b8181be2682ee81a')
md5sums=('beb03f280b0b58744713d309f1ceb542')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
prepare() {

View File

@ -7,7 +7,7 @@
_qt_module=qtwebengine
pkgname=mingw-w64-qt5-webengine-git
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64, git version)'

View File

@ -7,7 +7,7 @@
_qt_module=qtwebengine
pkgname=mingw-w64-qt5-webengine
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)'
@ -20,7 +20,7 @@ _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
groups=(mingw-w64-qt mingw-w64-qt5)
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
'0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch')
md5sums=('a8be84d642a78724d84b27c20adee14c'
md5sums=('35f168743638b07157e20af0586f39a2'
'27e0f474f66f05f3911c71621b24636d')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -9,8 +9,8 @@
_qt_module=qtwebkit
pkgname=mingw-w64-qt5-webkit
pkgver=5.6.0
pkgrel=2.1
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
depends=('mingw-w64-qt5-declarative'
@ -45,10 +45,9 @@ source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}/${_pk
qtwebkit-dont-use-bundled-angle-libraries.patch
qtwebkit-opensource-src-5.0.1-debuginfo.patch
revert-qt4-unicode-removal.patch
webkit-commit-151422.patch
qt5-webkit-pthread.patch)
md5sums=('b68565d18db63ee4db998bb8e37608a5'
'ce7d257e2b5b94fe3affd98f52d99d09'
webkit-commit-151422.patch)
md5sums=('9ea7cb557375ba2fc7c62742c522d093'
'37dd6b694e1e178aa8b1815f7fe3537d'
'ac574de962545d6a9e975b4db63c3e09'
'4ad37c7d4dda8e77bb0a25c671f79adc'
'228f28df2b10e417a325176f7878ebe1'
@ -56,17 +55,13 @@ md5sums=('b68565d18db63ee4db998bb8e37608a5'
'f452210683386f9c28f04d7dea0ecfc7'
'6aba6468efafb64943887079e258b799'
'4e374836f26853b4d82be0e87aa584a5'
'c36fe581e0f3b61cef19415782b257ca'
'f65286024f65ca87837171272fc8975d')
'c36fe581e0f3b61cef19415782b257ca')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
prepare() {
cd "${srcdir}/${_pkgfqn}"
# see description inside the patch file
patch -p1 -i ../qt5-webkit-pthread.patch
# note: most patches are originally from http://pkgs.fedoraproject.org/git/rpms/mingw-qt5-qtwebkit.git
# however, I needed to update most of them in order to update to 5.6.0 and to use the latest ANGLE

View File

@ -4,10 +4,10 @@
}
# Sanity checks that would prevent us from building the whole project altogether.
- !android:!mac:!config_icu {
- !config_icu:!osx:!use?(wchar_unicode) {
- addReasonForSkippingBuild("ICU is required.")
- }
+# !android:!mac:!config_icu {
+# !config_icu:!osx:!use?(wchar_unicode) {
+# addReasonForSkippingBuild("ICU is required.")
+# }
production_build:blackberry {
@ -254,14 +254,3 @@
{
TextBreakIterator* lineBreakIterator = 0;
if (staticLineBreakIterator) {
--- qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf.orig 2014-12-29 23:30:47.372582743 +0100
+++ qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf 2014-12-29 23:31:08.021797817 +0100
@@ -142,7 +142,7 @@
# IndexedDB requires leveldb
enable?(indexed_database): WEBKIT_CONFIG += use_leveldb
- !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode
+# !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode
export(WEBKIT_CONFIG)
export(CONFIGURE_WARNINGS)

View File

@ -1,32 +0,0 @@
From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 22 Feb 2016 10:57:32 +0100
Subject: [PATCH] Fix linking with libpthread
WebKit use libpthread directly but is depending on other qt modules
causing it to be linked against, which might break unless -lpthread
is last. Instead just add it explicitly after the static libraries.
Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
Tools/qmake/mkspecs/features/default_post.prf | 1 +
1 file changed, 1 insertion(+)
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index 67276b7..39bb3f7 100644
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -201,6 +201,7 @@ needToLink() {
linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
}
+ posix:!darwin: LIBS += -lpthread
}
creating_module {
--
2.7.1

View File

@ -6,7 +6,7 @@
_qt_module=qtwebsockets
pkgname="mingw-w64-qt5-websockets"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)"
@ -17,7 +17,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('266d9b8b0fca6839a57ed2b17f4a8984')
md5sums=('338c3aaf50c174949e3f262ce0c95ff2')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -5,7 +5,7 @@
_qt_module=qtwebview
pkgname=qt5-webview
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Provides a way to display web content in an application by using native APIs'

View File

@ -6,7 +6,7 @@
_qt_module=qtwinextras
pkgname="mingw-w64-qt5-winextras"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)"
@ -17,7 +17,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('4e40054a0ec59061d0da2fbc23fc69f1')
md5sums=('d5ec1fa22195ba0a38ac758787c5595d')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"

View File

@ -6,7 +6,7 @@
_qt_module=qtxmlpatterns
pkgname="mingw-w64-qt5-xmlpatterns"
pkgver=5.6.0
pkgver=5.6.1
pkgrel=1
arch=('any')
pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)"
@ -17,7 +17,7 @@ license=('GPL3' 'LGPL')
url="https://www.qt.io/"
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
md5sums=('b511b49ab76a1da11b25802861d5688c')
md5sums=('f069a704ca16a701a130070f00bca645')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"