Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 11 insertions, 12 deletions

diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
index 6020e7002..d218cdab2 100644
--- a/extra/libwebkit/PKGBUILD
+++ b/extra/libwebkit/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 139389 2011-10-01 19:00:15Z ibiru $
+# $Id: PKGBUILD 148844 2012-02-05 11:52:38Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.6.1
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-checkdepends=('hspell')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c11743694b1b71dad287b2e7a9e73b05')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3')
 
 build() {
-  cd "${srcdir}/webkit-${pkgver}"
+  cd "$srcdir/webkit-$pkgver"
   mkdir build-gtk{2,3}
 
   # Fix MIPS N32 support.
@@ -32,7 +31,7 @@ build() {
 _build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
     --enable-introspection \
-    --with-font-backend=freetype --enable-gtk-doc \
+    --with-font-backend=freetype \
     --with-unicode-backend=icu \
     --enable-spellcheck "$@"
   make all stamp-po
@@ -44,14 +43,14 @@ package_libwebkit() {
 
   cd "$srcdir/webkit-$pkgver/build-gtk2"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
 }
 
 package_libwebkit3() {
   pkgdesc+=" (for GTK3)"
   depends+=(gtk3)
 
-  cd "${srcdir}/webkit-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
+  cd "$srcdir/webkit-$pkgver/build-gtk3"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
 }