diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-09 11:54:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-09 15:16:39 +0000 |
| commit | b161e041cf9062b001c3ecd4c653feaa4096e3cf (patch) | |
| tree | a78548f4acac8bc03a8e394ed81cbb5977228f2a /main/webkitgtk/APKBUILD | |
| parent | 13ec99695b21eb49ab7404c9933b0cfd8fe40025 (diff) | |
| download | aports-b161e041cf9062b001c3ecd4c653feaa4096e3cf.tar.bz2 aports-b161e041cf9062b001c3ecd4c653feaa4096e3cf.tar.xz | |
main/webkitgtk: fix overlinking issue in libtool
and fix building with bison-3
Diffstat (limited to 'main/webkitgtk/APKBUILD')
| -rw-r--r-- | main/webkitgtk/APKBUILD | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD index c9ca0bea25..232197c98c 100644 --- a/main/webkitgtk/APKBUILD +++ b/main/webkitgtk/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkitgtk pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" arch="all" @@ -49,6 +49,7 @@ 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 + webkitgtk-2.0.4-bison-3.0.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -63,7 +64,7 @@ prepare() { ;; esac done - libtoolize --force && aclocal -I Source/autotools && autoconf && automake || return 1 + libtoolize --force && aclocal -I Source/autotools && autoconf && automake --force || return 1 } build() { @@ -79,6 +80,11 @@ build() { --disable-webkit2 \ --with-gtk=3.0 \ || return 1 + + # fight overlinking + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool || return 1 + # hack to work around parallel make problems, # see https://bugs.webkit.org/show_bug.cgi?id=79498 make -j1 all-built-sources-local \ @@ -101,12 +107,15 @@ package() { md5sums="413be319ba171feed9348d1bede6b0a7 webkitgtk-2.0.4.tar.xz de77a3e7e61753e7f1cce3f4bd00a3f6 webkit-gtk-1.7.90-parallel-make-hack.patch 9ace721086b25f0f32d7f76b29789f67 webkitgtk-1.10-textrels.patch -b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch" +b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch +86c9bcd1203bc37ff1f69efbe3d3417c webkitgtk-2.0.4-bison-3.0.patch" sha256sums="bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f webkitgtk-2.0.4.tar.xz e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 webkit-gtk-1.7.90-parallel-make-hack.patch 754bbf13c7a6c9bd745f642367ff884156020dd2ea7611c3d20a509c6685c836 webkitgtk-1.10-textrels.patch -0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch" +0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch +29c352aa277b41db3582b05579f52c9a8bab2806bb425c3ba47bb627846671a7 webkitgtk-2.0.4-bison-3.0.patch" sha512sums="d5fd825d01f700df8eb7d9021673a2a551cb6b4ba9e35ad0038e3d4e76322c0e751e1cd4cd7293a3388d58b8cc18169fec75044412a428c886376609d52fc3ce webkitgtk-2.0.4.tar.xz 907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 webkit-gtk-1.7.90-parallel-make-hack.patch c3502a11ce4777abc164209c0087ec7cb6c28b376056bee52651b4e4bd2d49f2d6e4a74422f21d9bce848479a4a1b02052935b3c9397f1d43a59b3de22ef2758 webkitgtk-1.10-textrels.patch -8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch" +8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch +703f5f7e1af889738c77a788a6902caea09f038f228fec0f07e9769039c8f0cb6943e290daf58319d07446e790a12479c4ea788ee3ba8bed8b18c68105c67779 webkitgtk-2.0.4-bison-3.0.patch" |