Date: Sunday, March 3, 2013 @ 17:06:02 Author: andrea Revision: 179098
upgpkg: qtwebkit 2.3.beta2-3 Ruby rebuild; re-add the qwebview plugin to Designer 4.x Added: qtwebkit/trunk/qwebview.patch Modified: qtwebkit/trunk/PKGBUILD ----------------+ PKGBUILD | 21 ++++++++++++++++++--- qwebview.patch | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-03 15:53:46 UTC (rev 179097) +++ PKGBUILD 2013-03-03 16:06:02 UTC (rev 179098) @@ -4,7 +4,7 @@ pkgname=qtwebkit pkgver=2.3.beta2 _pkgver=2.3-beta2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' @@ -12,10 +12,15 @@ depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git') conflicts=('qt<4.8') +_qtver=4.8.4 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}" - 'use-python2.patch') + "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + 'use-python2.patch' + 'qwebview.patch') sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08' - '315b6ff603f35e5492a036f7082f6aa075dfb607') + 'f5880f11c139d7d8d01ecb8d874535f7d9553198' + '315b6ff603f35e5492a036f7082f6aa075dfb607' + 'ef467fcfc9e74aa88356f27acc21792706ed1e4d') build() { cd webkit-qtwebkit-23 @@ -33,9 +38,19 @@ --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 } Added: qwebview.patch =================================================================== --- qwebview.patch (rev 0) +++ qwebview.patch 2013-03-03 16:06:02 UTC (rev 179098) @@ -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