diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-06 22:47:17 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-06 22:47:17 +0000 |
| commit | 93a9cde1226d0c82849bc71ff4d481d3d2698dc1 (patch) | |
| tree | 1f60e792a546a9484aec590ce687df8f0ec6c697 /extra/libwebkit | |
| parent | c81b3455112a3b09a8341fc8c45a91bd92c15a12 (diff) | |
Mon Jun 6 22:47:16 UTC 2011
Diffstat (limited to 'extra/libwebkit')
| -rw-r--r-- | extra/libwebkit/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/libwebkit/replace-switch-with-given-when.patch | 45 |
2 files changed, 53 insertions, 4 deletions
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 1e32e8195..032056ae3 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121025 2011-04-27 21:44:28Z ibiru $ +# $Id: PKGBUILD 126165 2011-06-01 22:31:25Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" @@ -13,13 +13,17 @@ depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'encha makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool') install=libwebkit.install -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch) +source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz + gcc46.patch + replace-switch-with-given-when.patch) md5sums=('10c969db3b5484c71df1aa9a338377ff' - '970a2fa91b9827dff8e9b9edb4867701') + '970a2fa91b9827dff8e9b9edb4867701' + '3ba708a26b7af0e1e853867966fe14f7') build() { cd "${srcdir}/webkit-${pkgver}" patch -Np1 -i "${srcdir}/gcc46.patch" + patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch" mkdir build-gtk{2,3} ( cd build-gtk2 && _build --with-gtk=2.0 ) diff --git a/extra/libwebkit/replace-switch-with-given-when.patch b/extra/libwebkit/replace-switch-with-given-when.patch new file mode 100644 index 000000000..4e64610bb --- /dev/null +++ b/extra/libwebkit/replace-switch-with-given-when.patch @@ -0,0 +1,45 @@ +diff -upr webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl webkit-1.4.0/Source/WebCore/make-hash-tools.pl +--- webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl 2011-04-25 22:27:15.000000000 +0300 ++++ webkit-1.4.0/Source/WebCore/make-hash-tools.pl 2011-06-02 00:41:26.000000000 +0300 +@@ -20,7 +20,7 @@ + # Boston, MA 02110-1301, USA. + + use strict; +-use Switch; ++use feature 'switch'; + use File::Basename; + + my $outdir = $ARGV[0]; +@@ -28,9 +28,9 @@ shift; + my $option = basename($ARGV[0],".gperf"); + + +-switch ($option) { ++given ($option) { + +-case "DocTypeStrings" { ++when ("DocTypeStrings") { + + my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp"; + my $docTypeStringsGperf = $ARGV[0]; +@@ -38,9 +38,9 @@ case "DocTypeStrings" { + + system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?"; + +-} # case "DocTypeStrings" ++} # when ("DocTypeStrings") + +-case "ColorData" { ++when ("ColorData") { + + my $colorDataGenerated = "$outdir/ColorData.cpp"; + my $colorDataGperf = $ARGV[0]; +@@ -48,6 +48,6 @@ case "ColorData" { + + system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?"; + +-} # case "ColorData" ++} # when ("ColorData") + +-} # switch ($option) ++} # given ($option) |