summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip A Reimer2016-01-03 17:39:09 -0700
committerPhilip A Reimer2016-01-03 17:39:09 -0700
commitf5a4b3109212b4763ed1c1af4314442d517cb4b8 (patch)
tree68fff5f55a7a54331ac17b5eb446643e8b6b18dc
parent05d619b31c5b91a4a2274655c57106e9cadb2d50 (diff)
downloadaur-f5a4b3109212b4763ed1c1af4314442d517cb4b8.tar.gz
update to 5.5.1
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD25
-rw-r--r--a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff16
-rw-r--r--qt5-fix-QSemaphore-problem.patch9
-rw-r--r--qt5-use-external-angle-library.patch2
-rw-r--r--qt5-use-win32-g++-mkspecs-profile.patch3
6 files changed, 58 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 705c1d5577f..1afffca6db8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Jan 4 00:37:21 UTC 2016
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 5.5.0
- pkgrel = 2
+ pkgver = 5.5.1
+ pkgrel = 1
url = http://qt-project.org
arch = i686
arch = x86_64
@@ -30,7 +32,7 @@ pkgbase = mingw-w64-qt5-base
options = !strip
options = !buildflags
options = staticlibs
- source = http://download.qt-project.org/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz
+ source = http://download.qt-project.org/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
source = qt5-merge-static-and-shared-library-trees.patch
source = add-angle-support.patch
source = use-external-angle-library.patch
@@ -49,7 +51,9 @@ pkgbase = mingw-w64-qt5-base
source = fix-opengl-to-many-sections.patch
source = fix-static-psql-mysql.patch
source = qt5-disable-angle-opengl-testcode.patch
- md5sums = 252613b5a180c94d7196d10467a4f08b
+ source = qt5-fix-QSemaphore-problem.patch
+ source = a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
+ md5sums = 687e2b122fa2c3390b5e20a166d38038
md5sums = f51eb2b176b10af943831d33925c1251
md5sums = bab00ccc19d888997f323c80354a7c3f
md5sums = ec25d1ff4033383cd5d2414d8189c228
@@ -63,11 +67,13 @@ pkgbase = mingw-w64-qt5-base
md5sums = e793479e0b86b39ddafd328140f1a24c
md5sums = 40de3aaf7d713034e06f4eece665b1ba
md5sums = 4149c27286f110e37893d1764d4c8a68
- md5sums = 6aea7182982098de045721f51bf20fc2
+ md5sums = 39cdea1b39a1d993df6d01a576e8116f
md5sums = a265dea62755caf38187114143999224
md5sums = 612a4dfb9f1a3898a1920c28bb999159
md5sums = d0eb81aef1a21c65813fe4ddabbc4206
md5sums = 0076233a43e7edaaaf8c2abca2ada8df
+ md5sums = 87cbd116c75ced1b075bf266f2455d50
+ md5sums = 1bc70e7e3ea6a0178891d984f0451b3c
pkgname = mingw-w64-qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index 9a1f2623251..94c9fe5b7ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Filip Brcic <brcha@gna.org>
# Contributor: jellysheep <max.mail@dameweb.de>
pkgname=mingw-w64-qt5-base
-pkgver=5.5.0
-pkgrel=2
+pkgver=5.5.1
+pkgrel=1
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
arch=(i686 x86_64)
url="http://qt-project.org"
@@ -51,8 +51,10 @@ source=("http://download.qt-project.org/official_releases/qt/5.5/${pkgver}/submo
"qt5-use-system-zlib-in-host-libs.patch"
"fix-opengl-to-many-sections.patch"
"fix-static-psql-mysql.patch"
- "qt5-disable-angle-opengl-testcode.patch")
-md5sums=('252613b5a180c94d7196d10467a4f08b'
+ "qt5-disable-angle-opengl-testcode.patch"
+ "qt5-fix-QSemaphore-problem.patch"
+ "a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff")
+md5sums=('687e2b122fa2c3390b5e20a166d38038'
'f51eb2b176b10af943831d33925c1251'
'bab00ccc19d888997f323c80354a7c3f'
'ec25d1ff4033383cd5d2414d8189c228'
@@ -66,11 +68,13 @@ md5sums=('252613b5a180c94d7196d10467a4f08b'
'e793479e0b86b39ddafd328140f1a24c'
'40de3aaf7d713034e06f4eece665b1ba'
'4149c27286f110e37893d1764d4c8a68'
- '6aea7182982098de045721f51bf20fc2'
+ '39cdea1b39a1d993df6d01a576e8116f'
'a265dea62755caf38187114143999224'
'612a4dfb9f1a3898a1920c28bb999159'
'd0eb81aef1a21c65813fe4ddabbc4206'
- '0076233a43e7edaaaf8c2abca2ada8df')
+ '0076233a43e7edaaaf8c2abca2ada8df'
+ '87cbd116c75ced1b075bf266f2455d50'
+ '1bc70e7e3ea6a0178891d984f0451b3c')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
# Helper functions for the split builds
@@ -173,6 +177,11 @@ prepare() {
# EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE, EGL_NONE }
patch -p1 -b -i ../qt5-disable-angle-opengl-testcode.patch
+ patch configure ../qt5-fix-QSemaphore-problem.patch
+
+ # QTBUG-49174 Prevent warning output when QWebView loads QNetworkRequest
+ patch -p1 -b -i ../a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
+
isStatic && patch -p0 -i ../fix-static-psql-mysql.patch
# Make sure the Qt5 build system uses our external ANGLE library
@@ -288,6 +297,10 @@ package() {
rm -f "${pkgdir}/usr/${_arch}/lib/libQt5OpenGLExtensions"*
rm -f "${pkgdir}/usr/${_arch}/lib/libQt5PlatformSupport"*
+ # Also keep various Qt5 plugins to be used in static builds
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1257630
+ mv "${pkgdir}/usr/${_arch}/lib/qt/plugins/"*/*.a "${pkgdir}/usr/${_arch}/lib/"
+
# we want to keep a couple pri files not found in base
mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}"
diff --git a/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff b/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
new file mode 100644
index 00000000000..223b6f77f04
--- /dev/null
+++ b/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
@@ -0,0 +1,16 @@
+diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
+index c1956ae..76c2f57 100644
+--- a/src/network/access/qnetworkreplyhttpimpl.cpp
++++ b/src/network/access/qnetworkreplyhttpimpl.cpp
+@@ -1679,8 +1679,9 @@ void QNetworkReplyHttpImplPrivate::_q_startOperation()
+ #endif
+ } else {
+ #ifndef QT_NO_BEARERMANAGEMENT
+- QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
+- q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
++ if (session)
++ QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
++ q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
+ #endif
+ }
+
diff --git a/qt5-fix-QSemaphore-problem.patch b/qt5-fix-QSemaphore-problem.patch
new file mode 100644
index 00000000000..c3fcea9f6af
--- /dev/null
+++ b/qt5-fix-QSemaphore-problem.patch
@@ -0,0 +1,9 @@
+@@ -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
diff --git a/qt5-use-external-angle-library.patch b/qt5-use-external-angle-library.patch
index 551bfa3b69e..fef7949afb2 100644
--- a/qt5-use-external-angle-library.patch
+++ b/qt5-use-external-angle-library.patch
@@ -80,7 +80,7 @@
--- src/plugins/platforms/windows/windows.pri 2014-12-05 09:24:37.000000000 -0700
+++ src/plugins/platforms/windows/windows.pri 2014-12-11 10:13:45.228261276 -0700
@@ -3,6 +3,7 @@
- !wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+ !wince: LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
+contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch
index 2b4ce16f3e1..a3499dab62c 100644
--- a/qt5-use-win32-g++-mkspecs-profile.patch
+++ b/qt5-use-win32-g++-mkspecs-profile.patch
@@ -22,7 +22,7 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
-@@ -84,21 +84,25 @@
+@@ -84,21 +84,26 @@
QMAKE_EXTENSION_STATICLIB = a
QMAKE_LIBS =
@@ -46,6 +46,7 @@
QMAKE_LIB = $${CROSS_COMPILE}ar -ru
QMAKE_RC = $${CROSS_COMPILE}windres
+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
++QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5
QMAKE_STRIP = $${CROSS_COMPILE}strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded