[arch-commits] Commit in qtwebkit/trunk (4 files)
Andrea Scarpino
andrea at archlinux.org
Fri Sep 26 12:01:22 UTC 2014
Date: Friday, September 26, 2014 @ 14:01:22
Author: andrea
Revision: 223173
upgpkg: qtwebkit 2.3.4-1
Upstream release
Modified:
qtwebkit/trunk/PKGBUILD
qtwebkit/trunk/qwebview.patch
Deleted:
qtwebkit/trunk/bison3.patch
qtwebkit/trunk/gst-1.patch
----------------+
PKGBUILD | 18 +++++----------
bison3.patch | 38 --------------------------------
gst-1.patch | 65 -------------------------------------------------------
qwebview.patch | 4 +--
4 files changed, 8 insertions(+), 117 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-26 10:58:12 UTC (rev 223172)
+++ PKGBUILD 2014-09-26 12:01:22 UTC (rev 223173)
@@ -2,8 +2,8 @@
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
pkgname=qtwebkit
-pkgver=2.3.3
-pkgrel=2
+pkgver=2.3.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://trac.webkit.org/wiki/QtWebKit'
pkgdesc='An open source web browser engine (Qt port)'
@@ -12,24 +12,18 @@
makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
conflicts=('qt<4.8')
_qtver=4.8.6
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
"http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
'use-python2.patch'
- 'bison3.patch'
- 'qwebview.patch'
- 'gst-1.patch')
-sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
+ 'qwebview.patch')
+sha1sums=('31bc60de1cf26bb0766d539b4d564651ddbb0650'
'ddf9c20ca8309a116e0466c42984238009525da6'
'315b6ff603f35e5492a036f7082f6aa075dfb607'
- 'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
- '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667'
- '4b4ce9465ea9b107de7a93ce57afce43a2a1877f')
+ 'c3df6107233f466a032e36681cee07f16536657c')
prepare() {
cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/use-python2.patch
- patch -p1 -i "${srcdir}"/bison3.patch
- patch -p1 -i "${srcdir}"/gst-1.patch
cd ../qt-everywhere-opensource-src-${_qtver}
patch -p1 -i "${srcdir}"/qwebview.patch
Deleted: bison3.patch
===================================================================
--- bison3.patch 2014-09-26 10:58:12 UTC (rev 223172)
+++ bison3.patch 2014-09-26 12:01:22 UTC (rev 223173)
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at 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 at 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
-
Deleted: gst-1.patch
===================================================================
--- gst-1.patch 2014-09-26 10:58:12 UTC (rev 223172)
+++ gst-1.patch 2014-09-26 12:01:22 UTC (rev 223173)
@@ -1,65 +0,0 @@
-diff -urNB webkit-qtwebkit-23/Source/WebCore/WebCore.pri new/Source/WebCore/WebCore.pri
---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebCore/WebCore.pri 2013-02-21 15:46:00.298855975 +0100
-@@ -197,8 +197,10 @@
-
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += ENABLE_GLIB_SUPPORT=1
-- PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
--}
-+ DEFINES += GST_API_VERSION=1.0
-+ DEFINES += GST_API_VERSION_1
-+ PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0
-+ }
-
- contains(DEFINES, ENABLE_VIDEO=1) {
- contains(DEFINES, WTF_USE_QTKIT=1) {
-@@ -233,7 +235,7 @@
- contains(DEFINES, WTF_USE_GSTREAMER=1) {
- DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1
- INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer
-- PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10
-+ PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0
- }
- }
-
-diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
---- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2013-02-21 15:46:00.298855975 +0100
-@@ -157,7 +157,7 @@
- virtual void needTouchEvents(bool) { }
- #endif
-
--#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
-+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
- virtual bool supportsFullscreenForNode(const Node*);
- virtual void enterFullscreenForNode(Node*);
- virtual void exitFullscreenForNode(Node*);
-diff -urNB webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
---- webkit-qtwebkit-23/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-15 16:46:12.000000000 +0100
-+++ new/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2013-02-21 15:52:57.400847675 +0100
-@@ -106,10 +106,10 @@
- private:
- ChromeClientQt* m_chromeClient;
- HTMLVideoElement* m_videoElement;
--#if USE(QT_MULTIMEDIA)
-+#if USE(QT_MULTIMEDIA) && !defined(GST_API_VERSION_1)
- QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
- #endif
--#if USE(GSTREAMER)
-+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
- GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
- #endif
- #if USE(QTKIT)
-diff -urNB webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf new/Tools/qmake/mkspecs/features/features.prf
---- webkit-qtwebkit-23/Tools/qmake/mkspecs/features/features.prf 2013-02-15 16:46:12.000000000 +0100
-+++ new/Tools/qmake/mkspecs/features/features.prf 2013-02-21 15:46:00.297855972 +0100
-@@ -186,7 +186,7 @@
- DEFINES += WTF_USE_QTKIT=1
- }
- } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): {
-+ !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
- DEFINES += ENABLE_VIDEO=1
- DEFINES += WTF_USE_GSTREAMER=1
- } else {
Modified: qwebview.patch
===================================================================
--- qwebview.patch 2014-09-26 10:58:12 UTC (rev 223172)
+++ qwebview.patch 2014-09-26 12:01:22 UTC (rev 223173)
@@ -1,8 +1,8 @@
--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/lib
++INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
++LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
+
CONFIG += designer
win32|mac: CONFIG+= debug_and_release
More information about the arch-commits
mailing list