[arch-commits] Commit in webkitgtk/repos (12 files)
Jan Steffens
heftig at nymeria.archlinux.org
Fri Jun 7 10:36:06 UTC 2013
Date: Friday, June 7, 2013 @ 12:36:06
Author: heftig
Revision: 187872
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
webkitgtk/repos/testing-i686/PKGBUILD
(from rev 187871, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/testing-i686/changeset_150963.diff
(from rev 187871, webkitgtk/trunk/changeset_150963.diff)
webkitgtk/repos/testing-i686/python3.patch
(from rev 187871, webkitgtk/trunk/python3.patch)
webkitgtk/repos/testing-x86_64/PKGBUILD
(from rev 187871, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/testing-x86_64/changeset_150963.diff
(from rev 187871, webkitgtk/trunk/changeset_150963.diff)
webkitgtk/repos/testing-x86_64/python3.patch
(from rev 187871, webkitgtk/trunk/python3.patch)
Deleted:
webkitgtk/repos/testing-i686/PKGBUILD
webkitgtk/repos/testing-i686/changeset_150963.diff
webkitgtk/repos/testing-i686/python3.patch
webkitgtk/repos/testing-x86_64/PKGBUILD
webkitgtk/repos/testing-x86_64/changeset_150963.diff
webkitgtk/repos/testing-x86_64/python3.patch
--------------------------------------+
/PKGBUILD | 92 +++++++++++++++++++++++++++++++++
/changeset_150963.diff | 60 +++++++++++++++++++++
/python3.patch | 40 ++++++++++++++
testing-i686/PKGBUILD | 46 ----------------
testing-i686/changeset_150963.diff | 30 ----------
testing-i686/python3.patch | 20 -------
testing-x86_64/PKGBUILD | 46 ----------------
testing-x86_64/changeset_150963.diff | 30 ----------
testing-x86_64/python3.patch | 20 -------
9 files changed, 192 insertions(+), 192 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-06-07 10:28:50 UTC (rev 187871)
+++ testing-i686/PKGBUILD 2013-06-07 10:36:06 UTC (rev 187872)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=webkitgtk
-pkgver=2.0.2
-pkgrel=2
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="http://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp
- harfbuzz-icu)
-makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
-optdepends=('gtk2: Webkit2 plugin support')
-conflicts=(webkitgtk3)
-provides=("webkitgtk3=${pkgver}")
-replaces=(webkitgtk3)
-options=(!libtool !emptydirs)
-source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz
- changeset_150963.diff)
-sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2'
- '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np2 -i ../changeset_150963.diff
- autoreconf -fi -I Source/autotools
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib/$pkgname \
- --enable-introspection
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make all stamp-po
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 DESTDIR="$pkgdir" install
- install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: webkitgtk/repos/testing-i686/PKGBUILD (from rev 187871, webkitgtk/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-07 10:36:06 UTC (rev 187872)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=webkitgtk
+pkgver=2.0.2
+pkgrel=3
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="http://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp
+ harfbuzz-icu)
+makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
+optdepends=('gtk2: Webkit2 plugin support')
+conflicts=(webkitgtk3 libwebkit3)
+provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+replaces=(webkitgtk3 libwebkit3)
+options=(!libtool !emptydirs)
+source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz
+ changeset_150963.diff)
+sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2'
+ '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np2 -i ../changeset_150963.diff
+ autoreconf -fi -I Source/autotools
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/$pkgname \
+ --enable-introspection
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make all stamp-po
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 DESTDIR="$pkgdir" install
+ install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Deleted: testing-i686/changeset_150963.diff
===================================================================
--- testing-i686/changeset_150963.diff 2013-06-07 10:28:50 UTC (rev 187871)
+++ testing-i686/changeset_150963.diff 2013-06-07 10:36:06 UTC (rev 187872)
@@ -1,30 +0,0 @@
-2013-05-30 Alberto Garcia <agarcia at igalia.com>
-
-[GTK] Needs to check for harfbuzz-icu
-https://bugs.webkit.org/show_bug.cgi?id=116978
-
-Reviewed by Xan Lopez.
-
-HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
-also need to check for it in order to get the necessary flags for
-the compiler and the linker.
-
-We keep this conditional for now since we still want to support
-earlier versions of HarfBuzz.
-
-Index: /trunk/Source/autotools/FindDependencies.m4
-===================================================================
---- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
-+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
-@@ -376,4 +376,11 @@
- [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
- fi
-+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
-+# Since we support earlier HarfBuzz versions we keep this conditional for now.
-+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
-+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
-+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
-+fi
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
Copied: webkitgtk/repos/testing-i686/changeset_150963.diff (from rev 187871, webkitgtk/trunk/changeset_150963.diff)
===================================================================
--- testing-i686/changeset_150963.diff (rev 0)
+++ testing-i686/changeset_150963.diff 2013-06-07 10:36:06 UTC (rev 187872)
@@ -0,0 +1,30 @@
+2013-05-30 Alberto Garcia <agarcia at igalia.com>
+
+[GTK] Needs to check for harfbuzz-icu
+https://bugs.webkit.org/show_bug.cgi?id=116978
+
+Reviewed by Xan Lopez.
+
+HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
+also need to check for it in order to get the necessary flags for
+the compiler and the linker.
+
+We keep this conditional for now since we still want to support
+earlier versions of HarfBuzz.
+
+Index: /trunk/Source/autotools/FindDependencies.m4
+===================================================================
+--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
++++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
+@@ -376,4 +376,11 @@
+ [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
+ fi
++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
++# Since we support earlier HarfBuzz versions we keep this conditional for now.
++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
++ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
++ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
++ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
++fi
+ AC_SUBST([FREETYPE_CFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
Deleted: testing-i686/python3.patch
===================================================================
--- testing-i686/python3.patch 2013-06-07 10:28:50 UTC (rev 187871)
+++ testing-i686/python3.patch 2013-06-07 10:36:06 UTC (rev 187872)
@@ -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/testing-i686/python3.patch (from rev 187871, webkitgtk/trunk/python3.patch)
===================================================================
--- testing-i686/python3.patch (rev 0)
+++ testing-i686/python3.patch 2013-06-07 10:36:06 UTC (rev 187872)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-06-07 10:28:50 UTC (rev 187871)
+++ testing-x86_64/PKGBUILD 2013-06-07 10:36:06 UTC (rev 187872)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=webkitgtk
-pkgver=2.0.2
-pkgrel=2
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="http://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp
- harfbuzz-icu)
-makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
-optdepends=('gtk2: Webkit2 plugin support')
-conflicts=(webkitgtk3)
-provides=("webkitgtk3=${pkgver}")
-replaces=(webkitgtk3)
-options=(!libtool !emptydirs)
-source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz
- changeset_150963.diff)
-sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2'
- '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np2 -i ../changeset_150963.diff
- autoreconf -fi -I Source/autotools
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib/$pkgname \
- --enable-introspection
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make all stamp-po
-}
-
-package() {
- cd $pkgname-$pkgver
- make -j1 DESTDIR="$pkgdir" install
- install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: webkitgtk/repos/testing-x86_64/PKGBUILD (from rev 187871, webkitgtk/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-07 10:36:06 UTC (rev 187872)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=webkitgtk
+pkgver=2.0.2
+pkgrel=3
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="http://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp
+ harfbuzz-icu)
+makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
+optdepends=('gtk2: Webkit2 plugin support')
+conflicts=(webkitgtk3 libwebkit3)
+provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+replaces=(webkitgtk3 libwebkit3)
+options=(!libtool !emptydirs)
+source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz
+ changeset_150963.diff)
+sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2'
+ '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np2 -i ../changeset_150963.diff
+ autoreconf -fi -I Source/autotools
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/$pkgname \
+ --enable-introspection
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make all stamp-po
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make -j1 DESTDIR="$pkgdir" install
+ install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Deleted: testing-x86_64/changeset_150963.diff
===================================================================
--- testing-x86_64/changeset_150963.diff 2013-06-07 10:28:50 UTC (rev 187871)
+++ testing-x86_64/changeset_150963.diff 2013-06-07 10:36:06 UTC (rev 187872)
@@ -1,30 +0,0 @@
-2013-05-30 Alberto Garcia <agarcia at igalia.com>
-
-[GTK] Needs to check for harfbuzz-icu
-https://bugs.webkit.org/show_bug.cgi?id=116978
-
-Reviewed by Xan Lopez.
-
-HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
-also need to check for it in order to get the necessary flags for
-the compiler and the linker.
-
-We keep this conditional for now since we still want to support
-earlier versions of HarfBuzz.
-
-Index: /trunk/Source/autotools/FindDependencies.m4
-===================================================================
---- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
-+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
-@@ -376,4 +376,11 @@
- [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
- fi
-+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
-+# Since we support earlier HarfBuzz versions we keep this conditional for now.
-+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
-+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
-+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
-+fi
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
Copied: webkitgtk/repos/testing-x86_64/changeset_150963.diff (from rev 187871, webkitgtk/trunk/changeset_150963.diff)
===================================================================
--- testing-x86_64/changeset_150963.diff (rev 0)
+++ testing-x86_64/changeset_150963.diff 2013-06-07 10:36:06 UTC (rev 187872)
@@ -0,0 +1,30 @@
+2013-05-30 Alberto Garcia <agarcia at igalia.com>
+
+[GTK] Needs to check for harfbuzz-icu
+https://bugs.webkit.org/show_bug.cgi?id=116978
+
+Reviewed by Xan Lopez.
+
+HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
+also need to check for it in order to get the necessary flags for
+the compiler and the linker.
+
+We keep this conditional for now since we still want to support
+earlier versions of HarfBuzz.
+
+Index: /trunk/Source/autotools/FindDependencies.m4
+===================================================================
+--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
++++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
+@@ -376,4 +376,11 @@
+ [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
+ fi
++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
++# Since we support earlier HarfBuzz versions we keep this conditional for now.
++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
++ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
++ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
++ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
++fi
+ AC_SUBST([FREETYPE_CFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
Deleted: testing-x86_64/python3.patch
===================================================================
--- testing-x86_64/python3.patch 2013-06-07 10:28:50 UTC (rev 187871)
+++ testing-x86_64/python3.patch 2013-06-07 10:36:06 UTC (rev 187872)
@@ -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/testing-x86_64/python3.patch (from rev 187871, webkitgtk/trunk/python3.patch)
===================================================================
--- testing-x86_64/python3.patch (rev 0)
+++ testing-x86_64/python3.patch 2013-06-07 10:36:06 UTC (rev 187872)
@@ -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)
+
More information about the arch-commits
mailing list