[arch-commits] Commit in libwebkit/trunk (PKGBUILD gcc46.patch)

[Ionut Biru]

    Date: Wednesday, April 27, 2011 @ 17:44:28
  Author: ibiru
Revision: 121025

update to 1.4.0 
drop --enable-video --enable-jit are enabled by default
drop --enable-3d-transforms --enable-mathml since upstream doesn't support them and suggested to remove them

Added:
  libwebkit/trunk/gcc46.patch
Modified:
  libwebkit/trunk/PKGBUILD

-------------+
 PKGBUILD    |   15 ++++++++-------
 gcc46.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-27 20:47:39 UTC (rev 121024)
+++ PKGBUILD	2011-04-27 21:44:28 UTC (rev 121025)
@@ -3,21 +3,23 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.3.13
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="An opensource web content engine"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu>=4.6' 'gstreamer0.10-base' 'libsoup' 'enchant')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
 makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('984adaafac545a89c24351fd4dbd743c')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch)
+md5sums=('10c969db3b5484c71df1aa9a338377ff'
+         '970a2fa91b9827dff8e9b9edb4867701')
 
 build() {
   cd "${srcdir}/webkit-${pkgver}"
+  patch -Np1 -i "${srcdir}/gcc46.patch"
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2 && _build --with-gtk=2.0 )
@@ -26,10 +28,9 @@
 
 _build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-video --enable-introspection \
+    --enable-introspection \
     --with-font-backend=freetype --enable-gtk-doc \
-    --enable-jit --with-unicode-backend=icu \
-    --enable-3d-transforms --enable-mathml \
+    --with-unicode-backend=icu \
     --enable-spellcheck "$@"
   make all stamp-po
 }

Added: gcc46.patch
===================================================================
--- gcc46.patch	                        (rev 0)
+++ gcc46.patch	2011-04-27 21:44:28 UTC (rev 121025)
@@ -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(