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

[Jan Steffens]

    Date: Friday, June 14, 2013 @ 20:46:17
  Author: heftig
Revision: 188465

fix dep. sync with webkitgtk

Modified:
  webkitgtk2/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2013-06-14 15:46:18 UTC (rev 188464)
+++ PKGBUILD    2013-06-14 18:46:17 UTC (rev 188465)
@@ -3,38 +3,39 @@
 
 pkgname=webkitgtk2
 pkgver=1.10.2
-pkgrel=5
-arch=('i686' 'x86_64')
+pkgrel=6
+pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
+arch=(i686 x86_64)
 url="http://webkitgtk.org/";
-license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 
'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 
'ruby' 'gtk-doc')
-options=('!libtool' '!emptydirs')
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk2 
gstreamer0.10-base
+         icu)
+makedepends=(gperf gobject-introspection python2 mesa ruby gtk-doc)
+optdepends=()
+provides=("libwebkit=${pkgver}")
+conflicts=(libwebkit)
+replaces=(libwebkit)
+options=(!libtool !emptydirs)
 source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
 sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
 
 build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  mkdir build-gtk2
-
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+  cd webkitgtk-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --libexecdir=/usr/lib/$pkgname \
     --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk2 \
+    --disable-webkit2 \
     --with-gstreamer=0.10 \
-    --with-gtk=2.0 \
-    --disable-webkit2
+    --with-gtk=2.0
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make all stamp-po
 }
 
 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')
-  provides=("libwebkit=${pkgver}")
-  replaces=('libwebkit')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  cd webkitgtk-$pkgver
   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"
 }