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

[Jan de Groot]

    Date: Wednesday, October 17, 2012 @ 13:32:07
  Author: jgc
Revision: 169069

Merge webkitgtk2 and webkitgtk3 again, current version builds gtk2 packages as 
it should

Added:
  webkitgtk/
Modified:
  webkitgtk/trunk/PKGBUILD

----------+
 PKGBUILD |   53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 13 deletions(-)

Modified: webkitgtk/trunk/PKGBUILD
===================================================================
--- webkitgtk3/trunk/PKGBUILD   2012-10-17 12:04:25 UTC (rev 169049)
+++ webkitgtk/trunk/PKGBUILD    2012-10-17 17:32:07 UTC (rev 169069)
@@ -1,34 +1,61 @@
 # $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $
 # Maintainer: Andreas Radke <andy...@archlinux.org>
 
-pkgname=webkitgtk3
-pkgver=1.10.0
+pkgbase=webkitgtk
+pkgname=('webkitgtk2' 'webkitgtk3')
+pkgver=1.10.1
 pkgrel=1
-pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/";
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 
'gtk2' 'gtk3' 'gst-plugins-base-libs')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
-conflicts=('libwebkit3')
-provides=("libwebkit3=${pkgver}")
-replaces=('libwebkit3')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 
'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 
'mesa' 'ruby' 'gtk-doc')
 options=('!libtool' '!emptydirs')
 source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha1sums=('5e022110cef5ff87a4c55ff0358dedd596502a84')
+sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493')
 
 build() {
   cd "$srcdir/webkitgtk-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  mkdir build-gtk2 build-gtk3
+
+  cd build-gtk2
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
     --enable-introspection \
     --disable-silent-rules \
+    --libexecdir=/usr/lib/webkitgtk2 \
+    --with-gstreamer=1.0 \
+    --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() {
-  cd "$srcdir/webkitgtk-$pkgver"
+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"
+  install -Dm644 ../Source/WebKit/LICENSE 
"$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+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')
+  conflicts=('libwebkit')
+  provides=("libwebkit=${pkgver}")
+  replaces=('libwebkit')
+  
+  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  make -j1 DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE 
"$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}