subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-libs\/webkit\-gtk\/, net\-libs\/webkit\-gtk\/files\/"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2024-04-20 Thread Mart Raudsepp

commit: fceeef1e0b2bbeab82426a2d1b1559c81c23c446
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Apr 20 11:38:27 2024 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Apr 20 11:41:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fceeef1e

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/930116
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 -
 .../files/2.42.1-arm64-non-jumbo-fix.patch |  38 ---
 .../webkit-gtk/files/2.42.4-wasm-assert-fix.patch  |  53 
 .../webkit-gtk/files/2.42.5-x86-build-fix.patch|  33 ---
 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild  | 272 -
 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild  | 265 
 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild   | 262 
 7 files changed, 924 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d16f12f021d7..a612e3d5a00d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 
4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516
 SHA512 
9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B 
a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16
 SHA512 
b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169

diff --git a/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch 
b/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch
deleted file mode 100644
index ec05d647d7f8..
--- a/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c5e664167ec74b24a9082506fe17dee1ea194185 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Wed, 18 Oct 2023 13:08:30 +0300
-Subject: [PATCH] [JSC] Fix Air OptimizePairedLoadStore missing header includes
-
-Reviewed by NOBODY (OOPS!).
-
-Fixes compile errors with non-unified build by adding missing include files for
-single unit compilation.
-Fixed compilation errors:
-
-error: incomplete type 'JSC::CCallHelpers' named in nested name specifier
-error: function 
'JSC::B3::Air::Inst::forEachDefWithExtraClobberedRegs' is used but not defined in this translation unit, and cannot 
be defined in any other translation unit because its type does not have linkage
-
-* Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp

- Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-https://github.com/WebKit/WebKit/pull/19242
-
-diff --git a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp 
b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
-index e6fc4d116d00..8321ba03822a 100644
 a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
