[arch-commits] Commit in qtwebkit/trunk (PKGBUILD qwebview.patch)

[Andrea Scarpino]

    Date: Sunday, February 24, 2013 @ 21:03:42
  Author: andrea
Revision: 178510

qt4 rebuild; the qwebview plugin isn't needed anymore since it is shipped with Qt5 now

Modified:
  qtwebkit/trunk/PKGBUILD
Deleted:
  qtwebkit/trunk/qwebview.patch

----------------+
 PKGBUILD       |   27 ++++-----------------------
 qwebview.patch |   21 ---------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-24 20:02:02 UTC (rev 178509)
+++ PKGBUILD	2013-02-24 20:03:42 UTC (rev 178510)
@@ -4,23 +4,18 @@
 pkgname=qtwebkit
 pkgver=2.3.beta2
 _pkgver=2.3-beta2
-pkgrel=1
+pkgrel=2
 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' 'systemd' 'gstreamer0.10-base')
+depends=('qt4' 'systemd' 'gstreamer0.10-base')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
-_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')
+        'use-python2.patch')
 sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08'
-          'f5880f11c139d7d8d01ecb8d874535f7d9553198'
-          '315b6ff603f35e5492a036f7082f6aa075dfb607'
-          'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
+          '315b6ff603f35e5492a036f7082f6aa075dfb607')
 
 build() {
   cd webkit-qtwebkit-23
@@ -38,23 +33,9 @@
     --makeargs="${MAKEFLAGS}" \
     --prefix=/usr \
     ${OPTS}
-
-  cd ../
-
-  # 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
-  make
 }
 
 package() {
   cd webkit-qtwebkit-23
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
-  cd ../
-
-  cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
-  make INSTALL_ROOT="${pkgdir}" install
 }

Deleted: qwebview.patch
===================================================================
--- qwebview.patch	2013-02-24 20:02:02 UTC (rev 178509)
+++ qwebview.patch	2013-02-24 20:03:42 UTC (rev 178510)
@@ -1,21 +0,0 @@
---- 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