From 32793d9a5b60ef0591c71c12ad75121d9b155adf Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 25 Mar 2013 00:05:30 -0700
Subject: Mon Mar 25 00:05:30 PDT 2013

---
 extra/qtwebkit/PKGBUILD       | 33 ++++++++++++++++++++++++---------
 extra/qtwebkit/qwebview.patch | 21 +++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 extra/qtwebkit/qwebview.patch

(limited to 'extra/qtwebkit')

diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 90ef10954..190c09638 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 178989 2013-03-01 10:24:37Z andrea $
+# $Id: PKGBUILD 180583 2013-03-23 23:09:38Z td123 $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.beta2
-_pkgver=2.3-beta2
-pkgrel=2
+pkgver=2.3.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
@@ -12,10 +11,15 @@ license=('LGPL2.1' 'GPL3')
 depends=('qt4' 'systemd' 'gstreamer0.10-base')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
-source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}"
-        'use-python2.patch')
-sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08'
-          '315b6ff603f35e5492a036f7082f6aa075dfb607')
+_qtver=4.8.4
+source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}"
+        "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
+        'use-python2.patch'
+        'qwebview.patch')
+sha1sums=('8e0aa2f895376a0a88b55548bfadb270da3708ba'
+          'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+          '315b6ff603f35e5492a036f7082f6aa075dfb607'
+          'ef467fcfc9e74aa88356f27acc21792706ed1e4d')
 
 build() {
   cd webkit-qtwebkit-23
@@ -25,17 +29,28 @@ build() {
   OPTS="--no-webkit2"
   if [ "${CARCH}" = "i686" ]; then
       # FS#33418
-      OPTS="${OPTS} --no-sse2"
+      OPTS="${OPTS} --no-force-sse2"
   fi
 
   export QTDIR=/usr
+  export PATH="/usr/lib/qt4/bin:$PATH"
   Tools/Scripts/build-webkit --qt \
     --makeargs="${MAKEFLAGS}" \
     --prefix=/usr \
     ${OPTS}
+
+  # Build the QWebView plugin (FS#27914)
+  cd ../qt-everywhere-opensource-src-${_qtver}
+  patch -p1 -i "${srcdir}"/qwebview.patch
+  cd tools/designer/src/plugins/qwebview
+  qmake-qt4
+  make
 }
 
 package() {
   cd webkit-qtwebkit-23
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch
new file mode 100644
index 000000000..98f6f0f03
--- /dev/null
+++ b/extra/qtwebkit/qwebview.patch
@@ -0,0 +1,21 @@
+--- 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 += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include
++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib
++
+ CONFIG += designer
+ win32|mac: CONFIG+= debug_and_release
+ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
+--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~	2013-01-09 12:55:43.598892405 +0000
++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro	2013-01-09 12:55:53.352169136 +0000
+@@ -2,9 +2,4 @@
+ CONFIG += ordered
+
+ REQUIRES = !CONFIG(static,shared|static)
+-contains(QT_CONFIG, qt3support): SUBDIRS += widgets
+-win32: SUBDIRS += activeqt
+-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
+ contains(QT_CONFIG, webkit): SUBDIRS += qwebview
+-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
+-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
-- 
cgit v1.2.3-54-g00ecf