From f6ff3eddc9942b6f21d7b417953dd952542ee04d Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 22 Dec 2014 23:41:56 +0000 Subject: [PATCH] Version bump for Gnome 3.14. Build system switched to cmake. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806 --- net-libs/webkit-gtk/ChangeLog | 11 +- net-libs/webkit-gtk/Manifest | 14 +- .../files/webkit-gtk-2.6.0-atomic-ppc.patch | 48 ++++ .../webkit-gtk-2.6.0-hppa-platform.patch | 34 +++ .../files/webkit-gtk-2.6.0-ia64-malloc.patch | 31 +++ .../webkit-gtk-2.6.0-ia64-platform.patch | 26 +++ net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild | 217 ++++++++++++++++++ 7 files changed, 376 insertions(+), 5 deletions(-) create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 6a5bda5dba4f..d8aa2fb80330 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.302 2014/12/22 21:30:49 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.303 2014/12/22 23:41:53 eva Exp $ + +*webkit-gtk-2.6.4 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue +webkit-gtk-2.6.4.ebuild, + +files/webkit-gtk-2.6.0-atomic-ppc.patch, + +files/webkit-gtk-2.6.0-hppa-platform.patch, + +files/webkit-gtk-2.6.0-ia64-malloc.patch, + +files/webkit-gtk-2.6.0-ia64-platform.patch: + Version bump for Gnome 3.14. Build system switched to cmake. 22 Dec 2014; Jeroen Roovers webkit-gtk-2.4.7.ebuild, webkit-gtk-2.4.7-r200.ebuild: diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index ef66fa06f7af..4970967956b8 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -16,21 +16,27 @@ AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2 AUX webkit-gtk-2.4.6-gstreamer-check.patch 834 SHA256 4911657b844a204eadffbc5e9c193efebc44a21e68199c5d776c5ac5ee2925b5 SHA512 970ab2e26528c18a8922bda7f135a719508a00f482f4d9fbf2cde74e90967ee3e0c10964cf7049dc8a199e2d001b34e500f9b2935002106770ad82e904bff48c WHIRLPOOL 271fae207373bec7cc61529fe374f1212d61c73d01a07dc0c5ab76619c3089198030a22ec831a7dd1401cfe717776acf5e218913ca7f5b053882ed44d2d540be AUX webkit-gtk-2.4.7-disable-accelerated-compositing.patch 544 SHA256 74aeacbc6206d45107fba00428f2fa33a29cc8915fac379bc536fe473db7fb5e SHA512 11e392e0a9bd317f68c369ef7002833bddb0540325b34e23415c97db885ec8ea058ef1fa2a6d599d4623be3c47e2142e053cabfeb6539378724d0fea9b698d67 WHIRLPOOL 64ec0159a5ce5b7e7f05cf04c37a1fcde2fd250461695834b7e9be03b82798d81bbcef4dab3c01baaae37e4607a85f590eb895bfc498463ca0becf97a246bca6 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72 +AUX webkit-gtk-2.6.0-atomic-ppc.patch 1630 SHA256 b5756d91c7bdd37ff13afe784c24efcad2f4c14ec0e901a33c711f4b5d4a3a9b SHA512 2ffea2bd5d1a2bcfbb5ebcf9540006ee6106dc00f2005229ff5862235fae56652f3c3223de99c0c4631e0345024069d8ae45124bec70d0ef18b4e2fba4228c9a WHIRLPOOL f4696efc9cc25957e6610b892a7eb4961f1078cfe2b2d79f4f39b1f793731d658c9411ce9f78099562d2145f7ba872089989270ef7c8e37c729af00718046340 +AUX webkit-gtk-2.6.0-hppa-platform.patch 875 SHA256 b6ce48a290bccf9da2dc425c67003690e52e860d143f36b4eab11de1a81334f2 SHA512 c3f6873d26e926bd8beea0b98dbc499c40b724fce26343b0acff06513427f7a99ed6b339cf3d2ee8accd771949d67931f999dc47c801da8497ea59cab9052c6b WHIRLPOOL 7857cc28e075fc2fd3bcff31d64e7af481a214b120fcb9c9d03360f12e6d790544e45de6f7fe5d3888dcbea4c7f541b112e9430eb5438293511d881044e73e55 +AUX webkit-gtk-2.6.0-ia64-malloc.patch 1066 SHA256 0733f634b13bdd62828ded8b5cd6a32a0249a965d27ad9fac7d085b5d080309b SHA512 caacf20c8c9c418ff19ad312dde656d6ace1f44f2894e8ab37b8f2443f6313336a64cff86f63fbaa83bad123a6091ef79937c052dda862befee8671963b4a38a WHIRLPOOL 7752ee89be0ca64aa4c8dac0a2926a85ae5168dd71925bc08859b70bc4c1f74059c3334d34821c17fdd9cfb933957ecbb1eb419f80cc781e982e444c574dc569 +AUX webkit-gtk-2.6.0-ia64-platform.patch 637 SHA256 050218d8ab6076447ff7cfe2cebad4f4f3ad57b418bc3eeadb8d40d601877add SHA512 d8c5278a35ee3b163366919bfc31862163777af178a1054e86bd32580bad74251398bd3534203eb751770b30689c3c45f571377e93287946a2bba25e6e8a4d12 WHIRLPOOL c8f767aaeb040e0dbfcdc0dc378f43f6ba3bedaf9d53334bbe0393d7db59d14426e3d1a6eb865bb01ee53c571998b9bbd0ebeddca1b6668b815c1dad1d806b57 DIST webkitgtk-2.2.6a.tar.xz 9561132 SHA256 e674b891d42b042847fb803ab52affe5191a9fa8d6d17d419c9a2fb804b0c6cd SHA512 6faed6d18f80e6955cf8555282fc9f19ec8782b468ae90bc410863ed4b4796a72d3f20079dd092f811d2342c105455f43d80f177cb3ea5b82ebd69dbd1d3e6dd WHIRLPOOL 1066540e33370959f090ca0da9bb6c6a0ce817578c728d9271c7e260f80d23e83367e84991e4c933669646d8c1579ab1b5d9eeac743297fa9fcefdc752b569fa DIST webkitgtk-2.4.4a.tar.xz 10093300 SHA256 3741c8724ddf8d7330c148fce95b59554dd4d87989a5ff272c64d46949d7b75f SHA512 162a0a664f84102f5a9a7545e284b365d6a5e0680e6ea4abee49648d1a8fc09a00d552c6a7cddadb09493faf2156568bd65ccd5a8eed345efc3c8ef4c9191f00 WHIRLPOOL a2d3989ba586fed2e3ee7a20ddce0239670509ff0a67bd9a7ec5eaf1a9f20cc239a800f5231276e23b32e65ad4c680484c39b2b23bd5b94a9a92dd4481cfedb8 DIST webkitgtk-2.4.7.tar.xz 9826208 SHA256 f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38 SHA512 1ba2371b34e40e078f6d85774e171f559e4f269ac80f63c56e2e7612e2ec3a41db0f5999af028b1b93657634fcdfcc3612e1a55eeeec2578fe448bd0861b0729 WHIRLPOOL 1cd8382e91efdce9d3654fe16de2f664b1f874ed7e9f811e5d652dd96e7269a48492f44ccbb1cd46e36d41b92188466b68a6e3e009e8dd037dce35ec9582f3d8 +DIST webkitgtk-2.6.4.tar.xz 9996524 SHA256 beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b SHA512 242ab90ceff5b83978dd5bb8f0b8e05a7daa1fbbe87657ef0404facb17b873f3d703aed838f364bc042f2848b8cca300f1126f4d6979fed34235efa40e44d5d8 WHIRLPOOL 12f74b6e7188a92a2c5b656720e99937ac0c3f941ff83bdde5cf1cf671c61b8dc248d45a216dd1d821c684364bda0a43b38964efc3c0cb16ce2a1674963d95ee EBUILD webkit-gtk-2.2.6-r1.ebuild 8940 SHA256 bfb9f50f64143891d2c02c2ba8eed96b9d89ff4c087aa53fc4d2aedb2d92784f SHA512 35f74e9b0164a0fffb0ed1b5a7961ed31bc23ff840190c2f283bb210ece9bd6ea798ece3d98750672621667486802e77857d74bfe62eafe30a25b5feadb1d232 WHIRLPOOL d126052fb7eeafdb0be3b2c9f6e9adb40d02dd2a218fe722392d3b1e431f9730548b577e5f6c0ab4d50daafff29498e13c48614f1bd668cd5e23f7d6e03d455e EBUILD webkit-gtk-2.2.6-r201.ebuild 8848 SHA256 3b1f73e332a7d0b7b710ee66e38920955d41a7f5124af80220e2ebf5d371d95b SHA512 0c19bd8dd65b0926146adae6dd20a3b05bd3580694a76ccae6fc67729f60eb81cf53e137f28b548c65e5ad5f42253599fe3ccc8d33cc6f3c89f3991577ef858b WHIRLPOOL b4fb29d2ed846e4e125853c543c05b823e666ef7252cba5e0c92c928934c667a7b04da364e6abf3f10ddaaef846508452fbd079e3e98ebd6174747d6f1b45c9b EBUILD webkit-gtk-2.4.4-r1.ebuild 10139 SHA256 0476f812ecc1ae26251a35b5a664a54ff019c4d9f54b6c6e4cdacb3b9b2986ff SHA512 e764792dd07cce0372d3f81e49cd18a72873ff8906f178eedd1576afd43b0eeb50798dcad8729b4e92f6fbbf336a5e8aa306f524387f107864b665c55a1841ae WHIRLPOOL ad87e0109521a1f9d9f7bfc408bd182b983d19c02f02cf6d6c5a9c84910472734ff39770c47b3855695e617d377e4d34ad5409070964c1329c2858a7e300aeb6 EBUILD webkit-gtk-2.4.4-r201.ebuild 9779 SHA256 5cb0960c7c35046235c6d181e20b3398c54deec16e7979e485dd5ecb5b1fcce9 SHA512 aa08f302107e2ddb121824bc52c1898341afad3f6586af7e7f2ef79532556d66393b44fead6ccddef0247bfb9b52958f6fca5c5208135019f4368e97f8571c7f WHIRLPOOL d27f55ffa7343f5c1e9ec37ce248faf22294a451001f2a81d76ebf806196fabd3e034bc5851f5c866af520eac82c13e9521cecf9ddb135c18fd79a218d5fb9ac EBUILD webkit-gtk-2.4.7-r200.ebuild 10133 SHA256 fde5d7d92858ba39ba825b8b823a20a0bec1dc5fb27901dcb4d751b898c85e85 SHA512 f80fe4e2b5473464dc28017faa3cb9650e689ed40df956949ebf8f1bf0635e822c5f1428672f3ad9930301c89cd9564365cf04c04c428d17e367288e88ef5e19 WHIRLPOOL 30b8785b9032eda4956fbce8e9f03e2dfc2f9190498f8e0dd3c19e3f2642028795fc35ec6137d14d03088abfb2b6676716da32b1fb60d6bb10b96b4a65e9c433 EBUILD webkit-gtk-2.4.7.ebuild 10590 SHA256 c5450aeecbfa249b057aa38c5bcb30a8f135ca5b8253f9bb4509b00af09dcbde SHA512 aa11935a9f6eb6cc383dce9d01e21ca3f18ebe020236269da69bd08484c189e71d9faa258b785474c6c097bdf227d142da5f1fe668e350a9bc6254e1120d0d93 WHIRLPOOL d566bfb866c11d0e1d0ce73176cb28ea3d74a6f3271cdd12791c6e1ed1dca5eda2175e53b3a45a17de0a6f43466b12ec54d0bcd806b8b16f26b96460e74bdb08 -MISC ChangeLog 62914 SHA256 2b09bc580243c6508b5b7393170f2f5dda3716bf28c0ec39ad9cb1206fb6f445 SHA512 fd212d90fa15fd23101d9999ec83a900176a4631e04d1b15f904e7e9637eb49e597ddf0afc645b9f586a45db6a29b10631c377f1a868fdb04825979aeeb29507 WHIRLPOOL 5d67cf12835e482d5cc5063efcc8ec1679be3d3323d617d46d6c673f5e42ce62c47e82e682f284475abad2db4eed630c96f89ec5daf353770ac73b06cff9e8e9 +EBUILD webkit-gtk-2.6.4.ebuild 6514 SHA256 c4bc95a09c817e247b742f1a16e571fa0c64bca32a77b075d4cfebd74c3ff15b SHA512 6eb66be81a5614cd9a966034cd840a0cbbe19c810a4545f2fd973930aa1c5d9682eedb4b514d8ceeed3b546c1a6e56cc3896a10cfbd7903ebd2f630a139ff6dc WHIRLPOOL 9dae5275f9ed4059eb253ec4ad319c7f6ef91befe9a4ba2b0bec78811f9a5133fc505e8022aded05e167bcf6d8c4f1260311f91f6cfaffc680dd5eca08b41cd3 +MISC ChangeLog 63274 SHA256 c26402487120fd2702bb8f2844f79684f811428f1c97af7c0218c5303d9fa455 SHA512 8788b1b01a8fd17eef5757fc1eacbff05a5fe6e20095e59bd8764a7bdda8a35dc3fc2ea67a75da09e7c9ff6fd32011506cd87d66d33116d717ac5ee5957710f7 WHIRLPOOL 2f2f3fce66859a9bee583bc2724b5d1af1317607a144d4ea1f64ed987b59100d1891d6e563aa30989bb4bbc303570d0f1cc9ea5c85b36ad0affd72b7863d4d73 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSYjYsACgkQVWmRsqeSphN+ZwCeMDFrEe7iivQAPalv2n8HQIKO -2Y4An2x94NCpm0s9mgSuFzgN57elSR4R -=OwD2 +iEYEAREIAAYFAlSYrEIACgkQ1fmVwcYIWAbiSACePohhiDeeVTgGewTNfvoBSATD +epwAn3bWjU/vwap7oCmGBr6aE5/KJaI3 +=dLAc -----END PGP SIGNATURE----- diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch new file mode 100644 index 000000000000..af6d467e232a --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch @@ -0,0 +1,48 @@ +From 7960c437511c650ad33708f4e42457118d95a13d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 19 Oct 2014 19:43:09 +0200 +Subject: [PATCH 4/4] Do not use std::atomic on PPC + +$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $ + +https://bugs.webkit.org/show_bug.cgi?id=130837 +--- + Source/WebKit2/Platform/IPC/Connection.h | 4 ++++ + Source/WebKit2/UIProcess/StatisticsRequest.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h +index b52cf1e..5597e94 100644 +--- a/Source/WebKit2/Platform/IPC/Connection.h ++++ b/Source/WebKit2/Platform/IPC/Connection.h +@@ -233,7 +233,11 @@ private: + + Client* m_client; + bool m_isServer; ++#if CPU(PPC) ++ uint64_t m_syncRequestID; ++#else + std::atomic m_syncRequestID; ++#endif + + bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage; + bool m_shouldExitOnSyncMessageSendFailure; +diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp +index bc0a1e6..ef259d1 100644 +--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp ++++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp +@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest() + + uint64_t StatisticsRequest::addOutstandingRequest() + { ++#if CPU(PPC) ++ static int64_t uniqueRequestID; ++#else + static std::atomic uniqueRequestID; ++#endif + + uint64_t requestID = ++uniqueRequestID; + m_outstandingRequests.add(requestID); +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch new file mode 100644 index 000000000000..06235829395c --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch @@ -0,0 +1,34 @@ +From 8ba68225e9ad35958197aacc03a7a1716741b14c Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 19 Oct 2014 19:37:40 +0200 +Subject: [PATCH 1/4] Fix support for HPPA + +Debian patches to fix support for some arches +https://bugs.webkit.org/show_bug.cgi?id=129540 +--- + Source/WTF/wtf/Platform.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 7712ddb..65f1379 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -71,6 +71,15 @@ + #define WTF_CPU_BIG_ENDIAN 1 + #endif + ++/* CPU(HPPA) - HP PARISC */ ++#if defined(__hppa__) ++#define WTF_CPU_HPPA 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_ASSEMBLER 0 ++#endif ++ + /* CPU(IA64) - Itanium / IA-64 */ + #if defined(__ia64__) + #define WTF_CPU_IA64 1 +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch new file mode 100644 index 000000000000..0b7808bd1ace --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch @@ -0,0 +1,31 @@ +From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 19 Oct 2014 19:40:21 +0200 +Subject: [PATCH 3/4] Use system malloc for IA64 + +https://bugs.webkit.org/show_bug.cgi?id=129542 +--- + Source/WTF/wtf/Platform.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index d9afcd7..c4cf1d2 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -662,6 +662,13 @@ + #endif + #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */ + ++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because ++ some memory barriers are missing in the thread-unsafe code around the ++ pagemap_cache_ object. */ ++#if CPU(IA64) || CPU(IA64_32) ++#define USE_SYSTEM_MALLOC 1 ++#endif ++ + /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */ + #if !defined(ENABLE_JIT) \ + && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch new file mode 100644 index 000000000000..57587e91fec0 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch @@ -0,0 +1,26 @@ +From d98ac8c1040318e648f8417fa5ca6df66cc00b35 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 19 Oct 2014 19:38:18 +0200 +Subject: [PATCH 2/4] Fix support for IA64 + +--- + Source/WTF/wtf/Platform.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 65f1379..d9afcd7 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -87,6 +87,9 @@ + #if !defined(__LP64__) + #define WTF_CPU_IA64_32 1 + #endif ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_ASSEMBLER 0 + #endif + + /* CPU(MIPS) - MIPS 32-bit */ +-- +2.1.2 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild new file mode 100644 index 000000000000..750985be8a8b --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild,v 1.1 2014/12/22 23:41:53 eva Exp $ + +EAPI="5" +GCONF_DEBUG="no" +PYTHON_COMPAT=( python2_7 ) + +inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx + +MY_P="webkitgtk-${PV}" +DESCRIPTION="Open source web browser engine" +HOMEPAGE="http://www.webkitgtk.org/" +SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" + +LICENSE="LGPL-2+ BSD" +SLOT="4/37" # soname version of libwebkit2gtk-4.0 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +IUSE="coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X" +# bugs 372493, 416331 +REQUIRED_USE=" + geoloc? ( introspection ) + introspection? ( gstreamer ) + gles2? ( egl ) + webgl? ( ^^ ( gles2 opengl ) ) + !webgl? ( ?? ( gles2 opengl ) ) + || ( wayland X ) +" + +# use sqlite, svg by default +# Aqua support in gtk3 is untested +# gtk2 is needed for plugin process support +# gtk3-3.10 required for wayland +RDEPEND=" + >=dev-libs/glib-2.36.0:2 + >=dev-libs/libxml2-2.8:2 + >=dev-libs/libxslt-1.1.7 + virtual/jpeg:0= + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + >=media-libs/libpng-1.4:0= + media-libs/libwebp:= + >=dev-libs/icu-3.8.1-r1:= + >=media-libs/fontconfig-2.8:1.0 + >=media-libs/freetype-2.4.2:2 + >=net-libs/libsoup-2.42:2.4[introspection?] + >=x11-libs/cairo-1.10.2:=[X] + >=x11-libs/gtk+-3.6.0:3[X?,introspection?] + dev-db/sqlite:3= + >=x11-libs/pango-1.30.0.0 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/gtk+-2.24.10:2 + + egl? ( media-libs/mesa[egl] ) + geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) + gles2? ( media-libs/mesa[gles2] ) + gstreamer? ( + >=media-libs/gstreamer-1.2:1.0 + >=media-libs/gst-plugins-base-1.2:1.0 ) + introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) + libsecret? ( app-crypt/libsecret ) + opengl? ( virtual/opengl ) + spell? ( >=app-text/enchant-0.22:= ) + wayland? ( >=x11-libs/gtk+-3.12:3[wayland] ) + webgl? ( + x11-libs/cairo[opengl] + x11-libs/libXcomposite + x11-libs/libXdamage ) +" + +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-lang/perl-5.10 + || ( + virtual/rubygems[ruby_targets_ruby20] + virtual/rubygems[ruby_targets_ruby21] + virtual/rubygems[ruby_targets_ruby19] + ) + >=app-accessibility/at-spi2-core-2.5.3 + >=dev-libs/atk-2.8.0 + >=dev-util/gtk-doc-am-1.10 + >=dev-util/gperf-3.0.1 + >=sys-devel/bison-2.4.3 + >=sys-devel/flex-2.5.34 + || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) + sys-devel/gettext + >=sys-devel/make-3.82-r4 + virtual/pkgconfig + + geoloc? ( dev-util/gdbus-codegen ) + introspection? ( jit? ( sys-apps/paxctl ) ) + test? ( + dev-lang/python:2.7 + dev-python/pygobject:3[python_targets_python2_7] + x11-themes/hicolor-icon-theme + jit? ( sys-apps/paxctl ) ) +" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + + if ! test-flag-CXX -std=c++11; then + die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + check-reqs_pkg_setup + fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup +} + +src_prepare() { + # Debian patches to fix support for some arches + # https://bugs.webkit.org/show_bug.cgi?id=129540 + epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch + # https://bugs.webkit.org/show_bug.cgi?id=129542 + epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch + + # Fix building on ppc (from OpenBSD, only needed on slot 3) + # https://bugs.webkit.org/show_bug.cgi?id=130837 + epatch "${FILESDIR}"/${PN}-2.6.0-atomic-ppc.patch + + gnome2_src_prepare +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # Arches without JIT support also need this to really disable it in all places + use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 + + # It doesn't compile on alpha without this in LDFLAGS, bug #??? + use alpha && append-ldflags "-Wl,--no-relax" + + # Sigbuses on SPARC with mcpu and co., bug #??? + use sparc && filter-flags "-mvis" + + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 + use ppc64 && append-flags "-mminimal-toc" + + # Try to use less memory, bug #469942 (see Fedora .spec for reference) + # --no-keep-memory doesn't work on ia64, bug #502492 + if ! use ia64; then + append-ldflags "-Wl,--no-keep-memory" + fi + if ! $(tc-getLD) --version | grep -q "GNU gold"; then + append-ldflags "-Wl,--reduce-memory-overheads" + fi + + local ruby_interpreter="" + + if has_version "virtual/rubygems[ruby_targets_ruby21]"; then + ruby_interpreter="RUBY=$(type -P ruby21)" + elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then + ruby_interpreter="RUBY=$(type -P ruby20)" + else + ruby_interpreter="RUBY=$(type -P ruby19)" + fi + + # TODO: Check Web Audio support + # should somehow let user select between them? + # + # FTL_JIT requires llvm + libcxxabi + local mycmakeargs=( + $(cmake-utils_use_enable test API_TESTS) + $(cmake-utils_use_enable geoloc GEOLOCATION) + $(cmake-utils_use_enable gstreamer VIDEO) + $(cmake-utils_use_enable gstreamer WEB_AUDIO) + $(cmake-utils_use_enable introspection) + $(cmake-utils_use_enable jit) + $(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE) + $(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK) + $(cmake-utils_use_enable wayland WAYLANG_TARGET) + $(cmake-utils_use_enable webgl WEBGL) + $(cmake-utils_use_enable X X11_TARGET) + $(cmake-utils_use_find_package egl EGL) + $(cmake-utils_use_find_package opengl OpenGL) + -DPORT=GTK + -DENABLE_GTKDOC=ON + -DENABLE_PLUGIN_PROCESS_GTK2=ON + ${ruby_interpreter} + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + # Prevents test failures on PaX systems + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* + + cmake-utils_src_test +} + +src_install() { + cmake-utils_src_install + + # Prevents crashes on PaX systems, bug #522808 + use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" + pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2} +} -- 2.26.2