Date: Monday, March 25, 2013 @ 15:18:24
Author: jgc
Revision: 180658
upgpkg: webkitgtk 1.11.92-1
Added:
webkitgtk/trunk/python3.patch
Modified:
webkitgtk/trunk/PKGBUILD
---------------+
PKGBUILD | 50 +++++++++++++++-----------------------------------
python3.patch | 20 ++++++++++++++++++++
2 files changed, 35 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-25 14:06:21 UTC (rev 180657)
+++ PKGBUILD 2013-03-25 14:18:24 UTC (rev 180658)
@@ -2,60 +2,40 @@
# Maintainer: Andreas Radke <andy...@archlinux.org>
pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.2
-pkgrel=3
+pkgname=('webkitgtk3')
+pkgver=1.11.92
+pkgrel=1
arch=('i686' 'x86_64')
url="http://webkitgtk.org/";
license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue'
'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf'
'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue'
'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python'
'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp')
options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
+source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
+ python3.patch)
+sha256sums=('3800ec67da490750e55cf2ed2c1f947365d9fb49bb0d448c78d017ab06e74fad'
+ '15cef03698b2e45fcdaf5f6b6de918b86537bf8b1e181fe08cde239344203225')
build() {
cd "$srcdir/webkitgtk-$pkgver"
- mkdir build-gtk2 build-gtk3
-
- cd build-gtk2
- PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+ patch -Np1 -i ../python3.patch
+ mkdir build-gtk3
+ cd build-gtk3
+ ../configure --prefix=/usr \
--enable-introspection \
--disable-silent-rules \
- --libexecdir=/usr/lib/webkitgtk2 \
- --with-gstreamer=0.10 \
- --with-gtk=2.0 \
- --disable-webkit2
+ --libexecdir=/usr/lib/webkitgtk3
make all stamp-po
-
- cd ../build-gtk3
- PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
- --enable-introspection \
- --disable-silent-rules \
- --libexecdir=/usr/lib/webkitgtk3 \
- --with-gstreamer=1.0
- make all stamp-po
}
package_webkitgtk3() {
pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
- depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue'
'gtk2' 'gtk3' 'gst-plugins-base-libs')
+ depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue'
'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp')
conflicts=('libwebkit3')
provides=("libwebkit3=${pkgver}")
replaces=('libwebkit3')
+ optdepends=('gtk2: Webkit2 plugin support')
cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
make -j1 DESTDIR="$pkgdir" install
install -Dm644 ../Source/WebKit/LICENSE
"$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
}
-
-package_webkitgtk2() {
- 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"
- make -j1 DESTDIR="$pkgdir" install
- install -Dm644 ../Source/WebKit/LICENSE
"$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
Added: python3.patch
===================================================================
--- python3.patch (rev 0)
+++ python3.patch 2013-03-25 14:18:24 UTC (rev 180658)
@@ -0,0 +1,20 @@
+diff --git a/Tools/gtk/generate-feature-defines-files
b/Tools/gtk/generate-feature-defines-files
+index
1a92bf50a05831655308cb62646eb05a6db4b63c..f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9
100755
+--- a/Tools/gtk/generate-feature-defines-files
++++ b/Tools/gtk/generate-feature-defines-files
+@@ -32,13 +32,13 @@ def write_file_if_contents_changed(filename, contents):
+
+ def write_feature_defines_header(feature_defines):
+ contents = ''
+- for (feature, value) in feature_defines.iteritems():
++ for (feature, value) in feature_defines.items():
+ contents += '#define {0} {1}\n'.format(feature, value)
+ write_file_if_contents_changed("WebKitFeatures.h", contents)
+
+ def write_flattened_feature_defines_file(feature_defines):
+ contents = ''
+- for (feature, value) in feature_defines.iteritems():
++ for (feature, value) in feature_defines.items():
+ contents += '{0}={1}\n'.format(feature, value)
+ write_file_if_contents_changed("WebKitFeatures.txt", contents)
+
