diff options
Diffstat (limited to 'extra/qtwebkit')
-rw-r--r-- | extra/qtwebkit/PKGBUILD | 25 | ||||
-rw-r--r-- | extra/qtwebkit/qwebview.patch | 21 |
2 files changed, 3 insertions, 43 deletions
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index d41018102..1f91d23f8 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 178044 2013-02-14 09:17:43Z andrea $ +# $Id: PKGBUILD 178989 2013-03-01 10:24:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit pkgver=2.3.beta2 _pkgver=2.3-beta2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') 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' 'LLIntCLoop32BigEndian.patch') sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08' - 'f5880f11c139d7d8d01ecb8d874535f7d9553198' '315b6ff603f35e5492a036f7082f6aa075dfb607' - 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f' 'af830ae24e2ae5113754c9ae524d27ec0a28a9d6') build() { @@ -52,23 +47,9 @@ build() { --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 } diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch deleted file mode 100644 index 73d5d5032..000000000 --- a/extra/qtwebkit/qwebview.patch +++ /dev/null @@ -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 |