From 74b6630981be0accead79d7ad07c092d64271519 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 19 Jan 2023 16:52:50 -0600 Subject: [PATCH] Upgrade to 2.39.5 --- .gitignore | 1 + angle-build.patch | 12 ------ sources | 4 +- unbreak-headers.patch | 89 ------------------------------------------- webkitgtk.spec | 10 +---- 5 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 angle-build.patch delete mode 100644 unbreak-headers.patch diff --git a/.gitignore b/.gitignore index 1cd3038..d66a724 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /webkitgtk-2.39.2.tar.xz.asc /webkitgtk-2.39.3.tar.xz.asc /webkitgtk-2.39.4.tar.xz.asc +/webkitgtk-2.39.5.tar.xz.asc diff --git a/angle-build.patch b/angle-build.patch deleted file mode 100644 index fc2e0aa..0000000 --- a/angle-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h -index 94cb93e01fc0..ec7bda372f30 100644 ---- 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/sources b/sources index 7b2e28c..ebeac96 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.39.4.tar.xz) = 74240995fc5942605b0d2ca87641851e3e1edd7d465c22a545dde7afc947b74b8a548472970288aee59b3bb8ff33a98e85f56aca14a545824e5dea3397efc052 -SHA512 (webkitgtk-2.39.4.tar.xz.asc) = 8cd57b3f21943b77897833c9a08b1cb2036149df3ca76562cdf92b762ff82e6cdbbdc55f488dea0ff35051c929cd28f8151586f734f41e97c6d1abb4729fce64 +SHA512 (webkitgtk-2.39.5.tar.xz) = a55b007d84ec58aaa7376c3d872be935a5c225d28361180ff3c20ba0b054870cff07fbfa2fb2056f68814412b1e144f0f9566b4f905086dd92dc82a0123d2210 +SHA512 (webkitgtk-2.39.5.tar.xz.asc) = 2a60c9ac379feba77d0839a71f8cc96824b02211e783620a5c2f74f39ae4c1c1061942c7ad4c56bb449dfbec4f6e6260e62a10165bd31d8d399d9347364d727c diff --git a/unbreak-headers.patch b/unbreak-headers.patch deleted file mode 100644 index 2739d68..0000000 --- a/unbreak-headers.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 9fe47e98a7f3b542413f3793912b291599f05860 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Jan 2023 00:55:33 -0800 -Subject: [PATCH] REGRESSION(258347@main): Fix webkit.h public header - -https://bugs.webkit.org/show_bug.cgi?id=250701 - -Reviewed by Carlos Garcia Campos. - -Since commit 654646fe6187abcf9ced6a3ace80eaf04754fd39, the webkit.h file is generated -and does only define __WEBKIT_H_INSIDE__. So replace the only remaining __WEBKIT2_H_INSIDE__ -defines to avoid any "Only can be included directly." error. - -Signed-off-by: Thomas Devoogdt - -Canonical link: https://commits.webkit.org/258974@main ---- - Source/WebKit/Scripts/glib/generate-api-header.py | 4 ++-- - Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebKit/Scripts/glib/generate-api-header.py b/Source/WebKit/Scripts/glib/generate-api-header.py -index 6eb326b8764f..6977b51914e4 100644 ---- a/Source/WebKit/Scripts/glib/generate-api-header.py -+++ b/Source/WebKit/Scripts/glib/generate-api-header.py -@@ -30,7 +30,7 @@ - "gtk4": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT) - #error \"Only can be included directly.\" - #endif''', -- "gtk": '''#if !defined(__WEBKIT2_H_INSIDE__) && !defined(BUILDING_WEBKIT) -+ "gtk": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT) - #error \"Only can be included directly.\" - #endif''', - "wpe": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT) -@@ -54,7 +54,7 @@ - "gtk4": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT) - #error \"Only can be included directly.\" - #endif''', -- "gtk": '''#if !defined(__WEBKIT2_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT) -+ "gtk": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT) - #error \"Only can be included directly.\" - #endif''', - "wpe": '''#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT) -diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in b/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in -index 52cda32496bb..493b8e9a1e5e 100644 ---- a/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in -+++ b/Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in -@@ -18,7 +18,7 @@ - * Boston, MA 02110-1301, USA. - */ - --#if !defined(__WEBKIT2_H_INSIDE__) && !defined(BUILDING_WEBKIT) -+#if !defined(__WEBKIT_H_INSIDE__) && !defined(BUILDING_WEBKIT) - #error "Only can be included directly." - #endif - -From 8f11ad0813c37f4bd8ee43ecac733892a57e2a03 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Jan 2023 05:45:34 -0800 -Subject: [PATCH] REGRESSION(258347@main): Fix webkit.h public header part 2 - -https://bugs.webkit.org/show_bug.cgi?id=250701 - -Reviewed by Carlos Garcia Campos. - -In commit 9fe47e98a7f3b542413f3793912b291599f05860, I've replaced all -instances of __WEBKIT2_H_INSIDE__ with __WEBKIT_H_INSIDE__ but overlooked -this one. So fix that. - -Signed-off-by: Thomas Devoogdt - -Canonical link: https://commits.webkit.org/258976@main ---- - Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in b/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in -index 0704d8016c45..f141a20aa65d 100644 ---- a/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in -+++ b/Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in -@@ -17,7 +17,7 @@ - * Boston, MA 02110-1301, USA. - */ - --#if !defined(__WEBKIT@WEBKITGTK_API_INFIX@_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT) -+#if !defined(__WEBKIT_H_INSIDE__) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__) && !defined(BUILDING_WEBKIT) - #error "Only can be included directly." - #endif - diff --git a/webkitgtk.spec b/webkitgtk.spec index feaa5de..7e8595d 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -19,7 +19,7 @@ %bcond_without docs Name: webkitgtk -Version: 2.39.4 +Version: 2.39.5 Release: %autorelease Summary: GTK web content engine library @@ -32,12 +32,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg -# https://bugs.webkit.org/show_bug.cgi?id=250689 -Patch0: angle-build.patch - -# https://bugs.webkit.org/show_bug.cgi?id=250701 -Patch1: unbreak-headers.patch - BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -467,7 +461,7 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %license _license_files/*WebCore* %license _license_files/*WebInspectorUI* %license _license_files/*WTF* -%{_libdir}/libwebkitgtk-6.0.so.0* +%{_libdir}/libwebkitgtk-6.0.so.1* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/WebKit-6.0.typelib %{_libdir}/girepository-1.0/WebKitWebExtension-6.0.typelib