Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 28 insertions, 21 deletions

diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
index 035ad7e92..c7a7d2206 100644
--- a/extra/webkitgtk2/PKGBUILD
+++ b/extra/webkitgtk2/PKGBUILD
@@ -1,20 +1,29 @@
-# $Id: PKGBUILD 184447 2013-05-06 19:40:08Z foutrelis $
+# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk2
 pkgver=1.10.2
-pkgrel=5
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=7
+pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
+arch=(i686 x86_64 mips64el)
 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 webkitgtk-$pkgver
+
+  # Suppress a *lot* of gcc 4.8 warnings
+  CPPFLAGS+=" -Wno-unused-local-typedefs"
 
   if [ "$CARCH" = "mips64el" ]; then
      # Fix MIPS N32 support.
@@ -30,25 +39,23 @@ build() {
       extra="--disable-fast-malloc --disable-optimizations"
   fi
 
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+  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 $extra
+    $extra
+
+  # 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"
+  rm -r "$pkgdir/usr/share/gtk-doc/html/webkitgtk"
 }