From 763efb194df5565255a5c4e88326ee75663e462f Mon Sep 17 00:00:00 2001 From: dakkar Date: Fri, 16 Dec 2022 12:53:40 +0000 Subject: kill old webkit-gtk, no longer useful --- net-libs/webkit-gtk/Manifest | 16 -- .../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 10 - .../files/webkit-gtk-1.6.1-darwin-quartz.patch | 67 ------ .../files/webkit-gtk-2.2.5-hppa-platform.patch | 20 -- .../files/webkit-gtk-2.2.5-ia64-platform.patch | 12 - .../files/webkit-gtk-2.4.1-ia64-malloc.patch | 20 -- .../webkit-gtk-2.4.11-JSStringRef-typedef.patch | 19 -- .../files/webkit-gtk-2.4.11-WKString-typedef.patch | 19 -- .../files/webkit-gtk-2.4.11-video-web-audio.patch | 11 - .../files/webkit-gtk-2.4.4-atomic-ppc.patch | 32 --- .../files/webkit-gtk-2.4.4-jpeg-9a.patch | 30 --- .../files/webkit-gtk-2.4.7-disable-webgl.patch | 11 - .../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch | 29 --- .../files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 -- .../webkit-gtk-random-compilation-failures.patch | 41 ---- net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 267 --------------------- 16 files changed, 625 deletions(-) delete mode 100644 net-libs/webkit-gtk/Manifest delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild (limited to 'net-libs/webkit-gtk') diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest deleted file mode 100644 index bdfd0a6..0000000 --- a/net-libs/webkit-gtk/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 BLAKE2B 19086e859da5b565c31aff471a55a1b5896f9ffc9f3a916737f6639483711ef6e3587184f7c89d5578c217eabb41be8d52bfb8f015e30daaff8f77fdb9d6e614 SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 -AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 BLAKE2B 728f0c5a6952179bc06ede8b3a71eae51e082802d8db720e5dfad859e02a5d3915756aa4368df790a549f9a61dfad7f0e0da9d6c57f71a9bc27a8ca17b2c69f0 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea -AUX webkit-gtk-2.2.5-hppa-platform.patch 530 BLAKE2B 0326e813a0b732eafd569db4eb408e2924df65464359eca4dfccdbaeecbc853084a08ed6ac50a973e9f5abeb0d6a847e8e8b3a51937d3a8840957af4e607a374 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 -AUX webkit-gtk-2.2.5-ia64-platform.patch 331 BLAKE2B 6793b3cddfdfcdb859cd19b33968bd1da2c4bd9958fe69341f83476d5918cbde2dbbc0a2e191f887265e51ad0ab3ee290f2e2de2bf48752e4c8b9dacd245d5cf SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e -AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 BLAKE2B 240c2f978f2b2cba7fc1d5e2c3c597a462cf28d9dc7d31dcde1db4d64c7cc0a98558bb6bd2ce0f28cb07a74bc333ca01b1ec817674c18a71d1622a821c2a8681 SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 -AUX webkit-gtk-2.4.11-JSStringRef-typedef.patch 526 BLAKE2B e517d4b52ea3440b901f83b2c040a60229ff1aa6d94e7537e95fd0c2274f56c8a89c95db1cf0e2d8bbce4bb7c887f75534a1957a2b230046237224c70b931db3 SHA512 cc06d3bfdd958e9e5304cbb77cefe94e22e60769cbf91441d55b12832650d065c712654760f79d38ce1ebf662788484c5bb553205da4997e5890d9c6961b5c04 -AUX webkit-gtk-2.4.11-WKString-typedef.patch 589 BLAKE2B 552facb401b26fa769f402c8038e9b1903f1f041ffe7cba2c0f7196ecedd3719bd8e105ebb9af46007bbfcb834df94ccddabc81f1b0a44e025ffa450fc4b5315 SHA512 d33b9a5cc36b46d9027e798cb4fb0bc1a8cbdc18d89908f9694154723230f41c8205a1b0e0d899282a5b8846ee36073b6964a07c34ed0b44863d192abb9b366f -AUX webkit-gtk-2.4.11-video-web-audio.patch 520 BLAKE2B f7af9601ad10920aea28f000b5457a5bea3d50ffe8cd873138fae1ffcd5ca191e3517452e748295ddb16ab6ac46d22074d9bf475aa69d2b1772ed44ecb427722 SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1 -AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 BLAKE2B 05d62a79aaa66eeae5d80d5aa25747fcf021c8416a1db8f60b46f7164d3e4648089af99fcc8062d3f543b2b9dd6819efa82a4d54c193cf15465cbaa4d23d2beb SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067 -AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 BLAKE2B 0ba241e782fb5ac415149e621f04f0db8d1fce035e78b1fca77902a7904858f71a25d19f6666f8a25b22b34a1104372ccd681a124e142fecafa232c778040019 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583 -AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3d966d989ba24094fa98558ab23cb9a73df26666101ae78e41c408429eba5540f6803c564d4736a882bedba3cc7ab920c3c061 SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 -AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c -AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc -AUX webkit-gtk-random-compilation-failures.patch 1620 BLAKE2B 6e8053fffcc56bb03760f759b73bd591d10f95c3ce4de1bb4f7779a7a1aa11a6236c18b38f61e064eb3b711cee5fd81b66513c07a475f2ff0806db19d112d410 SHA512 798b713f40251ebfe80ee366d0f1829a523575fc68955c199983458a120cc367a8a4ee42b1788ca84c559939a29284e644ddd07f375e9514d463052a1e6cd604 -DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb -EBUILD webkit-gtk-2.4.11-r200.ebuild 8546 BLAKE2B 32e2cd36e6348a6b12b670e40dce811a79f155a22e30c5e0b5a000874bd0e12c8cf263922fb269b76ac74544271c9b2d9ac7fc9d65748501f1e20574dbd1d103 SHA512 1b18cdc66f9b65a4000d5abd901f4f052bf321e47feb5cb56ee60c654cb661d5a3c546643a9adee102445397c01ab06c6103c78e4c1419d5c3dc834dc2705e80 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 deleted file mode 100644 index c94f545..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 5ad357e..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 - -+#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 deleted file mode 100644 index 8aee778..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index a63e9e8..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 8c387ff..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix wide pointer issues on ia64 (closes: #642750). -Author: Stephan Schreiber -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-JSStringRef-typedef.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch deleted file mode 100644 index 395c1d5..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-JSStringRef-typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.h 2016-04-10 08:48:36.000000000 +0200 -+++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.h 2017-12-20 23:04:55.000000000 +0100 -@@ -27,6 +27,7 @@ - #define JSStringRef_h - - #include -+#include - - #ifndef __cplusplus - #include -@@ -43,7 +44,7 @@ - @typedef JSChar - @abstract A Unicode character. - */ -- typedef unsigned short JSChar; -+ typedef char16_t JSChar; - #else - typedef wchar_t JSChar; - #endif diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch deleted file mode 100644 index d83ed6d..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-WKString-typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.h 2016-04-10 08:48:37.000000000 +0200 -+++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.h 2017-12-20 22:14:19.097225121 +0100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - #ifndef __cplusplus - #include -@@ -39,7 +40,7 @@ - - #if !defined(WIN32) && !defined(_WIN32) \ - && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ -- typedef unsigned short WKChar; -+ typedef char16_t WKChar; - #else - typedef wchar_t WKChar; - #endif 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 deleted file mode 100644 index ead696c..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index c160376..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch +++ /dev/null @@ -1,32 +0,0 @@ -$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 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 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 deleted file mode 100644 index cded605..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 67760e2..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index bd8507c..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch +++ /dev/null @@ -1,29 +0,0 @@ -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(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(abs(time)); -+ int seconds = static_cast(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-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch deleted file mode 100644 index 6c88c49..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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-random-compilation-failures.patch b/net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch deleted file mode 100644 index c552770..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-random-compilation-failures.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git i/Source/WebCore/platform/graphics/SegmentedFontData.cpp w/Source/WebCore/platform/graphics/SegmentedFontData.cpp -index efb20a8..f0812e0 100644 ---- i/Source/WebCore/platform/graphics/SegmentedFontData.cpp -+++ w/Source/WebCore/platform/graphics/SegmentedFontData.cpp -@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) - { - UChar32 c; - for (int i = 0; i < length; ) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!containsCharacter(c)) - return false; - } -diff --git i/Source/WebCore/dom/Document.cpp w/Source/WebCore/dom/Document.cpp -index 1e677dc9..49fc03f0 100644 ---- i/Source/WebCore/dom/Document.cpp -+++ w/Source/WebCore/dom/Document.cpp -@@ -3912,12 +3912,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -3980,7 +3980,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - const UChar* s = qualifiedName.deprecatedCharacters(); - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(s, i, length, c) -+ U16_NEXT(s, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; 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 deleted file mode 100644 index 153a093..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby24 ruby25 ruby26" - -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 ~amd64-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/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 - - eapply "${FILESDIR}"/${PN}-2.4.11-WKString-typedef.patch - eapply "${FILESDIR}"/${PN}-2.4.11-JSStringRef-typedef.patch - - # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 - eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch - - eapply "${FILESDIR}"/${PN}-random-compilation-failures.patch - - AT_M4DIR=Source/autotools eautoreconf - - 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 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_ruby26]"; then - ruby_interpreter="RUBY=$(type -P ruby26)" - elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then - ruby_interpreter="RUBY=$(type -P ruby25)" - elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then - ruby_interpreter="RUBY=$(type -P ruby24)" - else - ruby_interpreter="RUBY=$(type -P ruby24)" - 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 -} -- cgit v1.2.3