diff --git a/.gitignore b/.gitignore index 7f267b1..3f6d409 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,2 @@ /webkitgtk-*.tar.xz -/webkitgtk-2.37.1.tar.xz.asc -/webkitgtk-2.37.90.tar.xz.asc -/webkitgtk-2.37.91.tar.xz.asc -/webkitgtk-2.38.0.tar.xz.asc -/webkitgtk-2.38.1.tar.xz.asc -/webkitgtk-2.38.2.tar.xz.asc -/webkitgtk-2.39.1.tar.xz.asc -/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 -/webkitgtk-2.39.6.tar.xz.asc -/webkitgtk-2.39.7.tar.xz.asc -/webkitgtk-2.39.90.tar.xz.asc +/webkitgtk-*.tar.xz.asc diff --git a/fix-installed-headers.patch b/fix-installed-headers.patch deleted file mode 100644 index 1ab6bb6..0000000 --- a/fix-installed-headers.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 166cdf23242165c9c84f621a4121c80432211c50 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Mon, 20 Feb 2023 16:26:28 +0200 -Subject: [PATCH] [GLib] Installed API headers are unusable with the new 2022 - API https://bugs.webkit.org/show_bug.cgi?id=252562 - -Reviewed by NOBODY (OOPS!). - -* Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in: Only - include JavaScriptCore/JSBase.h with the old API, change a !USE(GTK4) - guard to !ENABLE(2022_GLIB_API) as it is more correct. -* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in: Ditto. ---- - Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in | 4 ++-- - Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in | 4 +++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in b/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in -index b7eece231000..78ba2120b225 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in -+++ b/Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in -@@ -26,7 +26,7 @@ - #include - #include <@API_INCLUDE_PREFIX@/WebKitDefines.h> - --#if PLATFORM(GTK) -+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API) - #include - #endif - -@@ -46,7 +46,7 @@ webkit_javascript_result_ref (WebKitJavascriptResult *js_result); - WEBKIT_API void - webkit_javascript_result_unref (WebKitJavascriptResult *js_result); - --#if PLATFORM(GTK) && !USE(GTK4) -+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API) - WEBKIT_DEPRECATED JSGlobalContextRef - webkit_javascript_result_get_global_context (WebKitJavascriptResult *js_result); - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in -index 45949e44e4a3..293aa3841695 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in -+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in -@@ -59,7 +59,9 @@ - #endif - - #if PLATFORM(GTK) -+#if !ENABLE(2022_GLIB_API) - #include -+#endif - #include - #include - #include -@@ -628,7 +630,7 @@ webkit_web_view_execute_editing_command_with_argument(WebKitWebView - WEBKIT_API WebKitFindController * - webkit_web_view_get_find_controller (WebKitWebView *web_view); - --#if PLATFORM(GTK) && !USE(GTK4) -+#if PLATFORM(GTK) && !ENABLE(2022_GLIB_API) - WEBKIT_DEPRECATED JSGlobalContextRef - webkit_web_view_get_javascript_global_context (WebKitWebView *web_view); - #endif diff --git a/monitoring.toml b/monitoring.toml new file mode 100644 index 0000000..fc852a3 --- /dev/null +++ b/monitoring.toml @@ -0,0 +1,13 @@ +# Enable/disable monitoring +monitoring = false +# Enable/disable filling bugzilla ticket for new release +# When disabled it will also disable scratch builds +bugzilla = true +# Enable/disable reporting only stable versions +# Stable versions are recognized based on release-monitoring.org project settings +stable_only = false +# Enable/disable reporting all new versions instead of the latest one +# Enabling this will disable scratch builds +all_versions = false +# Enable/disable scratch build for newly opened version +scratch_build = false diff --git a/no-debug-fission.patch b/no-debug-fission.patch deleted file mode 100644 index b50a6b7..0000000 --- a/no-debug-fission.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake -index 94b9740c8a82..43b961c996c3 100644 ---- a/Source/cmake/OptionsCommon.cmake -+++ b/Source/cmake/OptionsCommon.cmake -@@ -154,19 +154,11 @@ if (USE_THIN_ARCHIVES) - endif () - - set(ENABLE_DEBUG_FISSION_DEFAULT OFF) --check_cxx_compiler_flag(-gsplit-dwarf CXX_COMPILER_SUPPORTS_GSPLIT_DWARF) --if (CXX_COMPILER_SUPPORTS_GSPLIT_DWARF AND LD_SUPPORTS_SPLIT_DEBUG) -- set(ENABLE_DEBUG_FISSION_DEFAULT ON) --endif () -- --if (ENABLE_DEBUG_FISSION_DEFAULT AND SCCACHE_FOUND AND COMPILER_IS_CLANG AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") -- # https://github.com/mozilla/sccache/issues/1593 -- message("The SCCache clang backend doesn't support split-dwarf for non-debug builds yet. Keeping default value of DEBUG_FISSION to OFF.") -- set(ENABLE_DEBUG_FISSION_DEFAULT OFF) --endif () -- --if (CMAKE_GENERATOR MATCHES "Visual Studio") -- set(ENABLE_DEBUG_FISSION_DEFAULT OFF) -+if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") -+ check_cxx_compiler_flag(-gsplit-dwarf CXX_COMPILER_SUPPORTS_GSPLIT_DWARF) -+ if (CXX_COMPILER_SUPPORTS_GSPLIT_DWARF AND LD_SUPPORTS_SPLIT_DEBUG) -+ set(ENABLE_DEBUG_FISSION_DEFAULT ON) -+ endif () - endif () - - option(DEBUG_FISSION "Use Debug Fission support" ${ENABLE_DEBUG_FISSION_DEFAULT}) diff --git a/skia-s390x.patch b/skia-s390x.patch new file mode 100644 index 0000000..a3cfe53 --- /dev/null +++ b/skia-s390x.patch @@ -0,0 +1,82 @@ +diff --git a/Source/ThirdParty/skia/include/core/SkTypes.h b/Source/ThirdParty/skia/include/core/SkTypes.h +index 79644da049ff..fc0646e21772 100644 +--- a/Source/ThirdParty/skia/include/core/SkTypes.h ++++ b/Source/ThirdParty/skia/include/core/SkTypes.h +@@ -33,6 +33,8 @@ + # undef SK_DIRECT3D + #endif + ++#if !defined(SK_R32_SHIFT) || !defined(SK_G32_SHIFT) || !defined(SK_B32_SHIFT) || !defined(SK_A32_SHIFT) ++ + // If SK_R32_SHIFT is set, we'll use that to choose RGBA or BGRA. + // If not, we'll default to RGBA everywhere except BGRA on Windows. + #if defined(SK_R32_SHIFT) +@@ -52,6 +54,8 @@ + #define SK_G32_SHIFT 8 + #define SK_A32_SHIFT 24 + ++#endif ++ + /** + * SK_PMCOLOR_BYTE_ORDER can be used to query the byte order of SkPMColor at compile time. + */ +diff --git a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h +index c321fb77c0ae..a0a01cccd58a 100644 +--- a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h ++++ b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h +@@ -14,6 +14,7 @@ + #include "include/core/SkTypes.h" + #include "include/private/SkEncodedInfo.h" + #include "modules/skcms/skcms.h" ++#include "src/core/SkEndian.h" + #include "src/codec/SkColorPalette.h" + #include "src/core/SkColorData.h" + +diff --git a/Source/ThirdParty/skia/src/core/Sk4px.h b/Source/ThirdParty/skia/src/core/Sk4px.h +index d5d481e7e300..c7ef0bcd0ed0 100644 +--- a/Source/ThirdParty/skia/src/core/Sk4px.h ++++ b/Source/ThirdParty/skia/src/core/Sk4px.h +@@ -27,7 +27,9 @@ public: + + // RGBA rgba XYZW xyzw -> AAAA aaaa WWWW wwww + Sk4px alphas() const { ++#ifdef SK_CPU_LENDIAN + static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian."); ++#endif + return Sk4px(skvx::shuffle<3,3,3,3, 7,7,7,7, 11,11,11,11, 15,15,15,15>(fV)); + } + Sk4px inv() const { return Sk4px(skvx::byte16(255) - fV); } +diff --git a/Source/ThirdParty/skia/src/core/SkColorPriv.h b/Source/ThirdParty/skia/src/core/SkColorPriv.h +index 45471c25529e..319fec78069b 100644 +--- a/Source/ThirdParty/skia/src/core/SkColorPriv.h ++++ b/Source/ThirdParty/skia/src/core/SkColorPriv.h +@@ -64,6 +64,20 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) { + * Here we enforce this constraint. + */ + ++#ifdef SK_CPU_BENDIAN ++ ++#define SK_RGBA_R32_SHIFT 24 ++#define SK_RGBA_G32_SHIFT 16 ++#define SK_RGBA_B32_SHIFT 8 ++#define SK_RGBA_A32_SHIFT 0 ++ ++#define SK_BGRA_B32_SHIFT 24 ++#define SK_BGRA_G32_SHIFT 16 ++#define SK_BGRA_R32_SHIFT 8 ++#define SK_BGRA_A32_SHIFT 0 ++ ++#else ++ + #define SK_RGBA_R32_SHIFT 0 + #define SK_RGBA_G32_SHIFT 8 + #define SK_RGBA_B32_SHIFT 16 +@@ -74,6 +88,8 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) { + #define SK_BGRA_R32_SHIFT 16 + #define SK_BGRA_A32_SHIFT 24 + ++#endif ++ + #if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_BGRA) + #error "Configure PMCOLOR by setting SK_R32_SHIFT." + #endif diff --git a/sources b/sources index e8339e1..3934793 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.39.90.tar.xz) = 1a17a60443072253c9b2a4a04356213ea9a3f36976ebad048048b1bf6a5dd15a9fb161df1cabbf4258b001a5ab326161887cc8e6f1863a3e32834a35f607e4d4 -SHA512 (webkitgtk-2.39.90.tar.xz.asc) = 772e584f3caa3141d3cdc0abdd747c2c08990c244740f138fe9f64f3aedb01a08f39fea59e27906e27063aaebf41432a25a6326f4841af7b3075c4da70b16f09 +SHA512 (webkitgtk-2.53.91.tar.xz) = 0bb5ec4c75cf0dcd4ccc46b7cf8595722d447385b75ed6ec79333b56203f681077fa355600210edb4fe6344e4af2943c7fb5b1bff6e35a7ec1ea456d891a1951 +SHA512 (webkitgtk-2.53.91.tar.xz.asc) = 72f6f01f8f3e12228ee70202b9b9bda589c80a791086cde6d6af5f2f916b44877b984267c6a5970f4fe41ff7dac21bccfa7323f19d71f6fd3e4a87abb18be58c diff --git a/super-sampler.patch b/super-sampler.patch deleted file mode 100644 index 3071c0f..0000000 --- a/super-sampler.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 97e22b7ec4c1..64397ee50cf7 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -39,6 +39,7 @@ - #include "LLIntData.h" - #include "LLIntSlowPaths.h" - #include "JSCInlines.h" -+#include "SuperSampler.h" - #include - #include - diff --git a/webkitgtk-keys.gpg b/webkitgtk-keys.gpg index 180e358..1852062 100644 Binary files a/webkitgtk-keys.gpg and b/webkitgtk-keys.gpg differ diff --git a/webkitgtk.spec b/webkitgtk.spec index 75dd61e..1ebef07 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,6 +1,3 @@ -# https://bugs.webkit.org/show_bug.cgi?id=249368 -%global _lto_cflags %{nil} - ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. @@ -8,44 +5,65 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') -# No libmanette in RHEL -%if !0%{?rhel} -%global with_gamepad 1 -%endif - # Build documentation by default (use `rpmbuild --without docs` to override it). # This is used by Coverity. Coverity injects custom compiler warnings, but # any warning during WebKit docs build is fatal! %bcond_without docs +# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers +%global toolchain clang + +# We run out of memory if building with LTO enabled on i686. +%ifarch %{ix86} +%global _lto_cflags %{nil} +%endif + Name: webkitgtk -Version: 2.39.90 +Version: 2.53.91 Release: %autorelease Summary: GTK web content engine library -License: LGPLv2 +# Source/bmalloc/bmalloc/*.h is BSD-2-Clause +# Source/bmalloc/bmalloc/CryptoRandom.cpp is ISC +# Source/bmalloc/bmalloc/valgrind.h is is bzip2-1.0.6 +# Source/bmalloc/libpas/src/test/RedBlackTreeTests.cpp is BSD-3-Clause +# Source/JavaScriptCore/config.h is LGPL-2.0-or-later +# Source/JavaScriptCore/b3/B3ComputeDivisionMagic.h is NCSA +# Source/JavaScriptCore/disassembler/zydis/* is MIT +# Source/JavaScriptCore/runtime/JSDateMath.h is MPL 1.1/GPL 2.0/LGPL 2.1 +# Source/JavaScriptCore/runtime/MathCommon.cpp is SunPro +# Source/JavaScriptCore/ucd/CaseFolding.txt is Unicode-TOU, which is unapproved, but the only copyrightable part is the comment at the top of the file, so seems safe to omit it +# Source/ThirdParty/ANGLE/include/CL/cl_d3d10.h is Apache-2.0 +# Source/ThirdParty/ANGLE/include/GLES/gl.h is MIT-Khronos (not on list see https://github.com/spdx/license-list-XML/issues/2017) +# Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp is GPL-3.0-or-later WITH Bison-exception-2.2 +# Source/ThirdParty/pdfjs/web/images/annotation-paperclip.svg is MPL-2.0i +# Source/ThirdParty/pdfjs/web/standard_fonts/LICENSE_LIBERATION is OFL-1.1 +# Source/ThirdParty/xdgmime/ is AFL-2.0 OR GPL-2.0-or-later +# Source/WebCore/dom/PseudoElement.h is BSD-Source-Code +# Source/WebCore/dom/SecurityContext.cpp is BSD-2-Clause-Views +# Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp is LGPL-2.1-or-later +# Source/WTF/LICENSE-libc++.txt is NCSA OR MIT +# Source/WTF/LICENSE-LLVM.txt is Apache-2.0 WITH LLVM-exception +# Source/WTF/wtf/Markable.h is BSL-1.0 +# The license tag and above comment is up to date as of WebKitGTK 2.42.2. +License: LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 OR GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND BSL-1.0 URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # Use the keys from https://webkitgtk.org/verifying.html # $ gpg --import aperez.key carlosgc.key -# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg +# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg Source2: webkitgtk-keys.gpg -# https://github.com/WebKit/WebKit/pull/10362 -Patch0: fix-installed-headers.patch - -# https://bugs.webkit.org/show_bug.cgi?id=252617 -Patch1: super-sampler.patch - -# https://bugs.webkit.org/show_bug.cgi?id=252679 -Patch2: no-debug-fission.patch +# https://bugs.webkit.org/show_bug.cgi?id=312677 +Patch: skia-s390x.patch BuildRequires: bison BuildRequires: bubblewrap +BuildRequires: clang BuildRequires: cmake BuildRequires: flex -BuildRequires: gcc-c++ +BuildRequires: flite-devel BuildRequires: gettext BuildRequires: gi-docgen BuildRequires: git @@ -58,9 +76,11 @@ BuildRequires: openssl-devel BuildRequires: perl(English) BuildRequires: perl(FindBin) BuildRequires: perl(JSON::PP) +BuildRequires: perl(bigint) BuildRequires: python3 BuildRequires: ruby BuildRequires: rubygems +BuildRequires: rubygem(getoptlong) BuildRequires: rubygem-json BuildRequires: unifdef BuildRequires: xdg-dbus-proxy @@ -70,11 +90,11 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) @@ -85,36 +105,32 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libavif) +BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libopenjp2) -BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libtasn1) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxslt) -%if 0%{?with_gamepad} BuildRequires: pkgconfig(manette-0.2) -%endif BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(sysprof-capture-4) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wpe-1.0) -BuildRequires: pkgconfig(wpebackend-fdo-1.0) BuildRequires: pkgconfig(xt) # Filter out provides for private libraries -%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$ +%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$ %description WebKitGTK is the port of the WebKit web rendering engine to the @@ -124,6 +140,7 @@ GTK platform. Summary: WebKitGTK for GTK 4 Requires: javascriptcoregtk6.0%{?_isa} = %{version}-%{release} Requires: bubblewrap +Requires: libGLES Requires: xdg-dbus-proxy Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free @@ -131,6 +148,7 @@ Recommends: gstreamer1-plugins-good Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) Provides: bundled(pdfjs) +Provides: bundled(skia) Provides: bundled(xdgmime) Obsoletes: webkit2gtk5.0 < %{version}-%{release} @@ -142,6 +160,7 @@ GTK platform. This package contains WebKitGTK for GTK 4. Summary: WebKitGTK for GTK 3 and libsoup 3 Requires: javascriptcoregtk4.1%{?_isa} = %{version}-%{release} Requires: bubblewrap +Requires: libGLES Requires: xdg-dbus-proxy Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free @@ -149,33 +168,13 @@ Recommends: gstreamer1-plugins-good Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) Provides: bundled(pdfjs) +Provides: bundled(skia) Provides: bundled(xdgmime) %description -n webkit2gtk4.1 WebKitGTK is the port of the WebKit web rendering engine to the GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3. -%package -n webkit2gtk4.0 -Summary: WebKitGTK for GTK 3 and libsoup 2 -Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release} -Requires: bubblewrap -Requires: xdg-dbus-proxy -Recommends: geoclue2 -Recommends: gstreamer1-plugins-bad-free -Recommends: gstreamer1-plugins-good -Recommends: xdg-desktop-portal-gtk -Provides: bundled(angle) -Provides: bundled(pdfjs) -Provides: bundled(xdgmime) -Obsoletes: webkitgtk4 < %{version}-%{release} -Provides: webkitgtk4 = %{version}-%{release} -Obsoletes: webkit2gtk3 < %{version}-%{release} -Provides: webkit2gtk3 = %{version}-%{release} - -%description -n webkit2gtk4.0 -WebKitGTK is the port of the WebKit web rendering engine to the -GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2. - %package -n webkitgtk6.0-devel Summary: Development files for webkitgtk6.0 Requires: webkitgtk6.0%{?_isa} = %{version}-%{release} @@ -197,20 +196,6 @@ Requires: javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release} The webkit2gtk4.1-devel package contains libraries, build data, and header files for developing applications that use webkit2gtk4.1. -%package -n webkit2gtk4.0-devel -Summary: Development files for webkit2gtk4.0 -Requires: webkit2gtk4.0%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk4.0-devel%{?_isa} = %{version}-%{release} -Obsoletes: webkitgtk4-devel < %{version}-%{release} -Provides: webkitgtk4-devel = %{version}-%{release} -Obsoletes: webkit2gtk3-devel < %{version}-%{release} -Provides: webkit2gtk3-devel = %{version}-%{release} - -%description -n webkit2gtk4.0-devel -The webkit2gtk4.0-devel package contains libraries, build data, and header -files for developing applications that use webkit2gtk4.0. - %if %{with docs} %package -n webkitgtk6.0-doc Summary: Documentation files for webkit2gtk5.0 @@ -219,6 +204,15 @@ Requires: webkitgtk6.0 = %{version}-%{release} Obsoletes: webkit2gtk5.0-doc < %{version}-%{release} Recommends: gi-docgen-fonts +# Documentation/jsc-glib-4.1/fzy.js is MIT +# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later +# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1 +# Documentation/webkit2gtk-4.1/*html is BSD, LGPL-2.1 +# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1 +# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT +# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later +License: MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later) + %description -n webkitgtk6.0-doc This package contains developer documentation for webkitgtk6.0. @@ -228,25 +222,23 @@ BuildArch: noarch Requires: webkit2gtk4.1 = %{version}-%{release} Recommends: gi-docgen-fonts +# Documentation/jsc-glib-4.1/fzy.js is MIT +# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later +# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1 +# Documentation/webkit2gtk-4.1/*html is BSD, LGPL-2.1 +# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1 +# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT +# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later +License: MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later) + %description -n webkit2gtk4.1-doc This package contains developer documentation for webkit2gtk4.1. - -%package -n webkit2gtk4.0-doc -Summary: Documentation files for webkit2gtk4.0 -BuildArch: noarch -Requires: webkit2gtk4.0 = %{version}-%{release} -Obsoletes: webkitgtk4-doc < %{version}-%{release} -Provides: webkitgtk4-doc = %{version}-%{release} -Obsoletes: webkit2gtk3-doc < %{version}-%{release} -Provides: webkit2gtk3-doc = %{version}-%{release} -Recommends: gi-docgen-fonts - -%description -n webkit2gtk4.0-doc -This package contains developer documentation for webkit2gtk4.0. %endif %package -n javascriptcoregtk6.0 Summary: JavaScript engine from webkitgtk6.0 +Provides: bundled(simde) +Provides: bundled(simdutf) Obsoletes: javascriptcoregtk5.0 < %{version}-%{release} %description -n javascriptcoregtk6.0 @@ -254,21 +246,13 @@ This package contains the JavaScript engine from webkitgtk6.0. %package -n javascriptcoregtk4.1 Summary: JavaScript engine from webkit2gtk4.1 +Provides: bundled(simde) +Provides: bundled(simdutf) Obsoletes: webkit2gtk4.1-jsc < %{version}-%{release} %description -n javascriptcoregtk4.1 This package contains the JavaScript engine from webkit2gtk4.1. -%package -n javascriptcoregtk4.0 -Summary: JavaScript engine from webkit2gtk4.0 -Obsoletes: webkitgtk4-jsc < %{version}-%{release} -Provides: webkitgtk4-jsc = %{version}-%{release} -Obsoletes: webkit2gtk3-jsc < %{version}-%{release} -Provides: webkit2gtk3-jsc = %{version}-%{release} - -%description -n javascriptcoregtk4.0 -This package contains the JavaScript engine from webkit2gtk4.0. - %package -n javascriptcoregtk6.0-devel Summary: Development files for JavaScript engine from webkitgtk6.0 Requires: javascriptcoregtk6.0%{?_isa} = %{version}-%{release} @@ -287,18 +271,6 @@ Obsoletes: webkit2gtk4.1-jsc-devel < %{version}-%{release} The javascriptcoregtk4.1-devel package contains libraries, build data, and header files for developing applications that use JavaScript engine from webkit2gtk-4.1. -%package -n javascriptcoregtk4.0-devel -Summary: Development files for JavaScript engine from webkit2gtk4.0 -Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release} -Obsoletes: webkitgtk4-jsc-devel < %{version}-%{release} -Provides: webkitgtk4-jsc-devel = %{version}-%{release} -Obsoletes: webkit2gtk3-jsc-devel < %{version}-%{release} -Provides: webkit2gtk3-jsc-devel = %{version}-%{release} - -%description -n javascriptcoregtk4.0-devel -The javascriptcoregtk4.0-devel package contains libraries, build data, and header -files for developing applications that use JavaScript engine from webkit2gtk-4.0. - %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n webkitgtk-%{version} @@ -331,89 +303,56 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0 %global optflags %(echo %{optflags} | sed 's/-mbranch-protection=standard /-mbranch-protection=pac-ret /') %endif -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 -%cmake \ +mkdir webkitgtk-6.0 +pushd webkitgtk-6.0 +%cmake -S .. \ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_GTK4=ON \ + -DUSE_LIBBACKTRACE=OFF \ %if %{without docs} -DENABLE_DOCUMENTATION=OFF \ -%endif -%if !0%{?with_gamepad} - -DENABLE_GAMEPAD=OFF \ -%endif -%if 0%{?rhel} -%ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ -%endif %endif %{nil} +popd -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -%cmake \ +mkdir webkit2gtk-4.1 +pushd webkit2gtk-4.1 +%cmake -S .. \ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ + -DUSE_GTK4=OFF \ + -DUSE_LIBBACKTRACE=OFF \ -DENABLE_WEBDRIVER=OFF \ %if %{without docs} -DENABLE_DOCUMENTATION=OFF \ -%endif -%if !0%{?with_gamepad} - -DENABLE_GAMEPAD=OFF \ -%endif -%if 0%{?rhel} -%ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ -%endif %endif %{nil} +popd -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -%cmake \ - -GNinja \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_SOUP2=ON \ - -DENABLE_WEBDRIVER=OFF \ -%if %{without docs} - -DENABLE_DOCUMENTATION=OFF \ -%endif -%if !0%{?with_gamepad} - -DENABLE_GAMEPAD=OFF \ -%endif -%if 0%{?rhel} -%ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ -%endif -%endif - %{nil} - -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 -export NINJA_STATUS="[1/3][%f/%t %es] " +pushd webkitgtk-6.0 +export NINJA_STATUS="[1/2][%f/%t %es] " %cmake_build %limit_build -m 3072 +popd -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -export NINJA_STATUS="[2/3][%f/%t %es] " -%cmake_build %limit_build -m 3072 - -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -export NINJA_STATUS="[3/3][%f/%t %es] " +pushd webkit2gtk-4.1 +export NINJA_STATUS="[2/2][%f/%t %es] " %cmake_build %limit_build -m 3072 +popd %install -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 +pushd webkitgtk-6.0 %cmake_install +popd -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -%cmake_install - -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 +pushd webkit2gtk-4.1 %cmake_install +popd %find_lang WebKitGTK-6.0 %find_lang WebKitGTK-4.1 -%find_lang WebKitGTK-4.0 # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB @@ -434,10 +373,10 @@ 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.3* +%{_libdir}/libwebkitgtk-6.0.so.4* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/WebKit-6.0.typelib -%{_libdir}/girepository-1.0/WebKitWebExtension-6.0.typelib +%{_libdir}/girepository-1.0/WebKitWebProcessExtension-6.0.typelib %{_libdir}/webkitgtk-6.0/ %{_libexecdir}/webkitgtk-6.0/ %exclude %{_libexecdir}/webkitgtk-6.0/MiniBrowser @@ -458,30 +397,16 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.1/jsc -%files -n webkit2gtk4.0 -f WebKitGTK-4.0.lang -%license _license_files/*ThirdParty* -%license _license_files/*WebCore* -%license _license_files/*WebInspectorUI* -%license _license_files/*WTF* -%{_libdir}/libwebkit2gtk-4.0.so.37* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/WebKit2-4.0.typelib -%{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib -%{_libdir}/webkit2gtk-4.0/ -%{_libexecdir}/webkit2gtk-4.0/ -%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser -%exclude %{_libexecdir}/webkit2gtk-4.0/jsc - %files -n webkitgtk6.0-devel %{_libexecdir}/webkitgtk-6.0/MiniBrowser %{_includedir}/webkitgtk-6.0/ %exclude %{_includedir}/webkitgtk-6.0/jsc %{_libdir}/libwebkitgtk-6.0.so %{_libdir}/pkgconfig/webkitgtk-6.0.pc -%{_libdir}/pkgconfig/webkitgtk-web-extension-6.0.pc +%{_libdir}/pkgconfig/webkitgtk-web-process-extension-6.0.pc %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/WebKit-6.0.gir -%{_datadir}/gir-1.0/WebKitWebExtension-6.0.gir +%{_datadir}/gir-1.0/WebKitWebProcessExtension-6.0.gir %files -n webkit2gtk4.1-devel %{_libexecdir}/webkit2gtk-4.1/MiniBrowser @@ -495,18 +420,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_datadir}/gir-1.0/WebKit2-4.1.gir %{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir -%files -n webkit2gtk4.0-devel -%{_libexecdir}/webkit2gtk-4.0/MiniBrowser -%{_includedir}/webkitgtk-4.0/ -%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore -%exclude %{_includedir}/webkitgtk-4.0/jsc -%{_libdir}/libwebkit2gtk-4.0.so -%{_libdir}/pkgconfig/webkit2gtk-4.0.pc -%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/WebKit2-4.0.gir -%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir - %files -n javascriptcoregtk6.0 %license _license_files/*JavaScriptCore* %{_libdir}/libjavascriptcoregtk-6.0.so.1* @@ -519,12 +432,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib -%files -n javascriptcoregtk4.0 -%license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-4.0.so.18* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib - %files -n javascriptcoregtk6.0-devel %{_libexecdir}/webkitgtk-6.0/jsc %dir %{_includedir}/webkitgtk-6.0 @@ -544,37 +451,18 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/JavaScriptCore-4.1.gir -%files -n javascriptcoregtk4.0-devel -%{_libexecdir}/webkit2gtk-4.0/jsc -%dir %{_includedir}/webkitgtk-4.0 -%{_includedir}/webkitgtk-4.0/JavaScriptCore/ -%{_includedir}/webkitgtk-4.0/jsc/ -%{_libdir}/libjavascriptcoregtk-4.0.so -%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir - %if %{with docs} %files -n webkitgtk6.0-doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/ -%{_datadir}/gtk-doc/html/webkitgtk-6.0/ -%{_datadir}/gtk-doc/html/webkitgtk-web-extension-6.0/ +%dir %{_datadir}/doc +%{_datadir}/doc/javascriptcoregtk-6.0/ +%{_datadir}/doc/webkitgtk-6.0/ +%{_datadir}/doc/webkitgtk-web-process-extension-6.0/ %files -n webkit2gtk4.1-doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/ -%{_datadir}/gtk-doc/html/webkit2gtk-4.1/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/ - -%files -n webkit2gtk4.0-doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-4.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/ +%dir %{_datadir}/doc +%{_datadir}/doc/javascriptcoregtk-4.1/ +%{_datadir}/doc/webkit2gtk-4.1/ +%{_datadir}/doc/webkit2gtk-web-extension-4.1/ %endif %changelog