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

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

3 files changed, 65 insertions, 25 deletions

diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
index 22783b700..d2b541f1e 100644
--- a/extra/libwebkit/PKGBUILD
+++ b/extra/libwebkit/PKGBUILD
@@ -1,39 +1,57 @@
-# $Id: PKGBUILD 109463 2011-02-09 20:43:10Z andyrtr $
+# $Id: PKGBUILD 121025 2011-04-27 21:44:28Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
-pkgname=libwebkit
-pkgver=1.2.7
+pkgbase=libwebkit
+pkgname=(libwebkit libwebkit3)
+pkgver=1.4.0
 pkgrel=1
-pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
+pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://webkitgtk.org/"
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'gtk2' 'icu>=4.6' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection')
-provides=('webkitgtk-svn')
-conflicts=('webkitgtk-svn')
-replaces=('webkitgtk-svn')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
+makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool')
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-        introspection.patch)
-md5sums=('25c7e548b65aeb6d83c0182c32ef0927'
-         'e7e83312618cb30cc9a1567a21cd0e06')
-
+install=libwebkit.install
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch)
+md5sums=('10c969db3b5484c71df1aa9a338377ff'
+         '970a2fa91b9827dff8e9b9edb4867701')
 
 build() {
   cd "${srcdir}/webkit-${pkgver}"
-  patch -Np0 -i "${srcdir}/introspection.patch"
-
-  ./configure --prefix=/usr \
-      --enable-video --enable-introspection \
-      --with-font-backend=freetype --enable-gtk-doc \
-      --enable-jit --with-unicode-backend=icu
-  #disable makeflags if parallel building fails
-  make ${MAKEFLAGS}
+  patch -Np1 -i "${srcdir}/gcc46.patch"
+  mkdir build-gtk{2,3}
+
+  ( cd build-gtk2 && _build --with-gtk=2.0 )
+  ( cd build-gtk3 && _build --with-gtk=3.0 )
 }
 
-package() {
-  cd "${srcdir}/webkit-${pkgver}"
+_build() {
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --with-font-backend=freetype --enable-gtk-doc \
+    --with-unicode-backend=icu \
+    --enable-spellcheck "$@"
+  make all stamp-po
+}
+
+package_libwebkit() {
+  pkgdesc+=" (for GTK2)"
+  depends+=(gtk2)
+  provides=('webkitgtk-svn')
+  conflicts=('webkitgtk-svn')
+  replaces=('webkitgtk-svn')
+
+  cd "$srcdir/webkit-$pkgver/build-gtk2"
+  make DESTDIR="${pkgdir}" install
+  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 WebKit/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
 }
diff --git a/extra/libwebkit/gcc46.patch b/extra/libwebkit/gcc46.patch
new file mode 100644
index 000000000..befd892d4
--- /dev/null
+++ b/extra/libwebkit/gcc46.patch
@@ -0,0 +1,11 @@
+Index: trunk/Source/WebCore/dom/make_names.pl

+===================================================================

+--- trunk/Source/WebCore/dom/make_names.pl	(revision 73989)

++++ trunk/Source/WebCore/dom/make_names.pl	(revision 84123)

+@@ -66,5 +66,5 @@

+     $gccLocation = "/usr/bin/gcc";

+ }

+-my $preprocessor = $gccLocation . " -E -P -x c++";

++my $preprocessor = $gccLocation . " -E -x c++";

+ 

+ GetOptions(

diff --git a/extra/libwebkit/libwebkit.install b/extra/libwebkit/libwebkit.install
new file mode 100644
index 000000000..24072f316
--- /dev/null
+++ b/extra/libwebkit/libwebkit.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}