-+++ b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
-@@ -32,7 +32,9 @@
- #include "AirArgInlines.h"
- #include "AirCode.h"
- #include "AirInst.h"
-+#include "AirInstInlines.h"
- #include "AirPhaseScope.h"
-+#include "CCallHelpers.h"
- #include 
- 
- namespace JSC { namespace B3 { namespace Air {
--- 
-2.42.0
-

diff --git a/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch 
b/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch
deleted file mode 100644
index da54b9b9a0e2..
--- a/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 509b303bf5650710bee5e151decc1a723a54657f Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki 
-Date: Tue, 2 Jan 2024 12:25:20 -0800
-Subject: [PATCH] Source/JavaScriptCore/wasm/generateWasm.py: return value in
- int for memorybits
-
-https://bugs.webkit.org/show_bug.cgi?id=266942
-
-Reviewed by Justin Michaud.
-
-The assert function currently checks, if power number raised to the
-number fits memorybits. This seems not always work on every system,
-as it happens, that the float numbers are not correctly rounded.
-
-This patch adds an int, so its being rounded to a full number and works
-on my system, where otherwise the rounding would fail. The return method
-also returns the result as an int.
-
-Example:
-import math
-
-2 ** 3
-= 8
-
-2.0 ** 3.0
-= 7.999
-
-int(2.0) ** int(3.0)
-= 8
-
-2 ** int(3.0)
-= 8
-
-Signed-off-by: Conrad Kostecki 
-Canonical link: https://commits.webkit.org/272577@main

- Source/JavaScriptCore/wasm/generateWasm.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/JavaScriptCore/wasm/generateWasm.py 
b/Source/JavaScriptCore/wasm/generateWasm.py
-index 434223d346a0..7a99210b60a2 100755

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2024-02-23 Thread Sam James

commit: def7940deda97a5f2f716437911b090a9a3fb625
Author: Branko Grubic  gmail  com>
AuthorDate: Mon Feb 19 19:16:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 19:07:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def7940d

net-libs/webkit-gtk: Fixes build on x86 for 2.42.5

Closes: https://bugs.gentoo.org/924873
Signed-off-by: Branko Grubic  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35430
Signed-off-by: Sam James  gentoo.org>

 .../webkit-gtk/files/2.42.5-x86-build-fix.patch| 33 ++
 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild  |  2 ++
 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild  |  2 ++
 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild   |  2 ++
 4 files changed, 39 insertions(+)

diff --git a/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch 
b/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch
new file mode 100644
index ..f5f4120f06cc
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch
@@ -0,0 +1,33 @@
+From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro 
+Date: Mon, 5 Feb 2024 11:00:49 -0600
+Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?=
+ =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?=
+ =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?=
+ =?UTF-8?q?=3D268739?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Unreviewed build fix. Seems a backport went badly, and we didn't notice
+because the code is architecture-specific.
+
+* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
+(JSC::CLoop::execute):
+---
+ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 
b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+index 5064ead6cd2e..9a2e2653b121 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
 b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* 
executableAddress, VM* vm,
+ UNUSED_VARIABLE(t2);
+ UNUSED_VARIABLE(t3);
+ UNUSED_VARIABLE(t5);
+-UNUSED_VARIABLE(t6);
+-UNUSED_VARIABLE(t7);
+ 
+ struct StackPointerScope {
+ StackPointerScope(CLoopStack& stack)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index 54bf8cd4e088..0f1a6bea0d66 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -157,6 +157,8 @@ src_prepare() {
eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
# Fix assert failure on some machines, bug #920704
eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
+   # Fix compilation on x86, bug #924873
+   eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index e50d46619df2..be33daab50ba 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -158,6 +158,8 @@ src_prepare() {
eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
# Fix assert failure on some machines, bug #920704
eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
+   # Fix compilation on x86, bug #924873
+   eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index d4913a9eb4f8..002acc94dddf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -155,6 +155,8 @@ src_prepare() {
eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
# Fix assert failure on some machines, bug #920704
eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
+   # Fix compilation on x86, bug #924873
+   eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2023-08-09 Thread Matt Turner

commit: 82b844e81dc6416ba68a67315ded3f75aeef8789
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Aug  9 18:00:36 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Aug  9 18:07:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b844e8

net-libs/webkit-gtk: Fix build with USE=-gstreamer

Closes: https://bugs.gentoo.org/911663
Signed-off-by: Matt Turner  gentoo.org>

 ...ailure-when-gstreamer-support-is-disabled.patch | 33 ++
 net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild  |  6 
 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild  |  6 
 net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild   |  6 
 4 files changed, 51 insertions(+)

diff --git 
a/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch
 
b/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch
new file mode 100644
index ..f59f3ee09780
--- /dev/null
+++ 
b/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch
@@ -0,0 +1,33 @@
+https://github.com/WebKit/WebKit/pull/16398
+
+From f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Tue, 8 Aug 2023 16:51:25 -0700
+Subject: [PATCH] Fix build failure when gstreamer support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663
+
+Reviewed by Carlos Alberto Lopez Perez.
+
+* Source/WebCore/loader/MixedContentChecker.cpp:
+
+Canonical link: https://commits.webkit.org/260527.429@fix-build
+---
+ Source/WebCore/loader/MixedContentChecker.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/WebCore/loader/MixedContentChecker.cpp 
b/Source/WebCore/loader/MixedContentChecker.cpp
+index 9b4c7fe62020..ac4733bc08bc 100644
+--- a/Source/WebCore/loader/MixedContentChecker.cpp
 b/Source/WebCore/loader/MixedContentChecker.cpp
+@@ -33,6 +33,8 @@
+ #include "ContentSecurityPolicy.h"
+ #include "Document.h"
+ #include "Frame.h"
++#include "FrameLoader.h"
++#include "FrameLoaderClient.h"
+ #include "SecurityOrigin.h"
+ 
+ namespace WebCore {
+-- 
+2.41.0
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
index 46521ce3874e..0a80902a1200 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
@@ -122,6 +122,10 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
 pkg_pretend() {
if [[ ${MERGE_TYPE} != "binary" ]] ; then
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -146,6 +150,8 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+   eapply 
"${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index 4e2e199e53c8..eebf464f2fd0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -123,6 +123,10 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
 pkg_pretend() {
if [[ ${MERGE_TYPE} != "binary" ]] ; then
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -147,6 +151,8 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+   eapply 
"${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
index 0af88789a7fa..460653b5eb96 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
@@ -120,6 +120,10 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
 
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
 pkg_pretend() {
if [[ ${MERGE_TYPE} != "binary" ]] ; then
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
@@ -144,6 +148,8 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+   eapply 
"${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2023-07-16 Thread Matt Turner

commit: a0071e39738ef940e932d4fd390f818454963056
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jul 16 14:36:52 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jul 16 14:37:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0071e39

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/907818
Bug: https://bugs.gentoo.org/909663
Signed-off-by: Matt Turner  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   2 -
 .../webkit-gtk/files/2.40.0-respect-RUBY.patch |  30 ---
 ...-262461-main-b36decf27ea9-.-https-bugs.we.patch |  37 ---
 net-libs/webkit-gtk/files/2.40.1-gcc-13.patch  |  21 --
 ...-264395-main-4977290ab4ab-.-https-bugs.we.patch |  47 
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild  | 258 
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild  | 251 
 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild   | 248 
 net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild  | 259 -
 net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild  | 252 
 net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild   | 249 
 11 files changed, 1654 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8c2084f61be6..31925947bbe2 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1 @@
-DIST webkitgtk-2.40.1.tar.xz 39599544 BLAKE2B 
b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d
 SHA512 
e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
-DIST webkitgtk-2.40.2.tar.xz 40065104 BLAKE2B 
177ac87de1c17768c50761f4146f3c8dc218abacb9de0c811ec4acf2ea7117cd62e256cb09345c55ee8da7479c8df3faf3c1b09d0876be33dd740bf6541af27d
 SHA512 
2fea73faffe171845f3710995bb27eb7350aa9ba7b513e7f0fc163c09fc63d73112a55dbc010af67e422c59baa9bfc85018f470a0255e43eb17aae465946eef7
 DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B 
b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d
 SHA512 
2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e

diff --git a/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch 
b/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch
deleted file mode 100644
index 058dbb36cb96..
--- a/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/771744
-https://github.com/WebKit/WebKit/pull/12358
-
-From 5cda2bac84e6900401810b56ba4de82de714cae0 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Tue, 4 Apr 2023 04:31:01 +0100
-Subject: [PATCH] postprocess-asm rule doesn't respect RUBY_EXECUTABLE
- https://bugs.webkit.org/show_bug.cgi?id=254965
-
-Reviewed by NOBODY (OOPS!).
-
-postprocess-asm is a Ruby script with #/!/usr/bin/env ruby as its shebang which
-looks up Ruby in PATH. webkit, however, has RUBY_EXECUTABLE as a CMake option.
-It's possible for the Ruby used by CMake (and the other rules during the build)
-to be different to the first Ruby found in PATH. This makes the usage for 
postprocess-asm
-consistent with other uses in webkit.
-
-* Source/JavaScriptCore/CMakeLists.txt
 a/Source/JavaScriptCore/CMakeLists.txt
-+++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1507,7 +1507,7 @@ endif ()
- if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
- message(STATUS "Enabling asm postprocessing")
- 
--set(LowLevelInterpreter_LAUNCHER 
"${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm")
-+set(LowLevelInterpreter_LAUNCHER "${RUBY_EXECUTABLE} 
${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm")
- get_target_property(PROP_RULE_LAUNCH_COMPILE LowLevelInterpreterLib 
RULE_LAUNCH_COMPILE)
- if (PROP_RULE_LAUNCH_COMPILE)
- set(LowLevelInterpreter_LAUNCHER "${LowLevelInterpreter_LAUNCHER} 
${PROP_RULE_LAUNCH_COMPILE}")
-

diff --git 
a/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
 
b/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
deleted file mode 100644
index feac03354071..
--- 
a/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cfa5e2a8dab746c14c2e5876a48ff0d66cdf7486 Mon Sep 17 00:00:00 2001
-From: Don Olmstead 
-Date: Fri, 31 Mar 2023 19:46:07 -0700
-Subject: [PATCH] Cherry-pick 262461@main (b36decf27ea9).
- https://bugs.webkit.org/show_bug.cgi?id=254852
-
-Fix !ENABLE(WEB_AUDIO) build after 262451@main
-https://bugs.webkit.org/show_bug.cgi?id=254852
-
-Unreviewed build fix.
-
-Add !ENABLE(WEB_AUDIO) guard.
-
-* Source/WebCore/page/MemoryRelease.cpp:
-
-

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2023-04-25 Thread Matt Turner

commit: 4e80633488edc854dd7c44bf7d3b3dd951d23805
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 25 21:37:44 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 25 21:38:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e806334

net-libs/webkit-gtk: Add patch to fix build with USE=-gstreamer

Closes: https://bugs.gentoo.org/904826
Signed-off-by: Matt Turner  gentoo.org>

 ...-262461-main-b36decf27ea9-.-https-bugs.we.patch | 37 ++
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild  |  1 +
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild  |  1 +
 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild   |  1 +
 4 files changed, 40 insertions(+)

diff --git 
a/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
 
b/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
new file mode 100644
index ..feac03354071
--- /dev/null
+++ 
b/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
@@ -0,0 +1,37 @@
+From cfa5e2a8dab746c14c2e5876a48ff0d66cdf7486 Mon Sep 17 00:00:00 2001
+From: Don Olmstead 
+Date: Fri, 31 Mar 2023 19:46:07 -0700
+Subject: [PATCH] Cherry-pick 262461@main (b36decf27ea9).
+ https://bugs.webkit.org/show_bug.cgi?id=254852
+
+Fix !ENABLE(WEB_AUDIO) build after 262451@main
+https://bugs.webkit.org/show_bug.cgi?id=254852
+
+Unreviewed build fix.
+
+Add !ENABLE(WEB_AUDIO) guard.
+
+* Source/WebCore/page/MemoryRelease.cpp:
+
+Canonical link: https://commits.webkit.org/262461@main
+---
+ Source/WebCore/page/MemoryRelease.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/WebCore/page/MemoryRelease.cpp 
b/Source/WebCore/page/MemoryRelease.cpp
+index d2d5009785bc..aa0c8cff9571 100644
+--- a/Source/WebCore/page/MemoryRelease.cpp
 b/Source/WebCore/page/MemoryRelease.cpp
+@@ -103,7 +103,9 @@ static void releaseCriticalMemory(Synchronous synchronous, 
MaintainBackForwardCa
+ }
+ 
+ CSSValuePool::singleton().drain();
++#if ENABLE(WEB_AUDIO)
+ HRTFElevation::clearCache();
++#endif
+ 
+ Page::forEachPage([](auto& page) {
+ page.cookieJar().clearCache();
+-- 
+2.39.2
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index c76820e446b6..9e6da0c3793d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -144,6 +144,7 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+   eapply 
"${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
eapply "${FILESDIR}/${PV}"-gcc-13.patch
eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index 5d49417623dd..234c21d774d3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -145,6 +145,7 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+   eapply 
"${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
eapply "${FILESDIR}/${PV}"-gcc-13.patch
eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index 7cf6812b9cc8..9e732b26cc20 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -142,6 +142,7 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+   eapply 
"${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch
eapply "${FILESDIR}/${PV}"-gcc-13.patch
eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2023-04-21 Thread Matt Turner

commit: d136a2c47beb1a38899e226b84f650be41f5c2ca
Author: Guillermo Joandet  gmail  com>
AuthorDate: Fri Apr 21 21:59:10 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Apr 22 03:08:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d136a2c4

net-libs/webkit-gtk: Version bump to 2.40.1

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30692
Signed-off-by: Matt Turner  gentoo.org>

 net-libs/webkit-gtk/Manifest  |   1 +
 net-libs/webkit-gtk/files/2.40.1-gcc-13.patch |  21 ++
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 257 ++
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 250 +
 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild  | 247 +
 5 files changed, 776 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index fcaa8c079336..d1ad2019519b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 
0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46
 SHA512 
9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
 DIST webkitgtk-2.40.0.tar.xz 40042140 BLAKE2B 
4f26d893da99c7aed18594a844b1f91e32178a1bdd236e0cdd21683ed095ab2196f37c13f749e69b22b72146b98fca2a27778948aabde336d17c4d40dcf0cdc1
 SHA512 
550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
+DIST webkitgtk-2.40.1.tar.xz 39599544 BLAKE2B 
b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d
 SHA512 
e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c

diff --git a/net-libs/webkit-gtk/files/2.40.1-gcc-13.patch 
b/net-libs/webkit-gtk/files/2.40.1-gcc-13.patch
new file mode 100644
index ..6a532924121b
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.40.1-gcc-13.patch
@@ -0,0 +1,21 @@
+https://github.com/WebKit/WebKit/pull/11910
+https://github.com/WebKit/WebKit/commit/93920b55f52ff8b883296f4845269e2ed746acb3
+
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
 b/Source/WebCore/platform/graphics/SourceBrush.cpp
+@@ -65,12 +65,12 @@
+ 
+ void SourceBrush::setGradient(Ref&& gradient, const 
AffineTransform& spaceTransform)
+ {
+-m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } 
};
++m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), 
spaceTransform } };
+ }
+ 
+ void SourceBrush::setPattern(Ref&& pattern)
+ {
+-m_brush = { Brush::Variant { std::in_place_type>, 
WTFMove(pattern) } };
++m_brush = Brush { Brush::Variant { std::in_place_type>, 
WTFMove(pattern) } };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
new file mode 100644
index ..c76820e446b6
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single 
toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org;
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz;
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer 
+introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is 
experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up 
with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's 
WebKitDriver binary
+RDEPEND="
+   >=x11-libs/cairo-1.16.0[X?]
+   >=media-libs/fontconfig-2.13.0:1.0
+   >=media-libs/freetype-2.9.0:2
+   >=dev-libs/libgcrypt-1.7.0:0=
+   >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2023-01-29 Thread Sam James

commit: f82979437cf504e3e45103019292356ca13951c2
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 30 03:59:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 30 03:59:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8297943

net-libs/webkit-gtk: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/892495
Signed-off-by: Sam James  gentoo.org>

 net-libs/webkit-gtk/files/2.38.3-gcc-13.patch | 25 +++
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild |  1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild |  1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild  |  1 +
 4 files changed, 28 insertions(+)

diff --git a/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch 
b/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch
new file mode 100644
index ..860f27824ca4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/892495
+https://github.com/WebKit/WebKit/commit/d318bb461f040b90453bc4e100dcf967243ecd98
+
+From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro 
+Date: Mon, 16 Jan 2023 16:55:26 -0800
+Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in
+ ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689
+
+Unreviewed build fix.
+
+* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h:
+
+Canonical link: https://commits.webkit.org/258968@main
+--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
 b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
+@@ -12,6 +12,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index 8d0c26c31c6e..ca3732bbf87f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -154,6 +154,7 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+   eapply "${FILESDIR}"/2.38.3-gcc-13.patch
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index c5568327a0a2..0124335db111 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -158,6 +158,7 @@ src_prepare() {
gnome2_src_prepare
 
eapply 
"${FILESDIR}"/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
+   eapply "${FILESDIR}"/2.38.3-gcc-13.patch
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 8700c1767670..60be0c41206e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -152,6 +152,7 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+   eapply "${FILESDIR}"/2.38.3-gcc-13.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2022-08-02 Thread Matt Turner

commit: 93f9253163fced331c183be24b515b8c22666fa0
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Aug  2 17:27:51 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Aug  2 20:16:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f92531

net-libs/webkit-gtk: Fix crash regression

Closes: https://bugs.gentoo.org/863008
Signed-off-by: Matt Turner  gentoo.org>

 net-libs/webkit-gtk/files/2.36.5-fix-crash.patch   | 82 ++
 ...k-2.36.5.ebuild => webkit-gtk-2.36.5-r1.ebuild} |  2 +
 2 files changed, 84 insertions(+)

diff --git a/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch 
b/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch
new file mode 100644
index ..0f676a942d06
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/863008
+https://bugs.webkit.org/show_bug.cgi?id=243401
+
+From a6277d4834cce0dea2f999d4c06ffa57abfbb82d Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro 
+Date: Mon, 1 Aug 2022 14:07:04 -0700
+Subject: [PATCH] REGRESSION(252485@main): [GTK]
+ webkit_web_context_get_default() crashes in Eclipse since webkit-gtk v2.36.5,
+ v2.36.4 was fine https://bugs.webkit.org/show_bug.cgi?id=243401
+
+Reviewed by Adrian Perez de Castro.
+
+Turns out WebKit's "main thread" may not actually be the real main
+thread. This is OK as long as it matches the GTK "main thread," and as
+long as the application is careful to iterate the default main context
+only on the WebKit/GTK "main thread," as as long as the application does
+not ever attempt to use these libraries on any other thread.
+
+The motivation to do this is if the programming language controls the
+real thread 1, as is the case with Java, where the Java main thread that
+applications can use to run GTK and WebKit is apparently not the same as
+the real main thread that's running the JVM. These applications have no
+control over what their "main thread" is, and it seems unkind to break
+them.
+
+I've checked in with the GTK developers, and consensus is that this
+is actually expected to work, so let's not break it.
+
+* Source/WTF/wtf/generic/MainThreadGeneric.cpp:
+(WTF::initializeMainThreadPlatform):
+(WTF::isMainThread):
+
+Canonical link: https://commits.webkit.org/253010@main
+---
+ Source/WTF/wtf/generic/MainThreadGeneric.cpp | 13 ++---
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/Source/WTF/wtf/generic/MainThreadGeneric.cpp 
b/Source/WTF/wtf/generic/MainThreadGeneric.cpp
+index 3a9208b0f9ab..b51e2e456047 100644
+--- a/Source/WTF/wtf/generic/MainThreadGeneric.cpp
 b/Source/WTF/wtf/generic/MainThreadGeneric.cpp
+@@ -31,29 +31,22 @@
+  */
+ 
+ #include "config.h"
+-#if !OS(LINUX)
+ #include 
+-#endif
+ #if HAVE(PTHREAD_NP_H)
+ #include 
+ #endif
+-#if OS(LINUX)
+-#include 
+-#include 
+-#include 
+-#endif
+ 
+ #include 
+ 
+ namespace WTF {
+ 
+-#if !HAVE(PTHREAD_MAIN_NP) && !OS(LINUX)
++#if !HAVE(PTHREAD_MAIN_NP)
+ static pthread_t mainThread;
+ #endif
+ 
+ void initializeMainThreadPlatform()
+ {
+-#if !HAVE(PTHREAD_MAIN_NP) && !OS(LINUX)
++#if !HAVE(PTHREAD_MAIN_NP)
+ mainThread = pthread_self();
+ #endif
+ }
+@@ -62,8 +55,6 @@ bool isMainThread()
+ {
+ #if HAVE(PTHREAD_MAIN_NP)
+ return pthread_main_np();
+-#elif OS(LINUX)
+-return getpid() == static_cast(syscall(SYS_gettid));
+ #else
+ return pthread_equal(pthread_self(), mainThread);
+ #endif

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
similarity index 99%
rename from net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
index ac5ee1a431b0..ad7b4de216cf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
@@ -153,6 +153,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+   eapply "${FILESDIR}"/${PV}-fix-crash.patch
+
cmake_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2022-05-13 Thread Matt Turner

commit: 8412706635b0aad1ab6affda4f37fdcc0d139d10
Author: Matt Turner  gentoo  org>
AuthorDate: Fri May 13 12:24:29 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri May 13 12:25:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84127066

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/837305
Bug: https://bugs.gentoo.org/839984
Signed-off-by: Matt Turner  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   2 -
 net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch   |  70 --
 .../webkit-gtk/files/2.34.3-non-jumbo-fix.patch|  31 ---
 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild   | 272 -
 net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild| 250 ---
 5 files changed, 625 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 756881a72c9c..c249cb878e29 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1 @@
-DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 
7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab
 SHA512 
57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
-DIST webkitgtk-2.36.0.tar.xz 26900828 BLAKE2B 
d965c9a0f3ff03d55baba840af7fe0cb3288eaa982f1444aa14a499542d89766815954b9e62b5d39d9536074d59e42d1c0798c5e1d88974f070c239ef1d8eae5
 SHA512 
0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941f6646a63c7679e2380080da
 DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 
8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59
 SHA512 
c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4

diff --git a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch 
b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
deleted file mode 100644
index 97c5c0c8e4b6..
--- a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From b60c2e4d1770660280d97cae9e82f3040ab97229 Mon Sep 17 00:00:00 2001
-From: "ph...@webkit.org"
- 
-Date: Sat, 11 Sep 2021 11:34:42 +
-Subject: [PATCH] [GLIB] MediaSession is not enabled
- https://bugs.webkit.org/show_bug.cgi?id=217991 
-
-leio: Extracted to include only the side-effect of fixing unity builds on
-some machine configurations.
-Thanks-To gen2dev

- Source/WebCore/platform/PlatformScreen.h| 6 ++
- Source/WebCore/platform/graphics/ImageFrame.h   | 6 ++
- Source/WebCore/platform/graphics/ImageOrientation.h | 6 ++
- 3 files changed, 18 insertions(+)
-
-diff --git a/Source/WebCore/platform/PlatformScreen.h 
b/Source/WebCore/platform/PlatformScreen.h
-index d3f12a6538b8..d47d193e8bee 100644
 a/Source/WebCore/platform/PlatformScreen.h
-+++ b/Source/WebCore/platform/PlatformScreen.h
-@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen;
- typedef struct CGColorSpace *CGColorSpaceRef;
- #endif
- 
-+// X11 headers define a bunch of macros with common terms, interfering with 
WebCore and WTF enum values.
-+// As a workaround, we explicitly undef them here.
-+#if defined(None)
-+#undef None
-+#endif
-+
- namespace WebCore {
- 
- class DestinationColorSpace;
-diff --git a/Source/WebCore/platform/graphics/ImageFrame.h 
b/Source/WebCore/platform/graphics/ImageFrame.h
-index 9843aac40eb4..92e1d4486c5f 100644
 a/Source/WebCore/platform/graphics/ImageFrame.h
-+++ b/Source/WebCore/platform/graphics/ImageFrame.h
-@@ -33,6 +33,12 @@
- #include "NativeImage.h"
- #include 
- 
-+// X11 headers define a bunch of macros with common terms, interfering with 
WebCore and WTF enum values.
-+// As a workaround, we explicitly undef them here.
-+#if defined(None)
-+#undef None
-+#endif
-+
- namespace WebCore {
- 
- class ImageFrame {
-diff --git a/Source/WebCore/platform/graphics/ImageOrientation.h 
b/Source/WebCore/platform/graphics/ImageOrientation.h
-index d990a3dc555f..5de271e52352 100644
 a/Source/WebCore/platform/graphics/ImageOrientation.h
-+++ b/Source/WebCore/platform/graphics/ImageOrientation.h
-@@ -30,6 +30,12 @@
- #include "FloatSize.h"
- #include 
- 
-+// X11 headers define a bunch of macros with common terms, interfering with 
WebCore and WTF enum values.
-+// As a workaround, we explicitly undef them here.
-+#if defined(None)
-+#undef None
-+#endif
-+
- namespace WebCore {
- 
- struct ImageOrientation {
--- 
-2.32.0
-

diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch 
b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
deleted file mode 100644
index 74790d9f6cef..
--- a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001
-From: "don.olmst...@sony.com"
-

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2022-01-18 Thread Mart Raudsepp

commit: 9e7aaec2b8595b132f68dcb2fa1151b128be5af7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Jan 18 21:39:12 2022 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Jan 18 21:39:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7aaec2

net-libs/webkit-gtk: security cleanup

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 -
 .../files/2.28.2-opengl-without-X-fixes.patch  |  55 
 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild   | 300 -
 3 files changed, 356 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5da5a930fec9..e3070fd7c047 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 
13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6
 SHA512 
c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 
03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0
 SHA512 
f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc

diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch 
b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
deleted file mode 100644
index 7feb2fac42c3..
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=208907
-
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-

- Source/WebCore/platform/graphics/GLContext.cpp | 5 -
- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 -
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/GLContext.cpp 
b/Source/WebCore/platform/graphics/GLContext.cpp
-index b217988b990..1ba0eb8a482 100644
 a/Source/WebCore/platform/graphics/GLContext.cpp
-+++ b/Source/WebCore/platform/graphics/GLContext.cpp
-@@ -28,6 +28,9 @@
- 
- #if USE(GLX)
- #include "GLContextGLX.h"
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
- #include "OpenGLShims.h"
- #endif
- 
-@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext()
- 
- static bool initializeOpenGLShimsIfNeeded()
- {
--#if USE(OPENGL_ES) || USE(LIBEPOXY)
-+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
- return true;
- #else
- static bool initialized = false;
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 
b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
 a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
- 
- #if USE(GLX)
- #include 
--#include 
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
- 
- #if USE(GSTREAMER)
--- 
-2.20.1
-

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
deleted file mode 100644
index 50c1d19b401f..
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 
ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org;
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz;
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring 
+gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl 
seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-   gles2-only? ( egl !opengl )
-   gstreamer? ( opengl? ( egl ) )
-   wayland? ( egl )
-   || ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-#

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2022-01-05 Thread Mart Raudsepp

commit: 787ced071cd5a21e90d1f0b7be1df8614b313e60
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Jan  5 16:20:43 2022 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Jan  5 16:21:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=787ced07

net-libs/webkit-gtk: remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   2 -
 .../files/2.34.1-opengl-without-X-fixes.patch  |  31 ---
 net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild| 294 -
 net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild   | 294 -
 4 files changed, 621 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 40ab77d4b1bb..5da5a930fec9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 
13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6
 SHA512 
c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
-DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 
645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6
 SHA512 
13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
-DIST webkitgtk-2.34.2.tar.xz 24996572 BLAKE2B 
eb89965065e39d6cc2b54a4a167a19fee50387a25a5285b5eb369b6f2a7af550bff5b476fc27d5e4348c40e2523b76c31116d9ce2f70578f38ce81b2379143af
 SHA512 
37c40fb067ee9f5bb8786bf2ce92aac885e9c5c2da4bc5f4e81682ccfb5eeb0aa94d5094f6aa99a9af216f542d1823094cf27aea13c7be3e5e6e3f6a9729c7a5
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 
03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0
 SHA512 
f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc

diff --git a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch 
b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
deleted file mode 100644
index a4cf86f36cbf..
--- a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=208907
-
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-

- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 -
- 1 file changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 
b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
 a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
- 
- #if USE(GLX)
- #include 
--#include 
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
- 
- #if USE(GSTREAMER)
--- 
-2.20.1
-

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
deleted file mode 100644
index fec3dc003ca7..
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 
ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org;
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz;
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring 
+gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl 
seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-   gles2-only? ( egl !opengl )
-   gstreamer? ( opengl? ( egl ) )
-   wayland? ( egl )
-   || ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2022-01-02 Thread Mart Raudsepp

commit: 4695bb5e5677e5590e5322204034c71f2ff89c63
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jan  2 21:30:13 2022 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jan  2 22:44:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4695bb5e

net-libs/webkit-gtk: fix USE=-opengl build patch

When adapting the patch to 2.34 series I saw that the latter hunk was
included upstream now, and assumed all is fine or didn't notice I'm
deleting multiple hunks - but the first hunk for header includes is
still necessary.

Thanks-to: Alex Xu (Hello71)  yahoo.ca>
Closes: https://bugs.gentoo.org/819384
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/2.34.3-opengl-without-X-fixes.patch  | 46 ++
 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild   |  2 +-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch 
b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch
new file mode 100644
index ..5608500376ff
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch
@@ -0,0 +1,46 @@
+https://bugs.webkit.org/show_bug.cgi?id=208907
+
+From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sat, 9 May 2020 23:11:52 +0300
+Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
+ some build configurations
+
+---
+ Source/WebCore/platform/graphics/GLContext.cpp | 3 +++
+ Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 -
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/GLContext.cpp 
b/Source/WebCore/platform/graphics/GLContext.cpp
+index b217988b990..1ba0eb8a482 100644
+--- a/Source/WebCore/platform/graphics/GLContext.cpp
 b/Source/WebCore/platform/graphics/GLContext.cpp
+@@ -28,6 +28,9 @@
+ 
+ #if USE(GLX)
+ #include "GLContextGLX.h"
++#endif
++
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
+ #include "OpenGLShims.h"
+ #endif
+ 
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 
b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+index 3515be452b2..82cce70f14b 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
 b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+@@ -64,7 +64,10 @@
+ 
+ #if USE(GLX)
+ #include 
+-#include 
++#endif
++
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
++#include "WebCore/OpenGLShims.h"
+ #endif
+ 
+ #if USE(GSTREAMER)
+-- 
+2.20.1
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index f6b51ffd2814..ff06c0b8a9ef 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -171,7 +171,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   eapply "${FILESDIR}"/2.34.1-opengl-without-X-fixes.patch
+   eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
cmake_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2021-05-30 Thread Matt Turner

commit: 1f2d5eb9782f51dff1cb6a485292601a24a39049
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May 30 23:56:25 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May 31 01:58:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2d5eb9

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/779175
Signed-off-by: Matt Turner  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 -
 .../webkit-gtk/files/2.28.2-non-jumbo-fix.patch|  34 ---
 .../webkit-gtk/files/2.28.4-non-jumbo-fix2.patch   |  31 ---
 .../webkit-gtk/files/2.30.3-fix-noGL-build.patch   |  27 --
 .../webkit-gtk-2.24.4-eglmesaext-include.patch |  10 -
 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild   | 300 -
 6 files changed, 403 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a3291c457cb..391d1ff5b4f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 
369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05
 SHA512 
fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
 DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B 
a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863
 SHA512 
ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843

diff --git a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch 
b/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
deleted file mode 100644
index da9f1d3f56a..000
--- a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Tue, 12 May 2020 15:28:45 +0300
-Subject: [PATCH] Try to fix an apparent non-unified build error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In 
member function ‘WTF::RefPtr
-WebKit::InjectedBundleHitTestResult::urlElementHandle() const’:
-Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: 
error: no matching function for call to
-‘WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)’
-   57 | return 
InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement());
-  |
  ^
-In file included from 
Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29

- .../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp| 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git 
a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 
b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-index df8e55df1f0..26f045bd3fc 100644
 a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-@@ -32,6 +32,7 @@
- #include "WebImage.h"
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
--- 
-2.20.1
-

diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch 
b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
deleted file mode 100644
index d7bc379d2b1..000
--- a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Sat, 11 Jul 2020 15:28:05 +0300
-Subject: [PATCH] Try to fix another apparent non-unified build error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from 
here
-/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: 
error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
-   79 |  static_assert(sizeof(_Tp)>0,
-  |^~~

- Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 
b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-index 55d9e34df61..12a7a83cc61 100644
 a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-+++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-@@ -19,6 +19,7 @@
- 
- #pragma once
- 
-+#include "ImageBuffer.h"
- #include "RenderSVGResourceContainer.h"
- #include "SVGClipPathElement.h"
- #include "SVGUnitTypes.h"
--- 
-2.20.1
-

diff --git

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2021-05-12 Thread Matt Turner

commit: e478f39b721645ca9142a15d75f3947adcd2c1a9
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May  2 20:43:17 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 12 22:00:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e478f39b

net-libs/webkit-gtk: Version bump to 2.32.1

Closes: https://github.com/gentoo/gentoo/pull/20314
Signed-off-by: Matt Turner  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 +
 .../files/2.28.2-opengl-without-X-fixes.patch  |   2 +
 ...e-CompletionHandler-when-USE_OPENGL_OR_ES.patch |  36 +++
 net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild   | 301 +
 4 files changed, 340 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 47c55e0ecf0..a3291c457cb 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 
369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05
 SHA512 
fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
+DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B 
a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863
 SHA512 
ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843

diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch 
b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
index 6976c3ce4db..7feb2fac42c 100644
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
@@ -1,3 +1,5 @@
+https://bugs.webkit.org/show_bug.cgi?id=208907
+
 From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
 From: Mart Raudsepp 
 Date: Sat, 9 May 2020 23:11:52 +0300

diff --git 
a/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
 
b/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
new file mode 100644
index 000..dfe0ed9ef00
--- /dev/null
+++ 
b/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
@@ -0,0 +1,36 @@
+From 94cdcd289b993ed4d39c17d4b8b90db7c81a9b10 Mon Sep 17 00:00:00 2001
+From: "commit-qu...@webkit.org"
+ 
+Date: Sat, 10 Apr 2021 22:02:50 +
+Subject: [PATCH] Properly use CompletionHandler when USE_OPENGL_OR_ES is set
+ to OFF https://bugs.webkit.org/show_bug.cgi?id=224149
+
+Patch by Charlène Wendling  on 2021-04-10
+Reviewed by Fujii Hironori.
+
+* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
+(WebKit::LayerTreeHost::forceRepaintAsync):
+
+Canonical link: https://commits.webkit.org/236373@main
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275802 
268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/ChangeLog| 10 ++
+ .../WebPage/CoordinatedGraphics/LayerTreeHost.h|  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git 
a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 
b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+index 6727d16c8c0b..db65f813267d 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
 b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -213,7 +213,7 @@ inline void 
LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { 
}
+ inline void LayerTreeHost::scrollNonCompositedContents(const 
WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler&) { 
return false; }
++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler&&) { }
+ inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
+ inline void LayerTreeHost::pauseRendering() { }
+ inline void LayerTreeHost::resumeRendering() { }
+-- 
+2.26.3
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
new file mode 100644
index 000..eb00847845d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 
ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org;

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2020-11-27 Thread Mart Raudsepp

commit: afcb4c9522c9d14dc54ca1d35b0d45dadf6b12f3
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Nov 27 20:52:15 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Nov 27 20:54:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcb4c95

net-libs/webkit-gtk: fix discouraged USE="-opengl" build with USE=X

Closes: https://bugs.gentoo.org/757261
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../webkit-gtk/files/2.30.3-fix-noGL-build.patch   | 27 ++
 net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch 
b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
new file mode 100644
index 000..5e9f4267731
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
@@ -0,0 +1,27 @@
+From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Fri, 27 Nov 2020 22:47:30 +0200
+Subject: [PATCH] [X11] Fix build with disabled OpenGL
+
+The added PlatformDisplayX11::visual() method requires symbols from
+X11/Xutil.h, which wasn't added as an explicit include with only
+EGL headers indirectly pulled it in with standard build options.
+---
+ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 
b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+index 8fe3d3e92c88..2b2805446aad 100644
+--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
 b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+@@ -30,6 +30,7 @@
+ 
+ #if PLATFORM(X11)
+ #include 
++#include 
+ #include 
+ #if PLATFORM(GTK)
+ #include 
+-- 
+2.20.1
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
index c2c5d814610..42baa21fdab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -174,6 +174,7 @@ src_prepare() {
eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+   eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch
cmake-utils_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2020-07-29 Thread Mart Raudsepp

commit: 6569d323edf44504c8a6d59018f53e9e0ec194ef
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Jul 29 11:42:22 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Jul 29 14:08:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6569d323

net-libs/webkit-gtk: security bump to 2.28.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 +
 .../webkit-gtk/files/2.28.4-non-jumbo-fix2.patch   |  31 +++
 net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild   | 290 +
 3 files changed, 322 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e5f86c322b0..63a7c52480e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.28.3.tar.xz 21425556 BLAKE2B 
f51522c33fa97aa00dee1428bc256ef910dd8764b3731580639c79642965c60b91b8d2f5c1d3bdb60975c68706d415447e8b52520ecfa1687968f3790137234b
 SHA512 
575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643
+DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 
5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6
 SHA512 
227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1

diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch 
b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
new file mode 100644
index 000..d7bc379d2b1
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
@@ -0,0 +1,31 @@
+From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sat, 11 Jul 2020 15:28:05 +0300
+Subject: [PATCH] Try to fix another apparent non-unified build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from 
here
+/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: 
error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
+   79 |  static_assert(sizeof(_Tp)>0,
+  |^~~
+---
+ Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 
b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+index 55d9e34df61..12a7a83cc61 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
 b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include "ImageBuffer.h"
+ #include "RenderSVGResourceContainer.h"
+ #include "SVGClipPathElement.h"
+ #include "SVGUnitTypes.h"
+-- 
+2.20.1
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
new file mode 100644
index 000..be64db08026
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 
ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org;
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz;
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc 
+introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+   gles2-only? ( egl !opengl )
+   gstreamer? ( opengl? ( egl ) )
+   wayland? ( egl )
+   || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is 
experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+   >=gui-libs/libwpe-1.3.0:1.0
+   >=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up 
with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+   >=x11-libs/cairo-1.16.0:=[X?]
+

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2020-07-19 Thread Mart Raudsepp

commit: 5006f73937044695f6a1317de58ef80d12b19b7a
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 19 05:58:49 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 19 05:59:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5006f739

net-libs/webkit-gtk: remove old

Bug: https://bugs.gentoo.org/699156
Bug: https://bugs.gentoo.org/712260
Bug: https://bugs.gentoo.org/732104
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   3 -
 .../files/2.26.2-fix-arm-non-unified-build.patch   |  27 --
 net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch |  27 --
 .../webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch|  59 -
 .../files/2.28.2-fix-yelp-desktopless-build.patch  |  53 
 .../files/2.28.2-use-gst-audiointerleave.patch |  55 
 .../files/webkit-gtk-2.24.4-icu-65.patch   |  53 
 net-libs/webkit-gtk/metadata.xml   |   4 -
 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild   | 283 
 net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild| 286 
 net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild   | 293 -
 11 files changed, 1143 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 69ef7ac2118..e5f86c322b0 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1 @@
-DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B 
c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2
 SHA512 
1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
-DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 
9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a
 SHA512 
b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 
0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c
 SHA512 
c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
 DIST webkitgtk-2.28.3.tar.xz 21425556 BLAKE2B 
f51522c33fa97aa00dee1428bc256ef910dd8764b3731580639c79642965c60b91b8d2f5c1d3bdb60975c68706d415447e8b52520ecfa1687968f3790137234b
 SHA512 
575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643

diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch 
b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
deleted file mode 100644
index 0f0959900df..000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add missing headers required during non-unified build.
-
-Unified build happens to get them included by the other sources unified
-into same source file, thus didn't fail.
-
-diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 
b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
 a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-@@ -30,6 +30,7 @@
- 
- #include "BuiltinNames.h"
- #include "BytecodeGenerator.h"
-+#include "BytecodeStructs.h"
- #include "CallFrame.h"
- #include "JIT.h"
- #include "JSCInlines.h"
-diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp 
b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
 a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -23,6 +23,7 @@
- #include "MachineStackMarker.h"
- 
- #include "ConservativeRoots.h"
-+#include "CPU.h"
- #include "MachineContext.h"
- #include 
- #include 

diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch 
b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
deleted file mode 100644
index 85328be1a5c..000
--- a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix 
this,
-but it looks like it's not enough with older perl-based gtk-doc.
-Keep this extra patch only until we can't depend on a newer gtk-doc version, 
which
-should be retested whether this patch is unnecessary then.
-
-Upstream extra reference for the above reference commit:
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 
268f45cc-cd09-0410-ab3c-d52691b4dbfc

- Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2020-07-11 Thread Mart Raudsepp

commit: 51bc67d156bf486792989c5e8e8ee19f43b32f11
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jul 11 10:47:06 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jul 11 13:33:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bc67d1

net-libs/webkit-gtk: bump to 2.28.3

Also raise gtk-doc dependency and drop patch that kept compat with perl gtk-doc,
as we now can do so without stabilization worries.

Bug: https://bugs.gentoo.org/732104
Closes: https://bugs.gentoo.org/704550
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 +
 .../webkit-gtk/files/2.28.3-non-jumbo-fix2.patch   |  44 
 net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild   | 290 +
 3 files changed, 335 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9cb9e91b4fc..69ef7ac2118 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B 
c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2
 SHA512 
1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 
9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a
 SHA512 
b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
 DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 
0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c
 SHA512 
c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
+DIST webkitgtk-2.28.3.tar.xz 21425556 BLAKE2B 
f51522c33fa97aa00dee1428bc256ef910dd8764b3731580639c79642965c60b91b8d2f5c1d3bdb60975c68706d415447e8b52520ecfa1687968f3790137234b
 SHA512 
575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643

diff --git a/net-libs/webkit-gtk/files/2.28.3-non-jumbo-fix2.patch 
b/net-libs/webkit-gtk/files/2.28.3-non-jumbo-fix2.patch
new file mode 100644
index 000..68139064b88
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.28.3-non-jumbo-fix2.patch
@@ -0,0 +1,44 @@
+From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sat, 11 Jul 2020 15:28:05 +0300
+Subject: [PATCH] Try to fix another apparent non-unified build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from 
here
+/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: 
error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
+   79 |  static_assert(sizeof(_Tp)>0,
+  |^~~
+---
+ Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 
b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+index 55d9e34df61..12a7a83cc61 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
 b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include "ImageBuffer.h"
+ #include "RenderSVGResourceContainer.h"
+ #include "SVGClipPathElement.h"
+ #include "SVGUnitTypes.h"
+diff --git a/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 
b/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
+index ec2fbe165b1..ab0688615a6 100644
+--- a/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
 b/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
+@@ -42,6 +42,8 @@
+ #include "HTTPParsers.h"
+ #include "InlineClassicScript.h"
+ #include "MIMETypeRegistry.h"
++#include "Page.h"
++#include "PageConsoleClient.h"
+ #include "PendingScript.h"
+ #include "ProcessingInstruction.h"
+ #include "ResourceError.h"
+-- 
+2.20.1
+

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
new file mode 100644
index 000..407812b79e1
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 
ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2020-01-31 Thread Mart Raudsepp

commit: b6825b367eab5028b16c0907070129c85c71b767
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Jan 31 18:07:29 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Jan 31 19:18:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6825b36

net-libs/webkit-gtk: security bump to 2.26.3, fix gtk-doc

Move gtk-doc building from USE=doc to USE=gtk-doc, as the latter is the
one to use now for when generating gtk-doc from scratch. Fix it with
perl-based gtk-doc by stripping out some tags in the docs completely;
this was already fixed upstream, but that fix seems dependent on newer
gtk-doc handling the markdown quoting that got added. So remove the
tags completely until we can depend on a newer gtk-doc that doesn't
have trouble with the upstream way.

Also a build fix for USE="wayland -opengl -gles2-only" (but remember:
you shouldn't disable both opengl and gles2-only on any real desktop
system).

Bug: https://bugs.gentoo.org/706374
Bug: https://bugs.gentoo.org/704550
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/webkit-gtk/Manifest   |   1 +
 net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch |  27 ++
 .../files/2.26.3-fix-noGL-wayland-build.patch  |  39 +++
 net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild   | 287 +
 4 files changed, 354 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index db8394225ff..b34080964f4 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B 
c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2
 SHA512 
1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.2.tar.xz 1933 BLAKE2B 
c0142aa19572c96e3dff11251316a4527be0357cf101177e056dd40aa9b5346216a4dcc14071d9c1240c101bd03f2179559d0d2bd81308967aba8530208186e0
 SHA512 
98d47282fd8f766dbe4a74c1a3f618aad69bd0666ed4e8674ae562b634681b3bd18b0d428df6bfefbaa3e18eb4cfb2fb077f5be4fed34cbc81c8293ec33e
+DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 
14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0
 SHA512 
9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9

diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch 
b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
new file mode 100644
index 000..85328be1a5c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
@@ -0,0 +1,27 @@
+Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix 
this,
+but it looks like it's not enough with older perl-based gtk-doc.
+Keep this extra patch only until we can't depend on a newer gtk-doc version, 
which
+should be retested whether this patch is unnecessary then.
+
+Upstream extra reference for the above reference commit:
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 
268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 
b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+index 023b14c33f4..657b1febf5d 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
 b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+@@ -1505,7 +1505,7 @@ static void 
webkit_settings_class_init(WebKitSettingsClass* klass)
+  * WebKitSettings:enable-media:
+  *
+  * Enable or disable support for media playback on pages. This setting is 
enabled by
+- * default. Disabling it means ``, `` and `` 
elements will have
++ * default. Disabling it means audio, track and video elements will have
+  * playback support disabled.
+  *
+  * Since: 2.26
+-- 
+2.20.1
+

diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch 
b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
new file mode 100644
index 000..4549f1712e6
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
@@ -0,0 +1,39 @@
+From 874dceeafc08edc979093509dff3ee6a8b25c432 Mon Sep 17 00:00:00 2001
+From: "commit-qu...@webkit.org"
+ 
+Date: Thu, 19 Sep 2019 02:34:49 +
+Subject: [PATCH] [GTK] Compilation errors when GL is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=200223
+
+Fix following compilation error when building with ENABLE_OPENGL=OFF
+../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use 
of undeclared identifier 'WaylandCompositor'
+parameters.waylandCompositorDisplayName = 
WaylandCompositor::singleton().displayName();
+

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2020-01-19 Thread Mart Raudsepp

commit: 67cc73686f1c4ea44aa0b639d2be4659c21c4c9c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jan 19 18:47:40 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jan 19 18:48:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cc7368

net-libs/webkit-gtk: fix USE=-jumbo-build builds on non-amd64

In some non-amd64 architectures (arm and sparc at least), there
are missing headers in JSC. Not sure what the trigger is - maybe
lack of FTL, or some other differences. Hopefully fix it by
patching in the necessary includes to the places I could identify
with limited armv7a cross-compiling.

Closes: https://bugs.gentoo.org/704194
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../files/2.26.2-fix-arm-non-unified-build.patch   | 27 ++
 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch 
b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
new file mode 100644
index 000..0f0959900df
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
@@ -0,0 +1,27 @@
+Add missing headers required during non-unified build.
+
+Unified build happens to get them included by the other sources unified
+into same source file, thus didn't fail.
+
+diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 
b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
 b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+@@ -30,6 +30,7 @@
+ 
+ #include "BuiltinNames.h"
+ #include "BytecodeGenerator.h"
++#include "BytecodeStructs.h"
+ #include "CallFrame.h"
+ #include "JIT.h"
+ #include "JSCInlines.h"
+diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp 
b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
 b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -23,6 +23,7 @@
+ #include "MachineStackMarker.h"
+ 
+ #include "ConservativeRoots.h"
++#include "CPU.h"
+ #include "MachineContext.h"
+ #include 
+ #include 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index d8e82634b06..455b181a4dd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -167,6 +167,7 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-2.24.4-icu-65.patch" # bug 698596
eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 
# https://bugs.webkit.org/show_bug.cgi?id=204108
eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch # bug 704236
+   eapply "${FILESDIR}"/${PV}-fix-arm-non-unified-build.patch # bug 704194
cmake-utils_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2019-11-23 Thread Matt Turner

commit: 6030950f383729aef2ede1f2a0dc90514b260981
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 23 18:07:37 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 23 19:27:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6030950f

net-libs/webkit-gtk: Add patch to build with mesa-19.3

Thanks to Alexander Tsoy for the patch.

Closes: https://bugs.gentoo.org/699054
Signed-off-by: Matt Turner  gentoo.org>

 .../files/webkit-gtk-2.24.4-eglmesaext-include.patch   | 10 ++
 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild   |  1 +
 2 files changed, 11 insertions(+)

diff --git 
a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch 
b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
new file mode 100644
index 000..9c277e719d8
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
@@ -0,0 +1,10 @@
+--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
2019-08-26 17:55:46.0 +0300
 webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
2019-11-04 23:33:44.146933810 +0300
+@@ -31,6 +31,7 @@ 
+ #include "WebKitWaylandServerProtocol.h"
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index d90cc8c26a4..93381a7d5a1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -160,6 +160,7 @@ pkg_setup() {
 
 src_prepare() {
eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
+   eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054
cmake-utils_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2019-10-29 Thread Andreas Sturmlechner

commit: 442114d9e7d9bc2062d990d22451211b22ffcf51
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 29 19:03:19 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 29 22:21:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442114d9

net-libs/webkit-gtk: Add upstream patch to fix build against ICU-65

https://bugs.webkit.org/show_bug.cgi?id=202600

Acked-by: Mart Raudsepp  gentoo.org>
Closes: https://bugs.gentoo.org/698596
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/webkit-gtk-2.24.4-icu-65.patch   | 53 ++
 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild   |  1 +
 2 files changed, 54 insertions(+)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch 
b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
new file mode 100644
index 000..475c9851e63
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
@@ -0,0 +1,53 @@
+From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Fri, 4 Oct 2019 22:17:11 +0200
+Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
+
+---
+ Source/WTF/wtf/URLHelpers.cpp   |  2 +-
+ Source/WebCore/dom/Document.cpp |  6 +++---
+ 4 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
+index 18e7f13cd61..c584f1a0cb7 100644
+--- a/Source/WTF/wtf/URLHelpers.cpp
 b/Source/WTF/wtf/URLHelpers.cpp
+@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* 
buffer, int32_t lengt
+ Optional previousCodePoint;
+ while (i < length) {
+ UChar32 c;
+-U16_NEXT(buffer, i, length, c)
++U16_NEXT(buffer, i, length, c);
+ UErrorCode error = U_ZERO_ERROR;
+ UScriptCode script = uscript_getScript(c, );
+ if (error != U_ZERO_ERROR) {
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 0fd0fa090bf..01f76850f3d 100644
+--- a/Source/WebCore/dom/Document.cpp
 b/Source/WebCore/dom/Document.cpp
+@@ -4954,12 +4954,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;
+ }
+@@ -5019,7 +5019,7 @@ ExceptionOr> 
Document::parseQualifiedName(cons
+ 
+ for (unsigned i = 0; i < length; ) {
+ UChar32 c;
+-U16_NEXT(qualifiedName, i, length, c)
++U16_NEXT(qualifiedName, i, length, c);
+ if (c == ':') {
+ if (sawColon)
+ return Exception { InvalidCharacterError };
+-- 
+2.23.0

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index f8ed8e6fec9..d90cc8c26a4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -159,6 +159,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
cmake-utils_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2018-07-25 Thread Mart Raudsepp

commit: 71cd81faf5448ecbc668a24bc9dec7663551bd19
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Jul 25 16:25:26 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Jul 25 16:47:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cd81fa

net-libs/webkit-gtk: fix non-parallel builds

Parallel builds might have failed too before this patch, but had to
be very "lucky".

Closes: https://bugs.gentoo.org/662002
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch | 14 ++
 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch 
b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
new file mode 100644
index 000..32ff3a52844
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/662002
+https://bugs.webkit.org/show_bug.cgi?id=183788
+https://trac.webkit.org/changeset/229282/webkit
+
+Index: /trunk/Source/JavaScriptCore/CMakeLists.txt
+===
+--- a/Source/JavaScriptCore/CMakeLists.txt (revision 229281)
 b/Source/JavaScriptCore/CMakeLists.txt (revision 229282)
+@@ -248,4 +248,5 @@
+ )
+ target_link_libraries(LLIntOffsetsExtractor WTF)
++add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
+ 
+ # The build system will execute asm.rb every time LLIntOffsetsExtractor's 
mtime is newer than

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 69dc6b1f2ca..50b4f8c388c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -147,6 +147,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   eapply "${FILESDIR}"/${PV}-jsc-build-fixes.patch
cmake-utils_src_prepare
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2017-10-29 Thread Mart Raudsepp

commit: 71049fe1e3a508e5fa82b7716e00cbbde8fd3d37
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct 29 22:11:17 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 29 22:11:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71049fe1

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/635134
Package-Manager: Portage-2.3.8, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest   |   2 -
 .../files/webkit-gtk-2.8.5-fix-alpha-build.patch   |  22 --
 net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild   | 288 -
 net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild   | 284 
 4 files changed, 596 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 00ca6f02116..eafc5261138 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 
fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 
bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b
 WHIRLPOOL 
b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
-DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 
9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 
671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b
 WHIRLPOOL 
e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
 DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 
b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 
94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c
 WHIRLPOOL 
a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 
588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 
2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
 WHIRLPOOL 
de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

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
deleted file mode 100644
index 3817bce4084..000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.0 
+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.0 +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/webkit-gtk-2.16.6.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
deleted file mode 100644
index 44c39f36968..000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer 
+introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-   geolocation? ( introspection )
-   gles2? ( egl )
-   introspection? (

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2017-04-17 Thread Mart Raudsepp

commit: 5d30d6e4cc020dc6edbf9b3a94a12159f90ead4a
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Apr 17 08:10:14 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Apr 17 08:10:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d30d6e4

net-libs/webkit-gtk: security cleanup

Gentoo-bug: 614876
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest   |   1 -
 ...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch |  22 --
 net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild   | 287 -
 3 files changed, 310 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 755456d09c4..80d1baa2f12 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 
3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 
3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c
 WHIRLPOOL 
011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
 DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256 
eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512 
4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010
 WHIRLPOOL 
c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 
588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 
2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
 WHIRLPOOL 
de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

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
deleted file mode 100644
index 49af4484604..000
--- 
a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-2015-08-24  Alexandre Rostovtsev  
-
-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.14.5.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
deleted file mode 100644
index 62b0b0e9c57..000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer 
+introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-   geolocation? ( introspection )
-   gles2? ( egl )
-   introspection? ( gstreamer )
-   nsplugin? ( X )
-   webgl? ( ^^ ( gles2 opengl ) )
-   !webgl? ( ?? ( gles2 opengl ) )
-   webgl? ( gstreamer )
-   wayland? ( egl )
-   || ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-   dev-db/sqlite:3=
-

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2016-08-27 Thread Sergei Trofimovich

commit: bfe97a5ba14edaafe8694f6a74aa026506eacc68
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 27 17:41:16 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 27 20:20:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe97a5b

net-libs/webkit-gtk: tweak for gcc-6, bug #592048

Adopt Fedora patch to build successfully against gcc-6.1.0.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=592048
Bug: https://bugs.webkit.org/show_bug.cgi?id=159124

Package-Manager: portage-2.3.0

 .../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch  | 29 ++
 net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild|  3 +++
 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild  |  3 +++
 net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild   |  3 +++
 4 files changed, 38 insertions(+)

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 ..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.0 -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.0 -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/webkit-gtk-2.4.11-r1.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
index cb799d5..1913585 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -173,6 +173,9 @@ src_prepare() {
# 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

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
index 10f845a..a92c6b1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -158,6 +158,9 @@ src_prepare() {
# 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

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index 2ffe8b2..481850b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -171,6 +171,9 @@ src_prepare() {
# 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

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

2015-08-24 Thread Alexandre Rostovtsev

commit: d61bddfcbf92439482ea8ebbbfebf39a9c6552d6
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Tue Aug 25 00:40:38 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Tue Aug 25 00:45:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61bddfc

net-libs/webkit-gtk: fix build with -j1

Reported-by: dolphinling
Gentoo-Bug: 556680
Upstream-Bug-url: https://bugs.webkit.org/show_bug.cgi?id=148379
Package-Manager: portage-2.2.20.1

 ...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 ++
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild|  3 +++
 2 files changed, 25 insertions(+)

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 000..79b57ae
--- /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  tetrom...@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
+===
+--- Source/WebKit2/PlatformGTK.cmake   (revision 188859)
 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.8.5.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index b0a6213..18ae36a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -141,6 +141,9 @@ src_prepare() {
# https://bugs.webkit.org/show_bug.cgi?id=129542
epatch ${FILESDIR}/${PN}-2.8.1-ia64-malloc.patch
 
+   # https://bugs.webkit.org/show_bug.cgi?id=148379
+   epatch ${FILESDIR}/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

27 matches

Site Navigation

Mail list logo

Footer information