summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip A Reimer2015-08-26 21:40:13 -0600
committerPhilip A Reimer2015-08-26 21:40:13 -0600
commit126d8edf333f59cf1734030ae2acdab87fbf83b6 (patch)
tree2cc8b367d12942202362e2333a136d2b47889013
parenta144ffb8da8f0c7fca2e303c95198b6a53a12c6d (diff)
downloadaur-126d8edf333f59cf1734030ae2acdab87fbf83b6.tar.gz
Update to 5.5.0
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD115
-rw-r--r--add-angle-support.patch46
-rw-r--r--qt5-disable-angle-opengl-testcode.patch11
-rw-r--r--qt5-dont-add-resource-files-to-qmake-libs.patch12
-rw-r--r--qt5-qmake-implib-dll-a.patch8
-rw-r--r--qt5-use-external-angle-library.patch18
-rw-r--r--qt5-use-win32-g++-mkspecs-profile.patch14
-rw-r--r--qt5-workaround-pkgconfig-install-issue.patch10
-rw-r--r--use-external-angle-library.patch92
10 files changed, 242 insertions, 116 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f5845d2498..e38249c53f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 5.4.2
+ pkgver = 5.5.0
pkgrel = 1
url = http://qt-project.org
arch = i686
@@ -12,7 +12,6 @@ pkgbase = mingw-w64-qt5-base
makedepends = mingw-w64-postgresql-libs
makedepends = mingw-w64-mariadb-connector-c
makedepends = mingw-w64-pkg-config
- makedepends = mingw-w64-glib2
depends = mingw-w64-crt
depends = mingw-w64-zlib
depends = mingw-w64-libjpeg-turbo
@@ -23,6 +22,7 @@ pkgbase = mingw-w64-qt5-base
depends = mingw-w64-libdbus
depends = mingw-w64-pcre
depends = mingw-w64-harfbuzz
+ depends = mingw-w64-glib2
depends = mingw-w64-angleproject
optdepends = mingw-w64-postgresql-libs: PostgreSQL support
optdepends = mingw-w64-mariadb-connector-c: MySQL support
@@ -30,17 +30,15 @@ pkgbase = mingw-w64-qt5-base
options = !strip
options = !buildflags
options = staticlibs
- source = http://download.qt-project.org/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+ source = http://download.qt-project.org/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz
source = qt5-merge-static-and-shared-library-trees.patch
- source = qt5-add-angle-support.patch
- source = angle-fix.patch
- source = qt5-use-external-angle-library.patch
+ source = add-angle-support.patch
+ source = use-external-angle-library.patch
source = qt5-workaround-pkgconfig-install-issue.patch
source = qt5-qtbase-fix-linking-against-static-pcre.patch
source = qt5-rename-qtmain-to-qt5main.patch
source = qt5-dont-build-host-libs-static.patch
source = qt5-enable-rpath-for-host-tools.patch
- source = qt5-add-compiled-shaders-remove-dxsdk.patch
source = qt5-dont-add-resource-files-to-qmake-libs.patch
source = qt5-prevent-debug-library-names-in-pkgconfig-files.patch
source = qt5-qmake-implib-dll-a.patch
@@ -48,30 +46,28 @@ pkgbase = mingw-w64-qt5-base
source = qt5-fix-static-harfbuzz-detection.patch
source = qt5-use-win32-g++-mkspecs-profile.patch
source = qt5-use-system-zlib-in-host-libs.patch
- source = qt-5.1.x-win_flex-replace.patch
source = fix-opengl-to-many-sections.patch
source = fix-static-psql-mysql.patch
- md5sums = 67a95eec79ffc4a14f516ad6f3d24c96
+ source = qt5-disable-angle-opengl-testcode.patch
+ md5sums = 252613b5a180c94d7196d10467a4f08b
md5sums = f51eb2b176b10af943831d33925c1251
- md5sums = 8c6bda3ce8aca368b1f50f57e5f25aa7
- md5sums = af4ac76fb9d1ea383359ea881ffcd8e3
- md5sums = 361e456685180a4004de6af76c58ddba
- md5sums = 19debeaea610e70691fae3b2a0a94eaa
+ md5sums = bab00ccc19d888997f323c80354a7c3f
+ md5sums = ec25d1ff4033383cd5d2414d8189c228
+ md5sums = bc99c4cc6998295d76f37ed681c20d47
md5sums = 4fe6523dd1c34398df3aa5a8763530cc
md5sums = c4d4ca54a2e9096d2af13a266177f6d6
md5sums = 3bd322551924543553a2bf81b4419a09
md5sums = 15e8eaa4f0a9a9990277c79e243770be
- md5sums = bd0ced78eafaf187197d64f9e381c6c5
- md5sums = 47b2aa0c6251c24c3c36c86b86a99c4c
+ md5sums = 99bb9f51ec684803768f36e407baf486
md5sums = 6a6bc88f35ac8080869de39bc128ce5b
- md5sums = 474de0e31122ecd140ebc19fe3960057
+ md5sums = e793479e0b86b39ddafd328140f1a24c
md5sums = 40de3aaf7d713034e06f4eece665b1ba
md5sums = 1a7921cadeb5c3db383dea068519e8d3
- md5sums = f0e068b82ca41ae32c0d72587f070dd8
+ md5sums = 6aea7182982098de045721f51bf20fc2
md5sums = a265dea62755caf38187114143999224
- md5sums = 852519f457e33e0d1e9d2a2df872967d
md5sums = 612a4dfb9f1a3898a1920c28bb999159
md5sums = d0eb81aef1a21c65813fe4ddabbc4206
+ md5sums = 0076233a43e7edaaaf8c2abca2ada8df
pkgname = mingw-w64-qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index 661e9f0bc10..d42fcc581d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Filip Brcic <brcha@gna.org>
# Contributor: jellysheep <max.mail@dameweb.de>
pkgname=mingw-w64-qt5-base
-pkgver=5.4.2
+pkgver=5.5.0
pkgrel=1
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
arch=(i686 x86_64)
@@ -19,6 +19,7 @@ depends=(
mingw-w64-libdbus
mingw-w64-pcre
mingw-w64-harfbuzz
+ mingw-w64-glib2
)
groups=(mingw-w64-qt mingw-w64-qt5)
optdepends=(
@@ -29,21 +30,18 @@ optdepends=(
makedepends=(mingw-w64-gcc
mingw-w64-postgresql-libs
mingw-w64-mariadb-connector-c
- mingw-w64-pkg-config
- mingw-w64-glib2)
+ mingw-w64-pkg-config)
options=(!strip !buildflags staticlibs)
_pkgfqn="qtbase-opensource-src-${pkgver}"
-source=("http://download.qt-project.org/official_releases/qt/5.4/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+source=("http://download.qt-project.org/official_releases/qt/5.5/${pkgver}/submodules/${_pkgfqn}.tar.xz"
"qt5-merge-static-and-shared-library-trees.patch"
- "qt5-add-angle-support.patch"
- "angle-fix.patch"
- "qt5-use-external-angle-library.patch"
+ "add-angle-support.patch"
+ "use-external-angle-library.patch"
"qt5-workaround-pkgconfig-install-issue.patch"
"qt5-qtbase-fix-linking-against-static-pcre.patch"
"qt5-rename-qtmain-to-qt5main.patch"
"qt5-dont-build-host-libs-static.patch"
"qt5-enable-rpath-for-host-tools.patch"
- "qt5-add-compiled-shaders-remove-dxsdk.patch"
"qt5-dont-add-resource-files-to-qmake-libs.patch"
"qt5-prevent-debug-library-names-in-pkgconfig-files.patch"
"qt5-qmake-implib-dll-a.patch"
@@ -51,30 +49,28 @@ source=("http://download.qt-project.org/official_releases/qt/5.4/${pkgver}/submo
"qt5-fix-static-harfbuzz-detection.patch"
"qt5-use-win32-g++-mkspecs-profile.patch"
"qt5-use-system-zlib-in-host-libs.patch"
- "qt-5.1.x-win_flex-replace.patch"
"fix-opengl-to-many-sections.patch"
- "fix-static-psql-mysql.patch")
-md5sums=('67a95eec79ffc4a14f516ad6f3d24c96'
+ "fix-static-psql-mysql.patch"
+ "qt5-disable-angle-opengl-testcode.patch")
+md5sums=('252613b5a180c94d7196d10467a4f08b'
'f51eb2b176b10af943831d33925c1251'
- '8c6bda3ce8aca368b1f50f57e5f25aa7'
- 'af4ac76fb9d1ea383359ea881ffcd8e3'
- '361e456685180a4004de6af76c58ddba'
- '19debeaea610e70691fae3b2a0a94eaa'
+ 'bab00ccc19d888997f323c80354a7c3f'
+ 'ec25d1ff4033383cd5d2414d8189c228'
+ 'bc99c4cc6998295d76f37ed681c20d47'
'4fe6523dd1c34398df3aa5a8763530cc'
'c4d4ca54a2e9096d2af13a266177f6d6'
'3bd322551924543553a2bf81b4419a09'
'15e8eaa4f0a9a9990277c79e243770be'
- 'bd0ced78eafaf187197d64f9e381c6c5'
- '47b2aa0c6251c24c3c36c86b86a99c4c'
+ '99bb9f51ec684803768f36e407baf486'
'6a6bc88f35ac8080869de39bc128ce5b'
- '474de0e31122ecd140ebc19fe3960057'
+ 'e793479e0b86b39ddafd328140f1a24c'
'40de3aaf7d713034e06f4eece665b1ba'
'1a7921cadeb5c3db383dea068519e8d3'
- 'f0e068b82ca41ae32c0d72587f070dd8'
+ '6aea7182982098de045721f51bf20fc2'
'a265dea62755caf38187114143999224'
- '852519f457e33e0d1e9d2a2df872967d'
'612a4dfb9f1a3898a1920c28bb999159'
- 'd0eb81aef1a21c65813fe4ddabbc4206')
+ 'd0eb81aef1a21c65813fe4ddabbc4206'
+ '0076233a43e7edaaaf8c2abca2ada8df')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
# Helper functions for the split builds
@@ -86,15 +82,10 @@ isOpenGL() {
[ $pkgname = "mingw-w64-qt5-base-opengl" ]
}
-isInternalAngle() {
- [ $pkgname = "mingw-w64-qt5-base-internal-angle" ]
-}
-
isStatic && depends+=("mingw-w64-qt5-base")
-! isOpenGL && ! isInternalAngle && depends+=("mingw-w64-angleproject")
-isOpenGL || isInternalAngle && provides+=("mingw-w64-qt5-base")
-isOpenGL || isInternalAngle && conflicts+=("mingw-w64-qt5-base")
-isInternalAngle && conflicts+=("mingw-w64-angleproject")
+! isOpenGL && depends+=("mingw-w64-angleproject")
+isOpenGL && provides+=("mingw-w64-qt5-base")
+isOpenGL && conflicts+=("mingw-w64-qt5-base")
prepare() {
cd "${srcdir}/${_pkgfqn}"
@@ -103,28 +94,26 @@ prepare() {
# when compared to the static library. Merge those changes manually.
# This patch also applies some additional changes which are required to make
# linking against the static version of Qt work without any manual fiddling
- patch -p0 -i "${srcdir}/qt5-merge-static-and-shared-library-trees.patch"
+ patch -p0 -i ../qt5-merge-static-and-shared-library-trees.patch
if ! isOpenGL; then
# Add support for Angle
- patch -p0 -i "${srcdir}/qt5-add-angle-support.patch"
- fi
+ patch -p1 -i ../add-angle-support.patch
- if ! isOpenGL && ! isInternalAngle; then
# Make sure our external Angle package is used instead of the bundled one
- patch -p0 -i "${srcdir}/qt5-use-external-angle-library.patch"
+ patch -p1 -i ../use-external-angle-library.patch
fi
-
+
# opengl to many sections error
isOpenGL && patch -p0 -i ../fix-opengl-to-many-sections.patch
# Make sure the .pc files of the Qt5 modules are installed correctly
- patch -p0 -i "${srcdir}/qt5-workaround-pkgconfig-install-issue.patch"
+ patch -p0 -i ../qt5-workaround-pkgconfig-install-issue.patch
# Prevents resource files from being added to the LIBS parameter
# This solves an issue where the generated pkg-config files contained
# invalid Libs.private references like .obj/debug/Qt5Cored_resource_res.o
- patch -p1 -i "${srcdir}/qt5-dont-add-resource-files-to-qmake-libs.patch"
+ patch -p1 -i ../qt5-dont-add-resource-files-to-qmake-libs.patch
# qmake generates the pkgconfig .pc files two times, once for the
# release build and once for the debug build (which we're not actually
@@ -133,34 +122,34 @@ prepare() {
# build ending up in the .pc files which are unwanted
# Prevent this from happening by giving the pkgconfig .pc
# files for the debug build an unique file name
- patch -p1 -i "${srcdir}/qt5-prevent-debug-library-names-in-pkgconfig-files.patch"
+ patch -p1 -i ../qt5-prevent-debug-library-names-in-pkgconfig-files.patch
# Fix qmake to create implibs with .dll.a extension for MinGW
- patch -p1 -i "${srcdir}/qt5-qmake-implib-dll-a.patch"
+ patch -p1 -i ../qt5-qmake-implib-dll-a.patch
# As of Qt 5.4.1 the detection of the static DBus and Harfbuzz libraries got broken
patch -p1 -i ../qt5-fix-static-dbus-detection.patch
patch -p1 -i ../qt5-fix-static-harfbuzz-detection.patch
# Patch the win32-g++ mkspecs profile to match our environment
- patch -p0 -i "${srcdir}/qt5-use-win32-g++-mkspecs-profile.patch"
+ patch -p1 -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
# we need to do some fiddling to fix compilation issues
# when trying to build static qmake projects
- patch -p1 -i "${srcdir}/qt5-qtbase-fix-linking-against-static-pcre.patch"
+ patch -p1 -i ../qt5-qtbase-fix-linking-against-static-pcre.patch
# Make sure the qtmain (static) library doesn't conflict with the one
# provided by the mingw-qt (qt4) package. The mkspecs profile is already
# updated by patch100 to reflect this change
# https://bugzilla.redhat.com/show_bug.cgi?id=1092465
- patch -p1 -i "${srcdir}/qt5-rename-qtmain-to-qt5main.patch"
+ patch -p1 -i ../qt5-rename-qtmain-to-qt5main.patch
# Upstream always wants the host libraries to be static instead of
# shared libraries. This causes issues and is against the Fedora
# packaging guidelines so disable this 'feature'
- patch -p0 -i "${srcdir}/qt5-dont-build-host-libs-static.patch"
+ patch -p0 -i ../qt5-dont-build-host-libs-static.patch
# Build host tools with rpath enabled
# We have to use rpath here as the library which the
@@ -168,34 +157,29 @@ prepare() {
# in the folder /usr/${_arch}/lib
# We can't use the regular %%_libdir for this as we
# want to avoid conflicts with the native qt5 packages
- patch -p1 -i "${srcdir}/qt5-enable-rpath-for-host-tools.patch"
+ patch -p1 -i ../qt5-enable-rpath-for-host-tools.patch
# Build host libs with system zlib. This patch cannot be upstreamed as-is
# due to the other host-libs patches.
- patch -p1 -i "${srcdir}/qt5-use-system-zlib-in-host-libs.patch"
+ patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch
+
+ # Workaround a compatibility issue because we are using an older version of ANGLE in Fedora
+ # Upgrading the mingw-angleproject package isn't possible for now because mingw-qt5-qtwebkit doesn't support the latest ANGLE yet..
+ #
+ # /home/erik/fedora/mingw-qt5-qtbase/qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp:376:15: error: 'EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE' was not declared in this scope
+ # EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE, EGL_NONE }
+ # ^
+ # /home/erik/fedora/mingw-qt5-qtbase/qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp:376:53: error: 'EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE' was not declared in this scope
+ # 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
- if ! isInternalAngle; then
- # Make sure the Qt5 build system uses our external ANGLE library
- rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,KHR}
- fi
+ isStatic && patch -p0 -i ../fix-static-psql-mysql.patch
+
+ # Make sure the Qt5 build system uses our external ANGLE library
+ rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,KHR}
# As well as our external PCRE library and zlib
rm -rf src/3rdparty/{pcre,zlib}
-
- if isStatic; then
- patch -p0 -i ../fix-static-psql-mysql.patch
- fi
-
- if isInternalAngle; then
- # fix make[6]: win_flex: Command not found
- patch -p2 -i "${srcdir}/qt-5.1.x-win_flex-replace.patch"
- # Fix Angle. See https://code.google.com/p/angleproject/issues/detail?id=462
- patch -p0 -i "${srcdir}/angle-fix.patch"
- patch -p0 < "${srcdir}/qt5-add-compiled-shaders-remove-dxsdk.patch"
- find ./src/3rdparty/angle -type f -and \( -name *.h -or -name *.cpp \) | xargs sed -i \
- -e 's_#include <D3Dcompiler.h>_#include <d3dcompiler.h>_' \
- -e 's_#include "libGLESv2/Constants.h"_#include "libGLESv2/constants.h"_'
- fi
}
build() {
@@ -252,6 +236,9 @@ build() {
-sysconfdir /usr/${_arch}/etc \
-translationdir /usr/${_arch}/share/qt/translations \
-device-option CROSS_COMPILE=${_arch}-"
+
+ # fix include directory of dbus
+ qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
isOpenGL && qt_configure_args+=' -opengl desktop'
isStatic && qt_configure_args+=' -opengl no'
diff --git a/add-angle-support.patch b/add-angle-support.patch
new file mode 100644
index 00000000000..8b9af40ac2a
--- /dev/null
+++ b/add-angle-support.patch
@@ -0,0 +1,46 @@
+diff -U 3 -r a/configure b/configure
+--- a/configure 2015-06-29 14:03:05.000000000 -0600
++++ b/configure 2015-07-18 11:14:30.312317765 -0600
+@@ -5081,7 +5081,7 @@
+ fi
+ if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+ if compileTest x11/opengl "OpenGL"; then
+- CFG_OPENGL=desktop
++ CFG_OPENGL=angle
+ elif compileTest unix/opengles2 "OpenGL ES 2.0"; then
+ CFG_OPENGL=es2
+ else
+@@ -6072,6 +6072,11 @@
+ QT_CONFIG="$QT_CONFIG opengles2"
+ fi
+
++if [ "$CFG_OPENGL" = "angle" ]; then
++ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES QT_OPENGL_ES_2"
++ QT_CONFIG="$QT_CONFIG opengles2 egl angle"
++fi
++
+ if [ "$CFG_SHARED" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG shared"
+ QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared"
+@@ -7077,7 +7082,7 @@
+ report_support " NIS ...................." "$CFG_NIS"
+ report_support " OpenGL / OpenVG:"
+ report_support " EGL .................." "$CFG_EGL"
+-report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+"
++report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" angle "ANGLE"
+ report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
+ report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy"
+ if [ -n "$PKG_CONFIG" ]; then
+diff -U 3 -r a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
+--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-06-29 14:04:40.000000000 -0600
++++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-07-18 11:16:05.767172673 -0600
+@@ -45,7 +45,9 @@
+ #include <algorithm>
+
+ #include <wingdi.h>
++#ifndef QT_OPENGL_ES_2
+ #include <GL/gl.h>
++#endif
+
+ // #define DEBUG_GL
+
diff --git a/qt5-disable-angle-opengl-testcode.patch b/qt5-disable-angle-opengl-testcode.patch
new file mode 100644
index 00000000000..a2bb3f65f62
--- /dev/null
+++ b/qt5-disable-angle-opengl-testcode.patch
@@ -0,0 +1,11 @@
+--- qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp.external_angle 2015-06-29 22:04:40.000000000 +0200
++++ qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp 2015-08-05 21:37:55.922142528 +0200
+@@ -366,7 +366,7 @@
+ EGLDisplay display = EGL_NO_DISPLAY;
+ EGLint major = 0;
+ EGLint minor = 0;
+-#ifdef EGL_ANGLE_platform_angle
++#if 0
+ if (libEGL.eglGetPlatformDisplayEXT
+ && (preferredType & QWindowsOpenGLTester::AngleBackendMask)) {
+ const EGLint anglePlatformAttributes[][5] = {
diff --git a/qt5-dont-add-resource-files-to-qmake-libs.patch b/qt5-dont-add-resource-files-to-qmake-libs.patch
index b348429551f..838f2467e54 100644
--- a/qt5-dont-add-resource-files-to-qmake-libs.patch
+++ b/qt5-dont-add-resource-files-to-qmake-libs.patch
@@ -1,11 +1,11 @@
--- qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp.orig 2014-01-04 21:18:07.413328813 +0100
+++ qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp 2014-01-04 21:18:55.740126515 +0100
-@@ -254,7 +254,7 @@
+@@ -243,7 +243,7 @@
+
processVars();
- if (!project->values("RES_FILE").isEmpty()) {
-- project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
-+ project->values("OBJECTS") += escapeFilePaths(project->values("RES_FILE"));
- }
+- project->values("QMAKE_LIBS") += project->values("RES_FILE");
++ project->values("OBJECTS") += project->values("RES_FILE");
- ProStringList &configs = project->values("CONFIG");
+ if (project->isActiveConfig("dll")) {
+ QString destDir = "";
diff --git a/qt5-qmake-implib-dll-a.patch b/qt5-qmake-implib-dll-a.patch
index dbef279810a..91ef32a1666 100644
--- a/qt5-qmake-implib-dll-a.patch
+++ b/qt5-qmake-implib-dll-a.patch
@@ -1,6 +1,6 @@
--- a/qmake/generators/win32/mingw_make.cpp 2013-08-25 13:04:06.000000000 -0500
+++ b/qmake/generators/win32/mingw_make.cpp 2014-01-02 01:24:31.640046700 -0600
-@@ -71,7 +71,7 @@ QString MingwMakefileGenerator::escapeDe
+@@ -58,7 +58,7 @@
QString MingwMakefileGenerator::getLibTarget()
{
@@ -8,14 +8,14 @@
+ return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".dll.a");
}
- bool MingwMakefileGenerator::findLibraries()
-@@ -268,7 +268,7 @@
+ QString MingwMakefileGenerator::getManifestFileForRcFile() const
+@@ -250,7 +250,7 @@
if(!project->first("DESTDIR").isEmpty())
destDir = Option::fixPathToTargetOS(project->first("DESTDIR") + Option::dir_sep, false, false);
project->values("MINGW_IMPORT_LIB").prepend(destDir + "lib" + project->first("TARGET")
- + project->first("TARGET_VERSION_EXT") + ".a");
+ + project->first("TARGET_VERSION_EXT") + ".dll.a");
- project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB"));
+ project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + fileVar("MINGW_IMPORT_LIB"));
}
--- a/mkspecs/features/create_cmake.prf.cmake 2013-10-22 10:49:28.000000000 +0200
diff --git a/qt5-use-external-angle-library.patch b/qt5-use-external-angle-library.patch
index ee463e6c9c2..551bfa3b69e 100644
--- a/qt5-use-external-angle-library.patch
+++ b/qt5-use-external-angle-library.patch
@@ -14,9 +14,9 @@
_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
--- src/gui/gui.pro 2014-12-05 09:24:35.000000000 -0700
+++ src/gui/gui.pro 2014-12-11 10:22:37.644366784 -0700
-@@ -15,12 +15,6 @@
- iconengines \
- imageformats
+@@ -17,12 +17,6 @@
+ imageformats \
+ egldeviceintegrations
-# This is here only because the platform plugin is no module, obviously.
-win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
@@ -89,7 +89,7 @@
# For the dialog helpers:
--- src/src.pro 2014-12-05 09:24:31.000000000 -0700
+++ src/src.pro 2014-12-11 10:06:14.882845813 -0700
-@@ -140,10 +140,6 @@
+@@ -155,10 +155,6 @@
SUBDIRS += src_3rdparty_harfbuzzng
src_gui.depends += src_3rdparty_harfbuzzng
}
@@ -97,15 +97,15 @@
- SUBDIRS += src_angle
- src_gui.depends += src_angle
- }
- SUBDIRS += src_gui src_platformsupport src_platformheaders
- contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions
- src_plugins.depends += src_gui src_platformsupport src_platformheaders
+ contains(QT_CONFIG, freetype) {
+ SUBDIRS += src_3rdparty_freetype
+ src_platformsupport.depends += src_3rdparty_freetype
--- src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-05 09:24:37.000000000 -0700
+++ src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-11 20:07:27.099190408 -0700
-@@ -40,7 +40,7 @@
+@@ -39,7 +39,7 @@
+ #include <QtGui/QOpenGLContext>
#if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
- # define EGL_EGLEXT_PROTOTYPES
-# include <QtANGLE/EGL/eglext.h>
+# include <EGL/eglext.h>
#endif
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch
index bba98c32613..2b4ce16f3e1 100644
--- a/qt5-use-win32-g++-mkspecs-profile.patch
+++ b/qt5-use-win32-g++-mkspecs-profile.patch
@@ -1,5 +1,5 @@
---- mkspecs/win32-g++/qmake.conf.orig 2014-01-05 13:46:16.181559218 +0100
-+++ mkspecs/win32-g++/qmake.conf 2014-01-05 13:52:31.176768097 +0100
+--- 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
@@ -25,7 +25,7 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
@@ -9,7 +9,7 @@
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -Wextra
QMAKE_CFLAGS_WARN_OFF = -w
-@@ -66,10 +66,10 @@
+@@ -67,10 +67,10 @@
QMAKE_LINK = $${CROSS_COMPILE}g++
QMAKE_LINK_C = $${CROSS_COMPILE}gcc
@@ -22,7 +22,7 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
-@@ -81,14 +81,14 @@
+@@ -84,21 +84,25 @@
QMAKE_EXTENSION_STATICLIB = a
QMAKE_LIBS =
@@ -41,12 +41,6 @@
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
- !isEmpty(QMAKE_SH) {
- MINGW_IN_SHELL = 1
-@@ -102,12 +102,16 @@
- include(../common/shell-win32.conf)
- }
-
-QMAKE_IDL = midl
+QMAKE_IDL = $${CROSS_COMPILE}widl
QMAKE_LIB = $${CROSS_COMPILE}ar -ru
diff --git a/qt5-workaround-pkgconfig-install-issue.patch b/qt5-workaround-pkgconfig-install-issue.patch
index ef1037fa9aa..46e561aac04 100644
--- a/qt5-workaround-pkgconfig-install-issue.patch
+++ b/qt5-workaround-pkgconfig-install-issue.patch
@@ -9,15 +9,15 @@
{
QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
if (ret.isEmpty()) {
-@@ -3130,7 +3130,11 @@
+@@ -3134,7 +3134,11 @@
if(fixify) {
if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
ret.prepend(project->first("DESTDIR").toQString());
-- ret = Option::fixPathToLocalOS(fileFixify(ret, qmake_getpwd(), Option::output_dir));
+- ret = fileFixify(ret, FileFixifyBackwards);
+ if (onlyPrependDestdir) {
+ ret = Option::fixPathToLocalOS(ret);
+ } else {
-+ ret = Option::fixPathToLocalOS(fileFixify(ret, qmake_getpwd(), Option::output_dir));
++ ret = fileFixify(ret, FileFixifyBackwards);
+ }
}
return ret;
@@ -35,7 +35,7 @@
--- qmake/generators/win32/winmakefile.cpp.orig 2013-03-26 19:05:13.398183953 +0100
+++ qmake/generators/win32/winmakefile.cpp 2013-03-26 19:15:02.800490466 +0100
-@@ -851,7 +851,7 @@
+@@ -822,7 +822,7 @@
}
if(!ret.isEmpty())
ret += "\n\t";
@@ -43,4 +43,4 @@
+ ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc);
if(!uninst.isEmpty())
uninst.append("\n\t");
- uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");
+ uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
diff --git a/use-external-angle-library.patch b/use-external-angle-library.patch
new file mode 100644
index 00000000000..8f6166252fe
--- /dev/null
+++ b/use-external-angle-library.patch
@@ -0,0 +1,92 @@
+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 @@
+ imageformats \
+ egldeviceintegrations
+
+-# This is here only because the platform plugin is no module, obviously.
+-win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
+- MODULE_AUX_INCLUDES = \
+- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
+-}
+-
+ load(qt_module)
+
+ # Code coverage with TestCocoon
+@@ -35,6 +29,10 @@
+
+ mac:!ios: LIBS_PRIVATE += -framework Cocoa
+
++win32:contains(QT_CONFIG, angle) {
++ LIBS_PRIVATE += -lGLESv2
++}
++
+ CONFIG += simd optimize_full
+
+ include(accessible/accessible.pri)
+diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+--- a/src/gui/Qt5GuiConfigExtras.cmake.in 2015-06-29 14:04:51.000000000 -0600
++++ b/src/gui/Qt5GuiConfigExtras.cmake.in 2015-07-18 10:51:09.666053970 -0600
+@@ -2,9 +2,9 @@
+ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
+
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
+ !!ELSE
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
+ !!ENDIF
+
+ _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
+diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro
+--- a/src/opengl/opengl.pro 2015-06-29 14:04:05.000000000 -0600
++++ b/src/opengl/opengl.pro 2015-07-18 10:46:46.588388411 -0600
+@@ -12,6 +12,9 @@
+
+ contains(QT_CONFIG, opengl):CONFIG += opengl
+ contains(QT_CONFIG, opengles2):CONFIG += opengles2
++win32:contains(QT_CONFIG, angle) {
++ LIBS_PRIVATE += -lGLESv2
++}
+
+ HEADERS += qgl.h \
+ qgl_p.h \
+diff -U 3 -r a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
+--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp 2015-06-29 14:04:40.000000000 -0600
++++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp 2015-07-18 10:52:29.667410627 -0600
+@@ -39,7 +39,7 @@
+ #include <QtGui/QOpenGLContext>
+
+ #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
+-# include <QtANGLE/EGL/eglext.h>
++# include <EGL/eglext.h>
+ #endif
+
+ QT_BEGIN_NAMESPACE
+diff -U 3 -r a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
+--- a/src/plugins/platforms/windows/windows.pri 2015-06-29 14:04:40.000000000 -0600
++++ b/src/plugins/platforms/windows/windows.pri 2015-07-18 10:53:45.585348009 -0600
+@@ -3,6 +3,7 @@
+ !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
+
+ mingw: LIBS *= -luuid
+ # For the dialog helpers:
+diff -U 3 -r a/src/src.pro b/src/src.pro
+--- a/src/src.pro 2015-06-29 14:05:06.000000000 -0600
++++ b/src/src.pro 2015-07-18 10:43:01.698195194 -0600
+@@ -155,10 +155,6 @@
+ SUBDIRS += src_3rdparty_harfbuzzng
+ src_gui.depends += src_3rdparty_harfbuzzng
+ }
+- win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
+- SUBDIRS += src_angle
+- src_gui.depends += src_angle
+- }
+ contains(QT_CONFIG, freetype) {
+ SUBDIRS += src_3rdparty_freetype
+ src_platformsupport.depends += src_3rdparty_freetype