diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
commit | 33fcf0e7b95e530b849e59e90fdea4001e01283d (patch) | |
tree | 5eab4f238207cce42c8351067ade9999df065a1f /extra/qtwebkit | |
parent | 3b0910bf6527c3b761d9579b2ed37a9a42595fa3 (diff) | |
parent | a1922d0ec660fdc1892f2783515f781c090df0a9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/libopenraw/PKGBUILD
community/smalltalk/PKGBUILD
core/coreutils/PKGBUILD
core/libarchive/PKGBUILD
extra/dhcp/PKGBUILD
extra/gmime/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libreoffice/PKGBUILD
extra/lirc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sdl_image/PKGBUILD
extra/sdl_net/PKGBUILD
extra/sdl_ttf/PKGBUILD
extra/spamassassin/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/tumbler/PKGBUILD
extra/vim/PKGBUILD
extra/wipe/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kde-np.pam
kde-unstable/kdebase-workspace/kde.pam
multilib/binutils-multilib/PKGBUILD
multilib/chuck/PKGBUILD
multilib/dev86/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sdl_ttf/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/nspluginwrapper/PKGBUILD
multilib/q4wine/PKGBUILD
multilib/wine/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
Diffstat (limited to 'extra/qtwebkit')
-rw-r--r-- | extra/qtwebkit/PKGBUILD | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 651370de9..d9a10d3f3 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145469 2011-12-22 22:02:51Z andrea $ +# $Id: PKGBUILD 146627 2012-01-14 15:25:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit pkgver=2.2.1 -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)' @@ -13,8 +13,10 @@ makedepends=('python2' 'mesa' 'chrpath') conflicts=('qt<4.8') #source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-4.8.0.tar.bz2" 'python2-path.patch') sha1sums=('283fc116882157df0474af496be73bb9b34cb001' + '0e44b27a0f71aceb91a89a2c28ab6331126518d9' 'b0ef3d5596171e3900a685df9bcfac3068ad6330') build() { @@ -28,6 +30,11 @@ build() { --makeargs="${MAKEFLAGS}" \ --release \ --3d-canvas + + # Build the QWebView plugin (FS#27914) + cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview + qmake + make } package() { @@ -36,4 +43,7 @@ package() { # Fix RPATH chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so + + cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview + make INSTALL_ROOT="${pkgdir}" install } |