diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-08 10:46:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-08 10:46:41 -0300 |
| commit | 7a76a1172d8ffd51f5d39cc500517cf398f473e7 (patch) | |
| tree | 25da28d63ed2ceaeb93e2fb6496fce5728f9c031 /extra/webkitgtk | |
| parent | 82dd72a1e6566fb0ef971d2432204d6eeed4d5aa (diff) | |
| parent | ca63f47c4736ce7a6f6b544c50cf29d2ffe563c1 (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
Conflicts:
extra/webkitgtk/PKGBUILD
Diffstat (limited to 'extra/webkitgtk')
| -rw-r--r-- | extra/webkitgtk/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 7bd428411..d2c9e74fa 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -4,11 +4,11 @@ pkgbase=webkitgtk pkgname=('webkitgtk2' 'webkitgtk3') pkgver=1.10.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') +makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') options=('!libtool' '!emptydirs') source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493') @@ -36,7 +36,7 @@ build() { --enable-introspection \ --disable-silent-rules \ --libexecdir=/usr/lib/webkitgtk2 \ - --with-gstreamer=1.0 \ + --with-gstreamer=0.10 \ --with-gtk=2.0 \ --disable-webkit2 $extra make all stamp-po @@ -64,7 +64,7 @@ package_webkitgtk3() { package_webkitgtk2() { pkgdesc="GTK+ Web content engine library for GTK+ 2.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gst-plugins-base-libs') + depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base') conflicts=('libwebkit') provides=("libwebkit=${pkgver}") replaces=('libwebkit') |