diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-10 13:04:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-10 13:04:51 +0000 |
| commit | 201c5b68197ba2cb2e99ee54a1ee3281aee7dd4c (patch) | |
| tree | 3d067ff8289c02482f39411079d006d3bf16521f /main/webkitgtk | |
| parent | edb66631228cdeb947259df83d8c33be28971118 (diff) | |
| download | aports-201c5b68197ba2cb2e99ee54a1ee3281aee7dd4c.tar.bz2 aports-201c5b68197ba2cb2e99ee54a1ee3281aee7dd4c.tar.xz | |
main/webkitgtk: upgrade to 2.0.2
Diffstat (limited to 'main/webkitgtk')
| -rw-r--r-- | main/webkitgtk/APKBUILD | 18 | ||||
| -rw-r--r-- | main/webkitgtk/harfbuzz.patch | 16 |
2 files changed, 27 insertions, 7 deletions
diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD index 8f29201c77..b46ab30cf4 100644 --- a/main/webkitgtk/APKBUILD +++ b/main/webkitgtk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkitgtk -pkgver=2.0.0 +pkgver=2.0.2 pkgrel=0 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" @@ -48,6 +48,7 @@ subpackages="$pkgname-dev $pkgname-lang" source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz webkit-gtk-1.7.90-parallel-make-hack.patch webkitgtk-1.10-textrels.patch + harfbuzz.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -94,12 +95,15 @@ package() { fi } -md5sums="fa231ba8c9cd33575b9692614324be21 webkitgtk-2.0.0.tar.xz +md5sums="a4024f4b33d829ec1034179e94f9cab6 webkitgtk-2.0.2.tar.xz de77a3e7e61753e7f1cce3f4bd00a3f6 webkit-gtk-1.7.90-parallel-make-hack.patch -9ace721086b25f0f32d7f76b29789f67 webkitgtk-1.10-textrels.patch" -sha256sums="454cdc4beffc2010f83661059178e33b6d9a07bcd60d09eabdf5d7cda17b88e4 webkitgtk-2.0.0.tar.xz +9ace721086b25f0f32d7f76b29789f67 webkitgtk-1.10-textrels.patch +b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch" +sha256sums="c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2 webkitgtk-2.0.2.tar.xz e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 webkit-gtk-1.7.90-parallel-make-hack.patch -754bbf13c7a6c9bd745f642367ff884156020dd2ea7611c3d20a509c6685c836 webkitgtk-1.10-textrels.patch" -sha512sums="bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5 webkitgtk-2.0.0.tar.xz +754bbf13c7a6c9bd745f642367ff884156020dd2ea7611c3d20a509c6685c836 webkitgtk-1.10-textrels.patch +0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch" +sha512sums="fd9b333fb35b10ad577d85e4f9aa8e1c7b74fa2c8c3199df6c479095b8f3e6cb7146dc37af373cadcb4a90fb168a30977aea42b9fad4169a017c78d99e380ad6 webkitgtk-2.0.2.tar.xz 907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 webkit-gtk-1.7.90-parallel-make-hack.patch -c3502a11ce4777abc164209c0087ec7cb6c28b376056bee52651b4e4bd2d49f2d6e4a74422f21d9bce848479a4a1b02052935b3c9397f1d43a59b3de22ef2758 webkitgtk-1.10-textrels.patch" +c3502a11ce4777abc164209c0087ec7cb6c28b376056bee52651b4e4bd2d49f2d6e4a74422f21d9bce848479a4a1b02052935b3c9397f1d43a59b3de22ef2758 webkitgtk-1.10-textrels.patch +8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch" diff --git a/main/webkitgtk/harfbuzz.patch b/main/webkitgtk/harfbuzz.patch new file mode 100644 index 0000000000..c334fe877f --- /dev/null +++ b/main/webkitgtk/harfbuzz.patch @@ -0,0 +1,16 @@ +--- ./Source/autotools/FindDependencies.m4.orig 2013-06-10 12:31:46.700819390 +0000 ++++ ./Source/autotools/FindDependencies.m4 2013-06-10 12:32:15.101112741 +0000 +@@ -373,6 +373,13 @@ + PKG_CHECK_MODULES([FREETYPE], + [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 by 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]) + |