qtwebkit: update to 2.3.4

1 files changed, 42 insertions, 82 deletions

diff --git a/abs/core/qtwebkit/PKGBUILD b/abs/core/qtwebkit/PKGBUILD
index 8c289f4..f02a975 100644
--- a/abs/core/qtwebkit/PKGBUILD
+++ b/abs/core/qtwebkit/PKGBUILD
@@ -1,106 +1,66 @@
-# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.2.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)'
 license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gstreamer0.10-base')
-makedepends=('python2' 'mesa' 'gperf')
+depends=('qt4' 'systemd' 'gst-plugins-base-libs')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
-_qtver=4.8.2
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz"
-        "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz"
-        'glibc.patch'
-        'fix-build.patch')
-sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4'
-          '33c83272ed8110180ee6e7e3733e68cc513e2802'
-          '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333'
-          'c6dfb001b0412a8adfcb7f1f565a24314a753448')
+_qtver=4.8.6
+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'
+        'qwebview.patch')
+sha1sums=('31bc60de1cf26bb0766d539b4d564651ddbb0650'
+          'ddf9c20ca8309a116e0466c42984238009525da6'
+          '315b6ff603f35e5492a036f7082f6aa075dfb607'
+          'c3df6107233f466a032e36681cee07f16536657c')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/use-python2.patch
+
+  cd ../qt-everywhere-opensource-src-${_qtver}
+  patch -p1 -i "${srcdir}"/qwebview.patch
+}
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-source
-
-  patch -p1 -i "${srcdir}"/glibc.patch
-  patch -p1 -i "${srcdir}"/fix-build.patch
-
-  # move headers
-  mv include Source/
+  cd ${pkgname}-${pkgver}
 
-  cd Source
-  qmake
-  cd ../
+  OPTS="--no-webkit2"
+  if [ "${CARCH}" = "i686" ]; then
+      # FS#33418
+      OPTS="${OPTS} --no-force-sse2"
+  fi
 
-  make -C Source
+  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 "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview
-  qmake
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+  qmake-qt4
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}-source
-  make INSTALL_ROOT="${pkgdir}" -C Source install
+  cd ${pkgname}-${pkgver}
+  make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
 
-  cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
   make INSTALL_ROOT="${pkgdir}" install
-}
-
-_source() {
-  local _current_dir=$(pwd)
-  local _tmp=$(mktemp -d --tmpdir)
-
-  cd _tmp
-  git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
-
-  # fetch the make-package.py script
-  git clone git://qt.gitorious.org/qtwebkit/tools.git
-
-  # create the qtwebkit tarball
-  cd qtwebkit
-  git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver}
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    ../tools/make-package.py
-  python2 ../tools/make-package.py
-
-  mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/
-
-  cd ..
-  
-  # create the qwebview plugin tarball
-  mkdir qwebview-${_qtver}
-  cd qwebview-${_qtver}
-  wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz
-  tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz
-  mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/
-  cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \
-    ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/
-
-  cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF"
-TEMPLATE = subdirs
-CONFIG += ordered
-
-REQUIRES = !CONFIG(static,shared|static)
-contains(QT_CONFIG, webkit): SUBDIRS += qwebview
-EOF
-
-  cat > $(_tmp)/header.txt <<"EOF"
-INCLUDEPATH += ../../../Source/include
-LIBS += -L../../../Source/lib
-
-EOF
-
-  cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \
-    ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri
-
-  tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source
 
-  mv qwebview-${_qtver}.tar.xz ${_current_dir}/
+  # Fix wrong libs path in pkgconfig file
+  perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/QtWebKit.pc
 
-  rm -rf ${_tmp}
+  # Fix wrong path in prl file
+  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' "${pkgdir}"/usr/lib/libQtWebKit.prl
 }