Date: Tuesday, April 2, 2013 @ 23:19:58 Author: jgc Revision: 181263 archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added: webkitgtk/repos/gnome-unstable-i686/PKGBUILD (from rev 181262, webkitgtk/trunk/PKGBUILD) webkitgtk/repos/gnome-unstable-i686/python3.patch (from rev 181262, webkitgtk/trunk/python3.patch) webkitgtk/repos/gnome-unstable-x86_64/PKGBUILD (from rev 181262, webkitgtk/trunk/PKGBUILD) webkitgtk/repos/gnome-unstable-x86_64/python3.patch (from rev 181262, webkitgtk/trunk/python3.patch) Deleted: webkitgtk/repos/gnome-unstable-i686/PKGBUILD webkitgtk/repos/gnome-unstable-i686/python3.patch webkitgtk/repos/gnome-unstable-x86_64/PKGBUILD webkitgtk/repos/gnome-unstable-x86_64/python3.patch -------------------------------------+ /PKGBUILD | 76 ++++++++++++++++++++++++++++++++++ /python3.patch | 40 +++++++++++++++++ gnome-unstable-i686/PKGBUILD | 41 ------------------ gnome-unstable-i686/python3.patch | 20 -------- gnome-unstable-x86_64/PKGBUILD | 41 ------------------ gnome-unstable-x86_64/python3.patch | 20 -------- 6 files changed, 116 insertions(+), 122 deletions(-) Deleted: gnome-unstable-i686/PKGBUILD =================================================================== --- gnome-unstable-i686/PKGBUILD 2013-04-02 21:19:51 UTC (rev 181262) +++ gnome-unstable-i686/PKGBUILD 2013-04-02 21:19:58 UTC (rev 181263) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=webkitgtk -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' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz - python3.patch) -sha256sums=('3800ec67da490750e55cf2ed2c1f947365d9fb49bb0d448c78d017ab06e74fad' - '15cef03698b2e45fcdaf5f6b6de918b86537bf8b1e181fe08cde239344203225') - -build() { - cd "$srcdir/webkitgtk-$pkgver" - patch -Np1 -i ../python3.patch - mkdir build-gtk3 - cd build-gtk3 - ../configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk3 - make all stamp-po -} - -package_webkitgtk3() { - pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - 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" -} Copied: webkitgtk/repos/gnome-unstable-i686/PKGBUILD (from rev 181262, webkitgtk/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2013-04-02 21:19:58 UTC (rev 181263) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=webkitgtk +pkgname=('webkitgtk3') +pkgver=2.0.0 +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' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') +options=('!libtool' '!emptydirs') +source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) +sha256sums=('454cdc4beffc2010f83661059178e33b6d9a07bcd60d09eabdf5d7cda17b88e4') + +build() { + cd "$srcdir/webkitgtk-$pkgver" + mkdir build-gtk3 + cd build-gtk3 + ../configure --prefix=/usr \ + --enable-introspection \ + --disable-silent-rules \ + --libexecdir=/usr/lib/webkitgtk3 + make all stamp-po +} + +package_webkitgtk3() { + pkgdesc="GTK+ Web content engine library for GTK+ 3.0" + 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" +} Deleted: gnome-unstable-i686/python3.patch =================================================================== --- gnome-unstable-i686/python3.patch 2013-04-02 21:19:51 UTC (rev 181262) +++ gnome-unstable-i686/python3.patch 2013-04-02 21:19:58 UTC (rev 181263) @@ -1,20 +0,0 @@ -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) - Copied: webkitgtk/repos/gnome-unstable-i686/python3.patch (from rev 181262, webkitgtk/trunk/python3.patch) =================================================================== --- gnome-unstable-i686/python3.patch (rev 0) +++ gnome-unstable-i686/python3.patch 2013-04-02 21:19:58 UTC (rev 181263) @@ -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) + Deleted: gnome-unstable-x86_64/PKGBUILD =================================================================== --- gnome-unstable-x86_64/PKGBUILD 2013-04-02 21:19:51 UTC (rev 181262) +++ gnome-unstable-x86_64/PKGBUILD 2013-04-02 21:19:58 UTC (rev 181263) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=webkitgtk -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' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz - python3.patch) -sha256sums=('3800ec67da490750e55cf2ed2c1f947365d9fb49bb0d448c78d017ab06e74fad' - '15cef03698b2e45fcdaf5f6b6de918b86537bf8b1e181fe08cde239344203225') - -build() { - cd "$srcdir/webkitgtk-$pkgver" - patch -Np1 -i ../python3.patch - mkdir build-gtk3 - cd build-gtk3 - ../configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk3 - make all stamp-po -} - -package_webkitgtk3() { - pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - 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" -} Copied: webkitgtk/repos/gnome-unstable-x86_64/PKGBUILD (from rev 181262, webkitgtk/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2013-04-02 21:19:58 UTC (rev 181263) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=webkitgtk +pkgname=('webkitgtk3') +pkgver=2.0.0 +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' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') +options=('!libtool' '!emptydirs') +source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) +sha256sums=('454cdc4beffc2010f83661059178e33b6d9a07bcd60d09eabdf5d7cda17b88e4') + +build() { + cd "$srcdir/webkitgtk-$pkgver" + mkdir build-gtk3 + cd build-gtk3 + ../configure --prefix=/usr \ + --enable-introspection \ + --disable-silent-rules \ + --libexecdir=/usr/lib/webkitgtk3 + make all stamp-po +} + +package_webkitgtk3() { + pkgdesc="GTK+ Web content engine library for GTK+ 3.0" + 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" +} Deleted: gnome-unstable-x86_64/python3.patch =================================================================== --- gnome-unstable-x86_64/python3.patch 2013-04-02 21:19:51 UTC (rev 181262) +++ gnome-unstable-x86_64/python3.patch 2013-04-02 21:19:58 UTC (rev 181263) @@ -1,20 +0,0 @@ -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) - Copied: webkitgtk/repos/gnome-unstable-x86_64/python3.patch (from rev 181262, webkitgtk/trunk/python3.patch) =================================================================== --- gnome-unstable-x86_64/python3.patch (rev 0) +++ gnome-unstable-x86_64/python3.patch 2013-04-02 21:19:58 UTC (rev 181263) @@ -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) +