summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2017-06-08 21:42:49 +0200
committerMartchus2017-06-08 21:42:49 +0200
commitc0e944c1f5bd830d1fb6b80b19a792bee4dcc29b (patch)
tree5da523a889f09c9e8dc29018f32973e6ac62b31e
parent99a636d2b0b74b1c82a6eddcfca446b76cad23d7 (diff)
downloadaur-c0e944c1f5bd830d1fb6b80b19a792bee4dcc29b.tar.gz
Update to 5.9.0
-rw-r--r--.SRCINFO26
-rw-r--r--0001-Use-correct-ICU-libs.patch4
-rw-r--r--0002-Use-pkg-config.patch4
-rw-r--r--0003-Use-system-ANGLE-rather-than-bundled-version.patch4
-rw-r--r--0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch4
-rw-r--r--0005-Build-with-smaller-debug-info.patch4
-rw-r--r--0006-Establish-compatibility-with-latest-ANGLE.patch4
-rw-r--r--0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch4
-rw-r--r--0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch4
-rw-r--r--0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch4
-rw-r--r--PKGBUILD43
11 files changed, 53 insertions, 52 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 413db4948124..ed467d56eaff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Feb 9 20:34:28 UTC 2017
+# Thu Jun 8 19:42:49 UTC 2017
pkgbase = mingw-w64-qt5-webkit
pkgdesc = Classes for a WebKit2 based implementation and a new QML API (mingw-w64)
- pkgver = 5.8.0
+ pkgver = 5.9.0
pkgrel = 1
url = https://www.qt.io/
arch = any
@@ -32,7 +32,7 @@ pkgbase = mingw-w64-qt5-webkit
options = !strip
options = !buildflags
options = staticlibs
- source = https://download.qt.io/community_releases/5.8/5.8.0-final/qtwebkit-opensource-src-5.8.0.tar.xz
+ source = https://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz
source = 0001-Use-correct-ICU-libs.patch
source = 0002-Use-pkg-config.patch
source = 0003-Use-system-ANGLE-rather-than-bundled-version.patch
@@ -42,16 +42,16 @@ pkgbase = mingw-w64-qt5-webkit
source = 0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
source = 0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
source = 0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
- md5sums = 60a6935aca4a7c553d0ec4646ceed3b4
- md5sums = 208ff77dc291de1c91b8143e7fb9c1ae
- md5sums = 1ea0dc59ce4283e533126a0abb30f21a
- md5sums = 695ba1f69129024dd3abb0bf6eb2b736
- md5sums = 6b65ea17730b99ee3e24821089624d56
- md5sums = fdacb552245d089c77017977f52e8d51
- md5sums = 5964c02a0dcf8c4af354bc0a0f4babd3
- md5sums = 83fae95c74b670d84a03985d3dbd83d0
- md5sums = 307d500b217ca9183d9f97d617461803
- md5sums = a9fd04dcfe19ef9458a0485219f24c64
+ sha256sums = 8dad193b740055a998312e04a040f2e32a923c0823b2d239b24eab08276a4e04
+ sha256sums = f1ba67d7ed37fe6902fb4febf6b1f6963845b6211982609016e8a93cd3a892ed
+ sha256sums = 76516383d7ca1f1c0af9d72d4e7c153d7174fe5c60bef64f16db62a4b3fb8171
+ sha256sums = 0dd645333df5ee3907ad105fe58bd5371951389ab9d6b6fea35e06d8ed4f7019
+ sha256sums = 77e26af64a5dc252ee3c57609ffea6119fdbeceda3202d8b5c847b91d23ab937
+ sha256sums = 88c8a92ede8bf415b6aa119bde2e77de57eeb151442524c590327f0a468c491d
+ sha256sums = 85248547a2154883c64500b0b7c50dcf63254f7be960ebda3aaf64e4758f38f4
+ sha256sums = 99d5fc8cda32cc1b5d0cb7de8c47bda1f5a75dc85f451aa5cb8b02d830c8c7da
+ sha256sums = 1a280a9584317f3490da5e8e95f3f0588b09bc711c4b6836c0e0f0e79f7ab77f
+ sha256sums = ee98d9f1fc6cda090434bc366dff8cf6733d3bfd21ac3fe3f9cb47044b44ca40
pkgname = mingw-w64-qt5-webkit
diff --git a/0001-Use-correct-ICU-libs.patch b/0001-Use-correct-ICU-libs.patch
index ac0b5ede7e18..96db780de672 100644
--- a/0001-Use-correct-ICU-libs.patch
+++ b/0001-Use-correct-ICU-libs.patch
@@ -1,4 +1,4 @@
-From 5d5d3ebbe9edcec899f4d11ce6709c533b446e25 Mon Sep 17 00:00:00 2001
+From 0462be532f28b0857b54521d3e7a0fa724a6d355 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 21:53:59 +0200
Subject: [PATCH 1/9] Use correct ICU libs
@@ -23,5 +23,5 @@ index 69e4cd1f3..b553075c2 100644
CONFIG(debug, debug|release) {
LIBS += -lsicuind -lsicuucd -lsicudtd
--
-2.11.0
+2.13.0
diff --git a/0002-Use-pkg-config.patch b/0002-Use-pkg-config.patch
index 0df2d658e87f..c722131ab526 100644
--- a/0002-Use-pkg-config.patch
+++ b/0002-Use-pkg-config.patch
@@ -1,4 +1,4 @@
-From 8143ac0ef800d154d1dc24204e98e346f7af97d6 Mon Sep 17 00:00:00 2001
+From 1e1839b2e3f620c59383c0889c342e5972103e29 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 21:56:42 +0200
Subject: [PATCH 2/9] Use pkg-config
@@ -21,5 +21,5 @@ index b306c3b82..95592c25d 100644
debug: CONFIG += use_all_in_one_files
--
-2.11.0
+2.13.0
diff --git a/0003-Use-system-ANGLE-rather-than-bundled-version.patch b/0003-Use-system-ANGLE-rather-than-bundled-version.patch
index d46afe9f1b50..daaad32887ef 100644
--- a/0003-Use-system-ANGLE-rather-than-bundled-version.patch
+++ b/0003-Use-system-ANGLE-rather-than-bundled-version.patch
@@ -1,4 +1,4 @@
-From 15e8abbefe0e71c29c106f1e7b54bd1f4b7433f8 Mon Sep 17 00:00:00 2001
+From 29cdc4ee740431916eb78a2fc0fdc8680de16319 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Nov 2016 12:14:01 +0100
Subject: [PATCH 3/9] Use system ANGLE rather than bundled version
@@ -64,5 +64,5 @@ index 11b59e58b..e9709a238 100644
leveldb.file = Source/ThirdParty/leveldb/leveldb.pro
leveldb.makefile = Makefile.leveldb
--
-2.11.0
+2.13.0
diff --git a/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch b/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch
index 0c2e9af67dc5..af98177a6ee1 100644
--- a/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch
+++ b/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch
@@ -1,4 +1,4 @@
-From 1059d77bb26bb03485fa2ab2f5770dec215a2de5 Mon Sep 17 00:00:00 2001
+From 69c1909da075f68961276dc4ca3720ee0346ba2b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 22:08:26 +0200
Subject: [PATCH 4/9] Prevent symbols not being exported in Qt5WebKit.dll
@@ -42,5 +42,5 @@ index fe222c2fc..46d629c05 100644
QWEBKIT_EXPORT QString qWebKitVersion();
QWEBKIT_EXPORT int qWebKitMajorVersion();
--
-2.11.0
+2.13.0
diff --git a/0005-Build-with-smaller-debug-info.patch b/0005-Build-with-smaller-debug-info.patch
index 167853f6175b..7911114fecdc 100644
--- a/0005-Build-with-smaller-debug-info.patch
+++ b/0005-Build-with-smaller-debug-info.patch
@@ -1,4 +1,4 @@
-From 75d96925cc98690d90d8210566a6311c963219d4 Mon Sep 17 00:00:00 2001
+From 61bf0f4560c108b844d3807d10852efc5a2da47b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 22:13:44 +0200
Subject: [PATCH 5/9] Build with smaller debug info
@@ -106,5 +106,5 @@ index 3611524e6..f54b9cabf 100644
$$SOURCE_DIR \
$$SOURCE_DIR/Platform \
--
-2.11.0
+2.13.0
diff --git a/0006-Establish-compatibility-with-latest-ANGLE.patch b/0006-Establish-compatibility-with-latest-ANGLE.patch
index 6c953cc69b9d..72c23fb11bb0 100644
--- a/0006-Establish-compatibility-with-latest-ANGLE.patch
+++ b/0006-Establish-compatibility-with-latest-ANGLE.patch
@@ -1,4 +1,4 @@
-From 5134bfb5375b9bedf5bdb15c8fadf441285802d9 Mon Sep 17 00:00:00 2001
+From f956920ce7932e20e315656e72282007087b6ab9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 22:19:57 +0200
Subject: [PATCH 6/9] Establish compatibility with latest ANGLE
@@ -291,5 +291,5 @@ index 43b546d18..73b61e2cd 100644
if (!m_private->m_surface || !m_private->m_platformContext) {
LOG_ERROR("GraphicsContext3D: GL context creation failed.");
--
-2.11.0
+2.13.0
diff --git a/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch b/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
index 4c4a8602eaf3..9fa3a1788f48 100644
--- a/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
+++ b/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
@@ -1,4 +1,4 @@
-From e2623801cfd15fdf24f0af2bfc01bdfb2b0ca22d Mon Sep 17 00:00:00 2001
+From bd24ddb0593aa238d80532c76390497bbe1d2ed2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 22:21:54 +0200
Subject: [PATCH 7/9] Include intrin.h for declaration of _mm_mfence
@@ -21,5 +21,5 @@ index 8f950c718..142c0db3e 100644
#include <windows.h>
#elif OS(QNX)
--
-2.11.0
+2.13.0
diff --git a/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch b/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
index 3c8b2725c62a..04431ef117d5 100644
--- a/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
+++ b/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
@@ -1,4 +1,4 @@
-From 8f0a0019f827815161291e4f63dfe8d15d32bd60 Mon Sep 17 00:00:00 2001
+From 84fa5b7bdb6e48635bee214daca34cee49289ef8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Nov 2016 12:46:27 +0100
Subject: [PATCH 8/9] Link against ANGLE even if Qt is configured not to
@@ -31,5 +31,5 @@ index d6c32e80c..42aadaacc 100644
}
} else {
--
-2.11.0
+2.13.0
diff --git a/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch b/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
index ba117b70c3ef..c7f7481b5479 100644
--- a/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
+++ b/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
@@ -1,4 +1,4 @@
-From eeb2ce34b4997d7f959ff7c789441ed97c2f1934 Mon Sep 17 00:00:00 2001
+From dc3c88d8b9b4afeb6efb60069560e90911ab5d83 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Fri, 4 Nov 2016 00:44:49 +0300
Subject: [PATCH 9/9] Fixed crash (probably miscompilation) with MinGW-w64
@@ -47,5 +47,5 @@ index 2a1c20278..25fbdc319 100644
virtual int scrollBarPolicy(Qt::Orientation) const OVERRIDE;
virtual void emitUrlChanged() OVERRIDE;
--
-2.11.0
+2.13.0
diff --git a/PKGBUILD b/PKGBUILD
index 05420eee674e..dae3a4cde09b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
_qt_module=qtwebkit
pkgname=mingw-w64-qt5-webkit
-pkgver=5.8.0
+pkgver=5.9.0
pkgrel=1
arch=('any')
pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
@@ -44,25 +44,25 @@ url='https://www.qt.io/'
_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
groups=('mingw-w64-qt5')
source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}-final/${_pkgfqn}.tar.xz"
- '0001-Use-correct-ICU-libs.patch'
- '0002-Use-pkg-config.patch'
- '0003-Use-system-ANGLE-rather-than-bundled-version.patch'
- '0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch'
- '0005-Build-with-smaller-debug-info.patch'
- '0006-Establish-compatibility-with-latest-ANGLE.patch'
- '0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch'
- '0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch'
- '0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch')
-md5sums=('60a6935aca4a7c553d0ec4646ceed3b4'
- '208ff77dc291de1c91b8143e7fb9c1ae'
- '1ea0dc59ce4283e533126a0abb30f21a'
- '695ba1f69129024dd3abb0bf6eb2b736'
- '6b65ea17730b99ee3e24821089624d56'
- 'fdacb552245d089c77017977f52e8d51'
- '5964c02a0dcf8c4af354bc0a0f4babd3'
- '83fae95c74b670d84a03985d3dbd83d0'
- '307d500b217ca9183d9f97d617461803'
- 'a9fd04dcfe19ef9458a0485219f24c64')
+ '0001-Use-correct-ICU-libs.patch'
+ '0002-Use-pkg-config.patch'
+ '0003-Use-system-ANGLE-rather-than-bundled-version.patch'
+ '0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch'
+ '0005-Build-with-smaller-debug-info.patch'
+ '0006-Establish-compatibility-with-latest-ANGLE.patch'
+ '0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch'
+ '0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch'
+ '0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch')
+sha256sums=('8dad193b740055a998312e04a040f2e32a923c0823b2d239b24eab08276a4e04'
+ 'f1ba67d7ed37fe6902fb4febf6b1f6963845b6211982609016e8a93cd3a892ed'
+ '76516383d7ca1f1c0af9d72d4e7c153d7174fe5c60bef64f16db62a4b3fb8171'
+ '0dd645333df5ee3907ad105fe58bd5371951389ab9d6b6fea35e06d8ed4f7019'
+ '77e26af64a5dc252ee3c57609ffea6119fdbeceda3202d8b5c847b91d23ab937'
+ '88c8a92ede8bf415b6aa119bde2e77de57eeb151442524c590327f0a468c491d'
+ '85248547a2154883c64500b0b7c50dcf63254f7be960ebda3aaf64e4758f38f4'
+ '99d5fc8cda32cc1b5d0cb7de8c47bda1f5a75dc85f451aa5cb8b02d830c8c7da'
+ '1a280a9584317f3490da5e8e95f3f0588b09bc711c4b6836c0e0f0e79f7ab77f'
+ 'ee98d9f1fc6cda090434bc366dff8cf6733d3bfd21ac3fe3f9cb47044b44ca40')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@@ -100,7 +100,8 @@ build() {
export CPATH="${default_cpath}:/usr/$_arch/include:/usr/$_arch/include/GLSLANG"
${_arch}-qmake-qt5 \
- "QMAKE_CXXFLAGS+=-Wno-c++0x-compat" \
+ 'QMAKE_CXXFLAGS+=-Wno-c++0x-compat' \
+ 'QMAKE_CXXFLAGS+=-Wno-expansion-to-defined' \
../WebKit.pro
make
popd