diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-libs/webkit-gtk/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'net-libs/webkit-gtk/files')
-rw-r--r-- | net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch | 70 | ||||
-rw-r--r-- | net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch | 31 |
2 files changed, 0 insertions, 101 deletions
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..000000000000 --- 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: "philn@webkit.org" - <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Sat, 11 Sep 2021 11:34:42 +0000 -Subject: [PATCH] [GLIB] MediaSession is not enabled - https://bugs.webkit.org/show_bug.cgi?id=217991 <rdar://problem/70740119> - -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 <wtf/Seconds.h> - -+// 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 <wtf/EnumTraits.h> - -+// 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..000000000000 --- 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.olmstead@sony.com" - <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Sun, 3 Oct 2021 23:00:17 +0000 -Subject: [PATCH] Non-unified build fixes, early October 2021 edition - https://bugs.webkit.org/show_bug.cgi?id=231143 - -Unreviewed non-unified build fixes. ---- -leio: Trimmed to what's relevant to webkitgtk-2.34 branch -gyakovlev: removed TextTrackClient.h include addition - - Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++ - 1 files changed, 2 insertions(+) - -diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -index 7f1012aa2a24..4c7c23995276 100644 ---- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -+++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -@@ -44,6 +44,8 @@ class InjectedScriptManager; - namespace WebCore { - - class CanvasRenderingContext; -+class Frame; -+ - #if ENABLE(WEBGL) - class InspectorShaderProgram; - class WebGLProgram; --- -2.32.0 - |