testing/qt5-*: upgrade to 5.2.1, fix musl build

4 files changed, 40 insertions, 61 deletions

diff --git a/testing/qt5-qtwebkit/APKBUILD b/testing/qt5-qtwebkit/APKBUILD
index bbc908a9c..2ef04f68b 100644
--- a/testing/qt5-qtwebkit/APKBUILD
+++ b/testing/qt5-qtwebkit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt5-qtwebkit
-pkgver=5.1.1
-pkgrel=3
+pkgver=5.2.1
+pkgrel=0
 pkgdesc="Qt5 - QtWebKit components"
 url="http://qt-project.org/"
 arch="all"
@@ -26,10 +26,10 @@ makedepends="$depends_dev
 	"
 install=""
 subpackages="$pkgname-dev"
-source="http://download.qt-project.org/official_releases/qt/5.1/$pkgver/submodules/qtwebkit-opensource-src-$pkgver.tar.xz
-	bison3.patch
+source="http://download.qt-project.org/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtwebkit-opensource-src-$pkgver.tar.xz
 	pic.patch
 	fix-rpath.patch
+	fix-execinfo.patch
 	"
 
 _builddir="$srcdir"/qtwebkit-opensource-src-$pkgver
@@ -43,10 +43,7 @@ prepare() {
 	done
 	# remove some bundled
 	mkdir Source/ThirdParty/orig
-	mv Source/ThirdParty/glu/ \
-		Source/ThirdParty/gtest/ \
-		Source/ThirdParty/gyp \
-		Source/ThirdParty/mt19937ar.c \
+	mv Source/ThirdParty/gtest/ \
 		Source/ThirdParty/qunit/ \
 		Source/ThirdParty/orig/ \
 		|| return 1
@@ -66,15 +63,15 @@ package() {
 	sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc
 }
 
-md5sums="70e956dafcee1969de53d4de7b4691ad  qtwebkit-opensource-src-5.1.1.tar.xz
-6b162cd2bc104f0ae83ca039401be7bf  bison3.patch
+md5sums="a20d99a1c2afbd6a7c6f54e615f1bd63  qtwebkit-opensource-src-5.2.1.tar.xz
 676350288efff119bee8513d9d0b2047  pic.patch
-e86a2f40683cd0633cb35c56cfce16de  fix-rpath.patch"
-sha256sums="d6ee1e9111b0996277a512ae71736a05faa7c0de6d69ac2978adce79c3116a24  qtwebkit-opensource-src-5.1.1.tar.xz
-774f685f14e5341a010dd41a30700b92c336e2500880c8e5024e92a2c42499f2  bison3.patch
+0eb12ab99ceaea7f841d58193f5e6cce  fix-rpath.patch
+7a2a2592e64561fa0bc8c0552181bf00  fix-execinfo.patch"
+sha256sums="ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c  qtwebkit-opensource-src-5.2.1.tar.xz
 51c0e843c5c6453526ee51ed69f2d4a7959767621da321f1082985dfe9f001ef  pic.patch
-340e1a9b89088683c782456a4ebbfff0d6a18e08832f56a6cc0ecd5baadc51e1  fix-rpath.patch"
-sha512sums="aa7e310f1319902131dab5705a5bb2c02252f0d3d6b288ab13478ae42d38664578c52708cf3fa504ffc0b1f9f161e5bbcc65bdf6a7028c043b992211986a5f64  qtwebkit-opensource-src-5.1.1.tar.xz
-daa7aa25caa2cc70f6227d01e4ffdf9374d2c418f2aa34072a430c2c891c1bc5d68c6911f61f24505d4b8e89e572b6405fbfa1cecd55f0c66baa7abc8d0893f1  bison3.patch
+15eb66062e11fef891285b0a288bab9a1b03cd6984f701a7ad890fe6933c1d23  fix-rpath.patch
+d8f6c84cf1a98174aa16660a422cd7b248a012e60bf37a9b5013f2bc61b6d63e  fix-execinfo.patch"
+sha512sums="edfc1c9f9eb51d14cd145cac041850d3627840cb405286864c3f0966742af2bb38310c44bc476be9354f2db2b58a89fbacead2667e0a37f691ab9a87fc3ee5bf  qtwebkit-opensource-src-5.2.1.tar.xz
 9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f  pic.patch
-156db7c346db2bba15332f2e0ab13add1e8e71cf4c165ea1adcfdcf054c73590d28202699bce3a48a8a974081bd6b2bf1b04196014d47ee53a748a56063e2495  fix-rpath.patch"
+28646d969c15f4ec7cec6bd483f9ead0c71becf42fb8e8261d0c209cb1b6973083515ea1c3fcf9ccaf80a22b81bab0401c4f7b4f29c1631b4433b3bf4aff0507  fix-rpath.patch
+f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f  fix-execinfo.patch"
diff --git a/testing/qt5-qtwebkit/bison3.patch b/testing/qt5-qtwebkit/bison3.patch
deleted file mode 100644
index 4070c88e8..000000000
--- a/testing/qt5-qtwebkit/bison3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@digia.com>
-Date: Fri, 16 Aug 2013 18:27:07 +0200
-Subject: [PATCH] ANGLE doesn't build with bison 3.0
-
-https://bugs.webkit.org/show_bug.cgi?id=119798
-
-Reviewed by Antti Koivisto.
-
-Make glslang.y compatible with bison 3.0
-by using %lex-param to set YYLEX_PARAM.
-
-* src/compiler/glslang.y:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Task-number: QTBUG-32913
-Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
-Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
----
- Source/ThirdParty/ANGLE/src/compiler/glslang.y |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index 3cad335..b41e95a 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
- 
- %union {
-     struct {
--- 
-1.7.1
-
diff --git a/testing/qt5-qtwebkit/fix-execinfo.patch b/testing/qt5-qtwebkit/fix-execinfo.patch
new file mode 100644
index 000000000..6fbf4ed8f
--- /dev/null
+++ b/testing/qt5-qtwebkit/fix-execinfo.patch
@@ -0,0 +1,20 @@
+--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp
++++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp
+@@ -64,7 +64,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
+@@ -242,7 +242,7 @@
+ 
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID)
+     *size = backtrace(stack, *size);
+ #elif OS(WINDOWS) && !OS(WINCE)
+     // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/testing/qt5-qtwebkit/fix-rpath.patch b/testing/qt5-qtwebkit/fix-rpath.patch
index b032e90c4..d365b8775 100644
--- a/testing/qt5-qtwebkit/fix-rpath.patch
+++ b/testing/qt5-qtwebkit/fix-rpath.patch
@@ -1,11 +1,11 @@
---- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig	2013-10-10 13:50:38.663745911 +0000
-+++ ./Tools/qmake/mkspecs/features/unix/default_post.prf	2013-10-10 13:50:53.253909607 +0000
-@@ -32,8 +32,6 @@
+--- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig
++++ ./Tools/qmake/mkspecs/features/unix/default_post.prf
+@@ -58,8 +58,6 @@
      QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
  }
  
 -contains(TEMPLATE, app): CONFIG += rpath
 -
- isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) {
-   # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
-   config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
+ CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
+     # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
+     !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory