[arch-commits] Commit in (webkitgtk2 webkitgtk2/trunk webkitgtk2/trunk/PKGBUILD)

[Jan de Groot]

    Date: Monday, March 25, 2013 @ 11:54:52
  Author: jgc
Revision: 180638

Build standalone again. This is the last release that supports GStreamer 0.10

Added:
  webkitgtk2/
  webkitgtk2/trunk/
Modified:
  webkitgtk2/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

Modified: webkitgtk2/trunk/PKGBUILD
===================================================================
--- webkitgtk/trunk/PKGBUILD    2013-03-25 09:27:17 UTC (rev 180635)
+++ webkitgtk2/trunk/PKGBUILD   2013-03-25 10:54:52 UTC (rev 180638)
@@ -1,21 +1,20 @@
 # $Id$
 # Maintainer: Andreas Radke <andy...@archlinux.org>
 
-pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
+pkgname=webkitgtk2
 pkgver=1.10.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/";
 license=('custom')
-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')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 
'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 
'ruby' 'gtk-doc')
 options=('!libtool' '!emptydirs')
 source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
 sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
 
 build() {
   cd "$srcdir/webkitgtk-$pkgver"
-  mkdir build-gtk2 build-gtk3
+  mkdir build-gtk2
 
   cd build-gtk2
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
@@ -26,29 +25,9 @@
     --with-gtk=2.0 \
     --disable-webkit2
   make all stamp-po
-  
-  cd ../build-gtk3
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0
-  make all stamp-po
 }
 
-package_webkitgtk3() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 
'gtk2' 'gtk3' 'gst-plugins-base-libs')
-  conflicts=('libwebkit3')
-  provides=("libwebkit3=${pkgver}")
-  replaces=('libwebkit3')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE 
"$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
+package() {
   pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
   depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 
'gtk2' 'gstreamer0.10-base')
   conflicts=('libwebkit')