diff options
Diffstat (limited to 'net-libs')
16 files changed, 874 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest new file mode 100644 index 0000000..dadd2af --- /dev/null +++ b/net-libs/webkit-gtk/Manifest @@ -0,0 +1,16 @@ +AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43 +AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1 +AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92 +AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072 +AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 +AUX webkit-gtk-2.4.11-video-web-audio.patch 520 SHA256 103db2178fb3bc6db9706dc2874c1a68d748133082330a6f6cca909d26fa0dac SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1 WHIRLPOOL af4cad5c7da3fca085e588dadf093ae3155351b81dbf2cfe8201c93515b4e23af08e62049f836dec960fe25297a786e379cd51c386ca9c605a8812cc9e5a6506 +AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 SHA256 64fc5b9e019fb759cfcf2dc65d7bf0dfcd2cff6469049098d84e180bcf4fbfcc SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067 WHIRLPOOL 310ac0d0d04156f681e9039634c2f3ca02c358f70dec091f4c1c221653eef97dcea8c454ac64d3c3b326c47687c3b4e7d168d2fba6813b28ae6c450891849723 +AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 SHA256 b442a8021ec5bfc751708fe6409baff6ae8576d7fb49da95245b6ba2c1557536 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583 WHIRLPOOL 25e62e4c95b99bad82a45a82091c6ac7a7cbe02391b4873d383649413fa6eea236130a62aef7ba1f0a24f172554e9b6d650f7bfeb41abb96b8387ef85f807932 +AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72 +AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334 +AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60 +AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82 +AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 880 SHA256 411a4238c2e863b60744287ad645f1e3e0cddd33e895f4dfb1e1c5cfd9f48765 SHA512 7150400387f5edd3a647359ef1d864634c25d0a7dad043c1b0734fb44d133f59bbc0ce065e59bc3abab0082272ac54c1b40752e06041e5e36c11f502a9734a62 WHIRLPOOL 470ea2f6228878ddae55cec72b667f14f56d5f7017ea1cce123dcc5da41dd3fd589214b722e5a85bd81f2a14445a759c55366826b82e3801d8e40ef2ba9c6826 +DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 +EBUILD webkit-gtk-2.4.11-r1.ebuild 9132 SHA256 a3a30960398c4af650f2d87b105f1d6f919824b757b73e9ada063ece4d2e8379 SHA512 a79f5f8c786e47c1d9656a81032967c3eb664aee748f94e4472224aea8eaa1974629298e790eff5adb51c9b78e0788b9a11b9c05c30c1ef192253a8169473d09 WHIRLPOOL 30da6741b5ebe02aafe661152a5b8e7ad1e7b99e9c9592cb23b8b41cf26ef1b55223698b3576aed8d0b10651ea3b37035cfa3c19b35e5b3bdcd5098025e7c7cf +EBUILD webkit-gtk-2.4.11-r200.ebuild 8539 SHA256 bb94c0b67dd175199782261066d51177c40d98acae7611a0900aa48ac9d7a30c SHA512 d604cd83d0531a0fda025358c729ccf58f5be6aa1c23531561de498b271e6926da731846a630aa3832d264c989c04e58cf86ea5c53a5ca7ccff62658341ce49a WHIRLPOOL ecd8a3b6374238fcf1ef26f0883312c9bba9a0a237fc0acd831c8b45eba5260d3b1b9366123f9f46d27b56b1d9bc217d9ab7724a4d49330b50af87bbe760b1b6 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch new file mode 100644 index 0000000..c94f545 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch @@ -0,0 +1,10 @@ +--- a/configure.ac.old 2013-03-02 09:22:53.791750644 +0200 ++++ b/configure.ac 2013-03-02 09:24:56.725213764 +0200 +@@ -24,6 +24,7 @@ + m4_include([Source/autotools/SetupLibtool.m4]) + m4_include([Source/autotools/ReadCommandLineArguments.m4]) + m4_include([Source/autotools/FindDependencies.m4]) ++GTK_DOC_CHECK([1.10]) + m4_include([Source/autotools/SetupCompilerFlags.m4]) + m4_include([Source/autotools/SetupAutoconfHeader.m4]) + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch new file mode 100644 index 0000000..5ad357e --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch @@ -0,0 +1,67 @@ +Original from: +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt + +Adapted for 1.6.1 + +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp +@@ -70,6 +70,8 @@ + #endif + #include <gtk/gtk.h> + ++#undef XP_UNIX ++ + #if defined(XP_UNIX) + #include "RefPtrCairo.h" + #include "gtk2xtbin.h" +@@ -439,9 +441,9 @@ + event->setDefaultHandled(); + } + +-#if defined(XP_UNIX) + void PluginView::handleFocusInEvent() + { ++#if defined(XP_UNIX) + if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) + return; + +@@ -454,10 +456,12 @@ + event.detail = NotifyDetailNone; + + dispatchNPEvent(npEvent); ++#endif + } + + void PluginView::handleFocusOutEvent() + { ++#if defined(XP_UNIX) + if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) + return; + +@@ -470,8 +474,8 @@ + event.detail = NotifyDetailNone; + + dispatchNPEvent(npEvent); +-} + #endif ++} + + void PluginView::setParent(ScrollView* parent) + { +--- Source/WebCore/plugins/gtk/gtk2xtbin.c ++++ Source/WebCore/plugins/gtk/gtk2xtbin.c +@@ -41,7 +41,7 @@ + * The GtkXtBin widget allows for Xt toolkit code to be used + * inside a GTK application. + */ +- ++#if 0 + #include "GtkVersioning.h" + #include "xembed.h" + #include "gtk2xtbin.h" +@@ -966,3 +966,4 @@ + + return; + } ++#endif diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch new file mode 100644 index 0000000..8aee778 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch @@ -0,0 +1,20 @@ +Index: webkitgtk/Source/WTF/wtf/Platform.h +=================================================================== +--- webkitgtk.orig/Source/WTF/wtf/Platform.h ++++ webkitgtk/Source/WTF/wtf/Platform.h +@@ -72,6 +72,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 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch new file mode 100644 index 0000000..a63e9e8 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch @@ -0,0 +1,12 @@ +--- a/Source/WTF/wtf/Platform.h 2014-02-25 00:33:16.561606810 +0100 ++++ b/Source/WTF/wtf/Platform.h 2014-02-25 00:49:52.895512955 +0100 +@@ -79,6 +79,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 */ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch new file mode 100644 index 0000000..8c387ff --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch @@ -0,0 +1,20 @@ +Description: Fix wide pointer issues on ia64 (closes: #642750). +Author: Stephan Schreiber <info@fs-driver.org> +Index: webkitgtk/Source/WTF/wtf/Platform.h +=================================================================== +--- webkitgtk.orig/Source/WTF/wtf/Platform.h ++++ webkitgtk/Source/WTF/wtf/Platform.h +@@ -705,6 +705,13 @@ + #define ENABLE_JIT 1 + #endif + ++/* 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 Win64. */ + #if !defined(ENABLE_JIT) \ + && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch new file mode 100644 index 0000000..ead696c --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch @@ -0,0 +1,11 @@ +diff -purN a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp +--- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-14 08:09:01.000000000 +0100 ++++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 19:43:00.215345381 +0200 +@@ -40,6 +40,7 @@ + #include "PaintInfo.h" + #include "PlatformContextCairo.h" + #include "RenderElement.h" ++#include "RenderBox.h" + #include "TextDirection.h" + #include "UserAgentStyleSheets.h" + #include "WidgetRenderingContext.h" diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch new file mode 100644 index 0000000..c160376 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch @@ -0,0 +1,32 @@ +$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 +--- a/Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014 ++++ b/Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014 +@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect + + Client* m_client; + bool m_isServer; ++#if CPU(PPC) ++ uint64_t m_syncRequestID; ++#else + std::atomic<uint64_t> m_syncRequestID; ++#endif + + bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage; + bool m_shouldExitOnSyncMessageSendFailure; +$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $ +https://bugs.webkit.org/show_bug.cgi?id=130837 +--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014 ++++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014 +@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest() + + uint64_t StatisticsRequest::addOutstandingRequest() + { ++#if CPU(PPC) ++ static int64_t uniqueRequestID; ++#else + static std::atomic<int64_t> uniqueRequestID; ++#endif + + uint64_t requestID = ++uniqueRequestID; + m_outstandingRequests.add(requestID); diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch new file mode 100644 index 0000000..cded605 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch @@ -0,0 +1,30 @@ +http://bugs.gentoo.org/481688 +http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp + +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +@@ -334,5 +334,5 @@ + case JPEG_HEADER: + // Read file parameters with jpeg_read_header(). +- if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED) ++ if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED) + return false; // I/O suspension. + +@@ -420,7 +420,7 @@ + m_info.dct_method = dctMethod(); + m_info.dither_mode = ditherMode(); +- m_info.do_fancy_upsampling = doFancyUpsampling(); +- m_info.enable_2pass_quant = false; +- m_info.do_block_smoothing = true; ++ m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE; ++ m_info.enable_2pass_quant = FALSE; ++ m_info.do_block_smoothing = TRUE; + + // Start decompressor. +@@ -573,5 +573,5 @@ + // called, then we have hit the end of the buffer. A return value of false + // indicates that we have no data to supply yet. +- return false; ++ return FALSE; + } + diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch new file mode 100644 index 0000000..67760e2 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch @@ -0,0 +1,11 @@ +--- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-09-26 11:40:44.000000000 +0400 ++++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-10-13 15:38:38.496444600 +0400 +@@ -17,7 +17,7 @@ + */ + + #include "config.h" +-#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) ++#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX) + + #define DISABLE_SHIMS + #include "OpenGLShims.h" diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch new file mode 100644 index 0000000..bd8507c --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch @@ -0,0 +1,29 @@ +Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity) +https://bugs.webkit.org/show_bug.cgi?id=159124#c1 +https://bugs.gentoo.org/show_bug.cgi?id=592048 +diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp +--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600 ++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700 +@@ -85,8 +85,8 @@ + guint32 eventTime = getEventTime(event); + + if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) +- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) +- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) ++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) ++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) + && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime)) + && (buttonEvent->button == m_previousClickButton))) + m_currentClickCount++; +diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp +--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600 ++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700 +@@ -659,7 +659,7 @@ + if (!std::isfinite(time)) + return String::fromUTF8(_("indefinite time")); + +- int seconds = static_cast<int>(abs(time)); ++ int seconds = static_cast<int>(fabs(time)); + int days = seconds / (60 * 60 * 24); + int hours = seconds / (60 * 60); + int minutes = (seconds / 60) % 60; diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch new file mode 100644 index 0000000..3817bce --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch @@ -0,0 +1,22 @@ +--- a/Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 ++++ b/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300 +@@ -1146,6 +1146,7 @@ + list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj) + endif () + elseif (WTF_CPU_ARM64) ++elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) + elseif (WTF_CPU_IA64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) +--- a/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 ++++ b/CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300 +@@ -82,6 +82,8 @@ + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha") ++ set(WTF_CPU_ALPHA 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + set(WTF_CPU_MIPS 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4") diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch new file mode 100644 index 0000000..6c88c49 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,6 +98,8 @@ + set(WTF_CPU_PPC64LE 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*") + set(WTF_CPU_HPPA 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") ++ set(WTF_CPU_IA64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") + set(WTF_CPU_S390 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1147,6 +1147,7 @@ + endif () + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_HPPA) ++elseif (WTF_CPU_IA64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) + elseif (WTF_CPU_PPC64LE) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch new file mode 100644 index 0000000..49af448 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch @@ -0,0 +1,22 @@ +2015-08-24 Alexandre Rostovtsev <tetromino@gentoo.org> + + webkit2gtkinjectedbundle requires forwarding headers + https://bugs.webkit.org/show_bug.cgi?id=148379 + + Fixes GTK build with -j1 + + * PlatformGTK.cmake: + +Index: Source/WebKit2/PlatformGTK.cmake +=================================================================== +--- a/Source/WebKit2/PlatformGTK.cmake (revision 188859) ++++ b/Source/WebKit2/PlatformGTK.cmake (working copy) +@@ -860,7 +860,7 @@ include_directories( + ) + + add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp") +-add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings) ++add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers) + add_webkit2_prefix_header(webkit2gtkinjectedbundle) + + # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild new file mode 100644 index 0000000..d35107b --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single 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="3/25" # soname version of libwebkit2gtk-3.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="aqua coverage debug +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X" +# bugs 372493, 416331 +REQUIRED_USE=" + geolocation? ( introspection ) + gles2? ( egl ) + introspection? ( gstreamer ) + webgl? ( ^^ ( gles2 opengl ) ) + !webgl? ( ?? ( gles2 opengl ) ) + || ( aqua 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 +# gtk3-3.20 is needed to ensure we get fixed theming: +# https://bugzilla.gnome.org/show_bug.cgi?id=757503 +RDEPEND=" + dev-db/sqlite:3= + >=dev-libs/glib-2.36:2 + >=dev-libs/icu-3.8.1-r1:= + >=dev-libs/libxml2-2.6:2 + >=dev-libs/libxslt-1.1.7 + >=media-libs/fontconfig-2.5:1.0 + >=media-libs/freetype-2.4.2:2 + >=media-libs/harfbuzz-0.9.7:=[icu(+)] + >=media-libs/libpng-1.4:0= + media-libs/libwebp:= + >=net-libs/libsoup-2.42:2.4[introspection?] + virtual/jpeg:0= + >=x11-libs/cairo-1.10:=[X?] + >=x11-libs/gtk+-3.20.0:3[X?,aqua?,introspection?] + >=x11-libs/pango-1.30.0 + + >=x11-libs/gtk+-2.24.10:2 + + egl? ( media-libs/mesa[egl] ) + geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) + gles2? ( media-libs/mesa[gles2] ) + gnome-keyring? ( app-crypt/libsecret ) + 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:= ) + opengl? ( virtual/opengl ) + spell? ( >=app-text/enchant-0.22:= ) + wayland? ( >=x11-libs/gtk+-3.10:3[wayland] ) + webgl? ( + || ( + x11-libs/cairo[opengl] + x11-libs/cairo[gles2] + ) + x11-libs/libXcomposite + x11-libs/libXdamage ) + X? ( + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt ) +" + +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + ${RUBY_DEPS} + >=dev-lang/perl-5.10 + >=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 + + geolocation? ( 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 [[ ${MERGE_TYPE} != "binary" ]] && ! 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() { + # Check whether any of the debugging flags is enabled + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then + replace-flags -ggdb -g + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" + ewarn "large for current binutils releases (bug #432784) and has very" + ewarn "high temporary build space and memory requirements." + ewarn "If you really want to build ${PN} with \"-ggdb\", add" + ewarn "WEBKIT_GTK_GGDB=yes" + ewarn "to your make.conf file." + fi + einfo "You need to have at least 18GB of temporary build space available" + einfo "to build ${PN} with debugging CFLAGS. Note that it might still" + einfo "not be enough, as the total space requirements depend on the flags" + einfo "(-ggdb vs -g1) and enabled features." + check-reqs_pkg_setup + fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup +} + +src_prepare() { + # intermediate MacPorts hack while upstream bug is not fixed properly + # https://bugs.webkit.org/show_bug.cgi?id=28727 + use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch + + # Leave optimization level to user CFLAGS + # FORTIFY_SOURCE is enabled by default in Gentoo + sed -e 's/-O[012]//g' \ + -e 's/-D_FORTIFY_SOURCE=2//g' \ + -i Source/autotools/SetupCompilerFlags.m4 || die + + # bug #459978, upstream bug #113397 + eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch + + # Debian patches to fix support for some arches + # https://bugs.webkit.org/show_bug.cgi?id=129540 + eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch + # https://bugs.webkit.org/show_bug.cgi?id=129542 + eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch + + # Fix building on ppc (from OpenBSD, only needed on slot 3) + # https://bugs.webkit.org/show_bug.cgi?id=130837 + eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch + + # Fix build with recent libjpeg, bug #481688 + # https://bugs.webkit.org/show_bug.cgi?id=122412 + eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch + + # Fix building with --disable-webgl, bug #500966 + # https://bugs.webkit.org/show_bug.cgi?id=131267 + eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch + + # https://bugs.webkit.org/show_bug.cgi?id=156510 + eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch + + # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 + eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch + + AT_M4DIR=Source/autotools eautoreconf + + gnome2_src_prepare +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # CXX code needs to be built with -fpermissive on any recent gcc + append-cxxflags -fpermissive + + # 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 does not compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + 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_ruby23]"; then + ruby_interpreter="RUBY=$(type -P ruby23)" + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then + ruby_interpreter="RUBY=$(type -P ruby22)" + elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then + ruby_interpreter="RUBY=$(type -P ruby21)" + else + ruby_interpreter="RUBY=$(type -P ruby20)" + fi + + # TODO: Check Web Audio support + # should somehow let user select between them? + # + # * Aqua support in gtk3 is untested + # * dependency-tracking is required so parallel builds won't fail + gnome2_src_configure \ + $(use_enable aqua quartz-target) \ + $(use_enable coverage) \ + $(use_enable debug) \ + $(use_enable egl) \ + $(use_enable geolocation) \ + $(use_enable gles2) \ + $(use_enable gnome-keyring credential_storage) \ + $(use_enable gstreamer video) \ + $(use_enable gstreamer web-audio) \ + $(use_enable introspection) \ + $(use_enable jit) \ + $(use_enable opengl glx) \ + $(use_enable spell spellcheck) \ + $(use_enable webgl) \ + $(use_enable webgl accelerated-compositing) \ + $(use_enable wayland wayland-target) \ + $(use_enable X x11-target) \ + --with-gtk=3.0 \ + --enable-dependency-tracking \ + --disable-gtk-doc \ + ${ruby_interpreter} +} + +src_test() { + # Tests expect an out-of-source build in WebKitBuild + ln -s . WebKitBuild || die "ln failed" + + # Prevents test failures on PaX systems + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* + + # Tests need virtualx, bug #294691, bug #310695 + # Parallel tests sometimes fail + virtx emake -j1 check +} + +src_install() { + DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install + + # https://bugs.webkit.org/show_bug.cgi?id=129242 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install + + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore + + # Prevents crashes on PaX systems, bug #522808 + use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess" + pax-mark m "${ED}usr/libexec/WebKitPluginProcess" +} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild new file mode 100644 index 0000000..f7d0a7b --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single 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="2" # no usable subslot +KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" + +IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X" +# bugs 372493, 416331 +REQUIRED_USE=" + geoloc? ( introspection ) + gles2? ( egl ) + introspection? ( gstreamer ) + webgl? ( ^^ ( gles2 opengl ) ) + !webgl? ( ?? ( gles2 opengl ) ) + || ( aqua X ) +" + +# use sqlite, svg by default +RDEPEND=" + dev-db/sqlite:3= + >=dev-libs/glib-2.36:2 + >=dev-libs/icu-3.8.1-r1:= + >=dev-libs/libxml2-2.6:2 + >=dev-libs/libxslt-1.1.7 + >=media-libs/fontconfig-2.5:1.0 + >=media-libs/freetype-2.4.2:2 + >=media-libs/harfbuzz-0.9.7:=[icu(+)] + >=media-libs/libpng-1.4:0= + media-libs/libwebp:= + >=net-libs/libsoup-2.42:2.4[introspection?] + virtual/jpeg:0= + >=x11-libs/cairo-1.10:=[X] + >=x11-libs/gtk+-2.24.10:2[aqua?,introspection?] + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/pango-1.30.0 + + egl? ( media-libs/mesa[egl] ) + geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) + gles2? ( media-libs/mesa[gles2] ) + gnome-keyring? ( app-crypt/libsecret ) + 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:= ) + opengl? ( virtual/opengl ) + spell? ( >=app-text/enchant-0.22:= ) + webgl? ( + || ( + x11-libs/cairo[opengl] + x11-libs/cairo[gles2] + ) + x11-libs/libXcomposite + x11-libs/libXdamage ) +" + +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + ${RUBY_DEPS} + >=dev-lang/perl-5.10 + >=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 [[ ${MERGE_TYPE} != "binary" ]] && ! 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() { + # Check whether any of the debugging flags is enabled + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then + replace-flags -ggdb -g + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" + ewarn "large for current binutils releases (bug #432784) and has very" + ewarn "high temporary build space and memory requirements." + ewarn "If you really want to build ${PN} with \"-ggdb\", add" + ewarn "WEBKIT_GTK_GGDB=yes" + ewarn "to your make.conf file." + fi + einfo "You need to have at least 18GB of temporary build space available" + einfo "to build ${PN} with debugging CFLAGS. Note that it might still" + einfo "not be enough, as the total space requirements depend on the flags" + einfo "(-ggdb vs -g1) and enabled features." + check-reqs_pkg_setup + fi + + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup +} + +src_prepare() { + # intermediate MacPorts hack while upstream bug is not fixed properly + # https://bugs.webkit.org/show_bug.cgi?id=28727 + use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch + + # Leave optimization level to user CFLAGS + # FORTIFY_SOURCE is enabled by default in Gentoo + sed -e 's/-O[012]//g' \ + -e 's/-D_FORTIFY_SOURCE=2//g' \ + -i Source/autotools/SetupCompilerFlags.m4 || die + + # bug #459978, upstream bug #113397 + eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch + + # Debian patches to fix support for some arches + # https://bugs.webkit.org/show_bug.cgi?id=129540 + eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch + # https://bugs.webkit.org/show_bug.cgi?id=129542 + eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch + + # Fix build with recent libjpeg, bug #481688 + # https://bugs.webkit.org/show_bug.cgi?id=122412 + eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch + + # Fix building with --disable-webgl, bug #500966 + # https://bugs.webkit.org/show_bug.cgi?id=131267 + eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch + + # https://bugs.webkit.org/show_bug.cgi?id=156510 + eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch + + # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 + eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch + + AT_M4DIR=Source/autotools eautoreconf + + gnome2_src_prepare +} + +src_configure() { + # Respect CC, otherwise fails on prefix #395875 + tc-export CC + + # CXX code needs to be built with -fpermissive on any recent gcc + append-cxxflags -fpermissive + + # 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 does not compile on alpha without this in LDFLAGS + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 + 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_ruby23]"; then + ruby_interpreter="RUBY=$(type -P ruby23)" + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then + ruby_interpreter="RUBY=$(type -P ruby22)" + elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then + ruby_interpreter="RUBY=$(type -P ruby21)" + else + ruby_interpreter="RUBY=$(type -P ruby20)" + fi + + # TODO: Check Web Audio support + # should somehow let user select between them? + # + # * dependency-tracking is required so parallel builds won't fail + gnome2_src_configure \ + $(use_enable aqua quartz-target) \ + $(use_enable coverage) \ + $(use_enable debug) \ + $(use_enable egl) \ + $(use_enable geoloc geolocation) \ + $(use_enable gles2) \ + $(use_enable gnome-keyring credential_storage) \ + $(use_enable gstreamer video) \ + $(use_enable gstreamer web-audio) \ + $(use_enable introspection) \ + $(use_enable jit) \ + $(use_enable opengl glx) \ + $(use_enable spell spellcheck) \ + $(use_enable webgl) \ + $(use_enable webgl accelerated-compositing) \ + $(use_enable X x11-target) \ + --with-gtk=2.0 \ + --disable-webkit2 \ + --enable-dependency-tracking \ + --disable-gtk-doc \ + ${ruby_interpreter} +} + +src_test() { + # Tests expect an out-of-source build in WebKitBuild + ln -s . WebKitBuild || die "ln failed" + + # Prevents test failures on PaX systems + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* + + # Tests need virtualx, bug #294691, bug #310695 + # Parallel tests sometimes fail + virtx emake -j1 check +} + +src_install() { + DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install + + # https://bugs.webkit.org/show_bug.cgi?id=129242 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install + + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore + + # Prevents crashes on PaX systems + use jit && pax-mark m "${ED}usr/bin/jsc-1" + + # File collisions with slot 3 + # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134 + rm -rf "${ED}usr/share/gtk-doc" || die +} |