diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-11 13:29:10 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-11 13:29:29 +0000 |
| commit | 4a646ea218ffcb465ba3a8dbf649da9418e83b88 (patch) | |
| tree | 51ba8e6c967868c228afda52f1d053e84b4a5e4d /main/webkitgtk | |
| parent | 62cdf3692bf101eb48dc61d624bdeb7eed4b9b0e (diff) | |
| download | aports-4a646ea218ffcb465ba3a8dbf649da9418e83b88.tar.bz2 aports-4a646ea218ffcb465ba3a8dbf649da9418e83b88.tar.xz | |
main/webkitgtk: fix musl build
Diffstat (limited to 'main/webkitgtk')
| -rw-r--r-- | main/webkitgtk/APKBUILD | 10 | ||||
| -rw-r--r-- | main/webkitgtk/fix-execinfo.patch | 20 |
2 files changed, 27 insertions, 3 deletions
diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD index 760a013f99..88eeb0c285 100644 --- a/main/webkitgtk/APKBUILD +++ b/main/webkitgtk/APKBUILD @@ -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 + fix-execinfo.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -107,12 +108,15 @@ package() { md5sums="9c337812667c4885ebe29a54084dcd4c webkitgtk-2.2.0.tar.xz de77a3e7e61753e7f1cce3f4bd00a3f6 webkit-gtk-1.7.90-parallel-make-hack.patch 9ace721086b25f0f32d7f76b29789f67 webkitgtk-1.10-textrels.patch -b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch" +b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch +c114751c30cdcaede5a7ed5568b2b0d4 fix-execinfo.patch" sha256sums="84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538 webkitgtk-2.2.0.tar.xz e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 webkit-gtk-1.7.90-parallel-make-hack.patch 754bbf13c7a6c9bd745f642367ff884156020dd2ea7611c3d20a509c6685c836 webkitgtk-1.10-textrels.patch -0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch" +0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch +b2bc9e03fd5d968d6df4531a7d102496139120e666e6fed397a19ae4026751c6 fix-execinfo.patch" sha512sums="08f498d95b31826744a4c06c7bf68092ea3ee01b2cc0647cbe84d8dcecc7aadc88a1fe8ce4464749a2626c1e912bc0ff0a3cd0f867d6f33a8465ec6acdef9c5d webkitgtk-2.2.0.tar.xz 907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 webkit-gtk-1.7.90-parallel-make-hack.patch c3502a11ce4777abc164209c0087ec7cb6c28b376056bee52651b4e4bd2d49f2d6e4a74422f21d9bce848479a4a1b02052935b3c9397f1d43a59b3de22ef2758 webkitgtk-1.10-textrels.patch -8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch" +8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch +602630468ee80b9f9bb53ee7808f4b2f2c86d1d4db14ac9c244b3e2e79a245510a289eb321cb7dbefd3b7a2dde13cf444b8ecf7cd46f23eaa5c0f04670914e42 fix-execinfo.patch" diff --git a/main/webkitgtk/fix-execinfo.patch b/main/webkitgtk/fix-execinfo.patch new file mode 100644 index 0000000000..eb825312f3 --- /dev/null +++ b/main/webkitgtk/fix-execinfo.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp ++++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp +@@ -64,7 +64,7 @@ + #include <windows.h> + #endif + +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + #include <cxxabi.h> + #include <dlfcn.h> + #include <execinfo.h> +@@ -242,7 +242,7 @@ + + void WTFGetBacktrace(void** stack, int* size) + { +-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) ++#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined |