Update to 2.46.3

Update to 2.46.1
Upgrade to 2.46.0
2024-10-30 13:27:13 -05:00 · 2024-09-30 15:49:05 -05:00 · 2024-09-17 17:06:51 -05:00 · 2024-08-15 12:58:12 -05:00 · 2024-08-13 14:38:23 -05:00 · 2024-06-08 12:34:42 -05:00
4 changed files with 161 additions and 174 deletions
--- a/monitoring.toml
+++ b/monitoring.toml
@ -1,13 +0,0 @@
-# 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
--- a/skia-s390x.patch
+++ b/skia-s390x.patch
@ -1,82 +0,0 @@
-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
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.53.91.tar.xz) = 0bb5ec4c75cf0dcd4ccc46b7cf8595722d447385b75ed6ec79333b56203f681077fa355600210edb4fe6344e4af2943c7fb5b1bff6e35a7ec1ea456d891a1951
-SHA512 (webkitgtk-2.53.91.tar.xz.asc) = 72f6f01f8f3e12228ee70202b9b9bda589c80a791086cde6d6af5f2f916b44877b984267c6a5970f4fe41ff7dac21bccfa7323f19d71f6fd3e4a87abb18be58c
+SHA512 (webkitgtk-2.46.3.tar.xz) = efec6e92bbea3379cf3bd1aff7d91aee3f028dcd1bcfbe7120d5ded30ada1541469fc5cd7897cb375e03a55e59d268f915c2a35345a84192b14971ac4339719f
+SHA512 (webkitgtk-2.46.3.tar.xz.asc) = bdd7c0b811869624d025988d1683a11701109038164bd8f373dbfe57d49d13a460775283e4448ebd5050c06d6ebdd0c7f59c4180cac0a7b01491d884cf77529a
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@ -19,34 +19,11 @@
 %endif

 Name:           webkitgtk
-Version:        2.53.91
+Version:        2.46.3
 Release:        %autorelease
 Summary:        GTK web content engine library

-# 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
+License:        LGPLv2
 URL:            https://www.webkitgtk.org/
 Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
@ -55,15 +32,12 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg

-# https://bugs.webkit.org/show_bug.cgi?id=312677
-Patch:          skia-s390x.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  flex
-BuildRequires:  flite-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  gi-docgen
 BuildRequires:  git
@ -73,14 +47,13 @@ BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
 BuildRequires:  openssl-devel
+BuildRequires:  perl(bigint)
 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
@ -90,7 +63,6 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enchant-2)
 BuildRequires:  pkgconfig(epoxy)
-BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gbm)
@ -113,6 +85,7 @@ BuildRequires:  pkgconfig(libnotify)
 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)
@ -121,7 +94,6 @@ BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(manette-0.2)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(sysprof-capture-4)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
@ -130,7 +102,7 @@ BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(xt)

 # Filter out provides for private libraries
-%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$
+%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$

 %description
 WebKitGTK is the port of the WebKit web rendering engine to the
@ -175,6 +147,27 @@ Provides:       bundled(xdgmime)
 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}
@ -196,6 +189,20 @@ 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
@ -204,15 +211,6 @@ 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.

@ -222,23 +220,25 @@ 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
@ -246,13 +246,21 @@ 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}
@ -271,6 +279,18 @@ 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}
@ -303,9 +323,8 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
 %global optflags %(echo %{optflags} | sed 's/-mbranch-protection=standard /-mbranch-protection=pac-ret /')
 %endif

-mkdir webkitgtk-6.0
-pushd webkitgtk-6.0
-%cmake -S .. \
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
+%cmake \
  -GNinja \
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
@ -315,44 +334,59 @@ pushd webkitgtk-6.0
  -DENABLE_DOCUMENTATION=OFF \
 %endif
  %{nil}
-popd

-mkdir webkit2gtk-4.1
-pushd webkit2gtk-4.1
-%cmake -S .. \
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+%cmake \
  -GNinja \
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
  -DUSE_GTK4=OFF \
-  -DUSE_LIBBACKTRACE=OFF \
  -DENABLE_WEBDRIVER=OFF \
+  -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
  -DENABLE_DOCUMENTATION=OFF \
 %endif
  %{nil}
-popd

-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.0
+%cmake \
+  -GNinja \
+  -DPORT=GTK \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DUSE_GTK4=OFF \
+  -DUSE_SOUP2=ON \
+  -DENABLE_WEBDRIVER=OFF \
+  -DUSE_LIBBACKTRACE=OFF \
+%if %{without docs}
+  -DENABLE_DOCUMENTATION=OFF \
+%endif
+  %{nil}

-pushd webkit2gtk-4.1
-export NINJA_STATUS="[2/2][%f/%t %es] "
-%cmake_build %limit_build -m 3072
-popd
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
+export NINJA_STATUS="[1/3][%f/%t %es] "
+%cmake_build %limit_build -m 4096
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+export NINJA_STATUS="[2/3][%f/%t %es] "
+%cmake_build %limit_build -m 4096
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
+export NINJA_STATUS="[3/3][%f/%t %es] "
+%cmake_build %limit_build -m 4096

 %install
-pushd webkitgtk-6.0
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 %cmake_install
-popd

-pushd webkit2gtk-4.1
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+%cmake_install
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
 %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
@ -397,6 +431,20 @@ popd
 %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/
@ -420,6 +468,18 @@ popd
 %{_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*
@ -432,6 +492,12 @@ popd
 %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
@ -451,6 +517,16 @@ popd
 %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}/doc
@ -463,7 +539,13 @@ popd
 %{_datadir}/doc/javascriptcoregtk-4.1/
 %{_datadir}/doc/webkit2gtk-4.1/
 %{_datadir}/doc/webkit2gtk-web-extension-4.1/
+
+%files -n webkit2gtk4.0-doc
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-4.0/
+%{_datadir}/doc/webkit2gtk-4.0/
+%{_datadir}/doc/webkit2gtk-web-extension-4.0/
 %endif

 %changelog
-%autochangelog
+%autochangelog
Author	SHA1	Message	Date
Michael Catanzaro	f64a8794e7	Update to 2.46.3	2024-10-30 13:27:13 -05:00
Michael Catanzaro	fd5e96fda4	Update to 2.46.1	2024-09-30 15:49:05 -05:00
Michael Catanzaro	6f82eadef1	Upgrade to 2.46.0	2024-09-17 17:06:51 -05:00
Michael Catanzaro	f7755fbaa0	Add patch to fix WebAssembly	2024-08-15 12:58:12 -05:00
Michael Catanzaro	2f9bbe5bfc	Update to 2.44.3	2024-08-13 14:38:23 -05:00
Michael Catanzaro	d9cbee92af	Add patch to fix excessive CPU usage	2024-06-08 12:34:42 -05:00
Michael Catanzaro	663e8ac595	Update to 2.44.2	2024-05-16 15:57:52 -05:00
Michael Catanzaro	a359d6c94e	Revert "Forgot to commit changes" This reverts commit `2e5c829a4e`. Oops, there was no need for this commit. [skip changelog]	2024-04-18 16:43:50 -05:00
Michael Catanzaro	2e5c829a4e	Forgot to commit changes [skip changelog]	2024-04-18 16:42:27 -05:00
Michael Catanzaro	9d4c08bb73	Request 4 GB of RAM per vCPU The aarch64 builders are running out of memory, so I guess we need to lower parallelism again.	2024-04-18 16:41:24 -05:00
Michael Catanzaro	7eb2471686	Update to 2.44.1	2024-04-11 13:11:56 -05:00
Michael Catanzaro	456ce80be1	Fix i686 build	2024-03-16 19:45:26 -05:00
Michael Catanzaro	002ce9750d	Upgrade to WebKitGTK 2.44.0	2024-03-16 15:07:56 -05:00
Michael Catanzaro	2a6dffb399	Update to WebKitGTK 2.42.5	2024-02-05 13:59:18 -06:00
Michael Catanzaro	4e6f2705ff	Update to 2.42.4	2023-12-15 09:19:57 -06:00
Michael Catanzaro	59f34fdb5b	Update to 2.42.3	2023-12-05 13:04:40 -06:00
Michael Catanzaro	51fec9a364	Update to 2.42.2 This also removes the unused bundled libavif/libdav1d from the tarball, which slightly simplifies the license tag.	2023-11-10 11:54:29 -06:00
Michael Catanzaro	9f7c6bc096	Update to 2.40.1 and fix GL dependencies GLES needs to be available at runtime or we'll crash, #2240428. It's not needed at runtime because it's only used via libepoxy. And desktop GL is no longer used at all. Fixes #2240428	2023-09-27 11:22:03 -05:00
Michael Catanzaro	6e8a4b123f	Update to WebKitGTK 2.42.0	2023-09-15 09:21:46 -05:00
Michael Catanzaro	454b1112c3	Update to 2.41.92	2023-09-08 10:09:04 -05:00
Michael Catanzaro	76789e3124	Disable LTO again to fix build Avoids: /usr/lib64/libglib-2.0.so /usr/lib64/libz.so /usr/lib64/libsystemd.so && : /usr/bin/ld: /tmp/cczGkWSW.ltrans0.ltrans.o: in function `ipint_table_size_validate': <artificial>:(.text+0x49f0f): undefined reference to `ipint_extern_table_size' /usr/bin/ld: /tmp/cczGkWSW.ltrans0.ltrans.o: in function `ipint_table_fill_validate': <artificial>:(.text+0x4a019): undefined reference to `ipint_extern_table_fill' which I am not able to reproduce locally, even when using -flto=auto.	2023-08-19 16:37:01 -05:00