From 2b250702a3497a1ede73b50d31b9edf3e92b0f0029a2d0821678698c72b0646d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Feb 2024 08:47:43 +0000 Subject: [PATCH 1/3] Accepting request 1146725 from GNOME:Next - Use gcc 11 on SLE, to match what is currently used on SP4, and adjust version check to include SP6. Also, use system malloc there; the build currently fails without this (webkit#243535). - Require gcc >= 10.2 to match the current cmake test. - Disable jpegxl on SLE; it isn't currently available there. OBS-URL: https://build.opensuse.org/request/show/1146725 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=444 --- webkit2gtk3.changes | 9 +++++++++ webkit2gtk3.spec | 31 +++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 55c2d3c..344a99f 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Feb 14 17:44:28 UTC 2024 - Michael Gorse + +- Use gcc 11 on SLE, to match what is currently used on SP4, and + adjust version check to include SP6. Also, use system malloc + there; the build currently fails without this (webkit#243535). +- Require gcc >= 10.2 to match the current cmake test. +- Disable jpegxl on SLE; it isn't currently available there. + ------------------------------------------------------------------- Mon Feb 5 16:58:41 UTC 2024 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index f471a93..104fa8e 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package webkit2gtk3 # # Copyright (c) 2024 SUSE LLC # @@ -25,7 +25,8 @@ ExclusiveArch: do-not-build %endif -%define usegcc10 0%{?sle_version} && 0%{?sle_version} <= 150400 +%define usegcc11 0%{?sle_version} && 0%{?sle_version} < 160000 +%define use_jxl !(0%{?sle_version} && 0%{?sle_version} < 160000) %if "%{flavor}" == "gtk3" %define _gtknamesuffix gtk3 @@ -104,10 +105,10 @@ BuildRequires: bubblewrap BuildRequires: cmake BuildRequires: enchant-devel BuildRequires: flex -%if %usegcc10 -BuildRequires: gcc10-c++ +%if %usegcc11 +BuildRequires: gcc11-c++ %else -BuildRequires: gcc-c++ >= 8.3 +BuildRequires: gcc-c++ >= 10.2 %endif BuildRequires: gobject-introspection-devel BuildRequires: gperf >= 3.0.1 @@ -130,7 +131,7 @@ BuildRequires: pkgconfig(fontconfig) >= 2.8.0 BuildRequires: pkgconfig(freetype2) >= 2.4.2 BuildRequires: pkgconfig(glib-2.0) >= 2.56.4 BuildRequires: pkgconfig(icu-i18n) -%if %usegcc10 +%if %usegcc11 BuildRequires: pkgconfig(glproto) %endif BuildRequires: pkgconfig(gnutls) >= 3.0.0 @@ -157,7 +158,9 @@ BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.18 BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libavif) >= 0.9.0 +%if %{use_jxl} BuildRequires: pkgconfig(libjxl) +%endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) @@ -430,9 +433,6 @@ Group: Development/Tools/Other A small test browswer from webkit, useful for testing features. - - - # Expand %%lang_package to Obsoletes its older-name counterpart %package -n WebKitGTK-%{_apiver}-lang @@ -475,9 +475,9 @@ export PYTHON=%{_bindir}/python3 -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_DOCUMENTATION=OFF \ -%if %usegcc10 - -DCMAKE_C_COMPILER=gcc-10 \ - -DCMAKE_CXX_COMPILER=g++-10 \ +%if %usegcc11 + -DCMAKE_C_COMPILER=gcc-11 \ + -DCMAKE_CXX_COMPILER=g++-11 \ %endif -DPORT=GTK \ %if "%{flavor}" == "gtk4" @@ -502,6 +502,13 @@ export PYTHON=%{_bindir}/python3 -DENABLE_C_LOOP=ON \ -DENABLE_SAMPLING_PROFILER=OFF \ -DUSE_SYSTEM_MALLOC=ON \ +%else +%if 0%{?sle_version} && 0%{?sle_version} < 160000 + -DUSE_SYSTEM_MALLOC=ON \ +%endif +%endif +%if !%{use_jxl} + -DUSE_JPEGXL=OFF \ %endif %ninja_build -j $max_link_jobs From 5e25c1bcbbbf714e8b815f91797888a39942fb86ebff5ac9bddf10f37880617a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Feb 2024 13:20:26 +0000 Subject: [PATCH 2/3] Accepting request 1146846 from GNOME:Next - Fix package names for v6, and obsolete old packages. OBS-URL: https://build.opensuse.org/request/show/1146846 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=445 --- webkit2gtk3.changes | 5 +++++ webkit2gtk3.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 344a99f..87b6281 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 15 04:03:27 UTC 2024 - Michael Gorse + +- Fix package names for v6, and obsolete old packages. + ------------------------------------------------------------------- Wed Feb 14 17:44:28 UTC 2024 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 104fa8e..90c084c 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -68,8 +68,8 @@ ExclusiveArch: do-not-build %define _jscver 6.0 %define _pkgconfig_suffix gtk-4.0 %define _usesoup2 0 -%define _wk2sover6api 6_0-4 -%define _soverlj6api 6_0-1 +%define _wk2sover6api -6_0-4 +%define _soverlj6api -6_0-1 %endif Name: webkit2%{_gtknamesuffix} @@ -231,6 +231,7 @@ Requires: bubblewrap %if "%{flavor}" == "gtk4" Requires: libjavascriptcoregtk%{_soverlj6api} = %{version} Requires: webkitgtk-%{_sonameverpkg}-injected-bundles +Obsoletes: libwebkitgtk6_0-4 %else Requires: libjavascriptcoregtk%{_sover} = %{version} Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles @@ -295,6 +296,7 @@ more. %package -n libjavascriptcoregtk%{_soverlj6api} Summary: JavaScript Core Engine, GTK+ Port Group: System/Libraries +Obsoletes: libjavascriptcoregtk6_0-1 %description -n libjavascriptcoregtk%{_soverlj6api} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -433,8 +435,8 @@ Group: Development/Tools/Other A small test browswer from webkit, useful for testing features. -# Expand %%lang_package to Obsoletes its older-name counterpart +# Expand %%lang_package to Obsoletes its older-name counterpart %package -n WebKitGTK-%{_apiver}-lang Summary: Translations for package %{name} Group: System/Localization From 0e45babc89693990df0c97df6ca0336272db41473ec4728220280d3cdee7f064 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Feb 2024 14:02:34 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=446 --- webkit2gtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 90c084c..574ebba 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -231,7 +231,8 @@ Requires: bubblewrap %if "%{flavor}" == "gtk4" Requires: libjavascriptcoregtk%{_soverlj6api} = %{version} Requires: webkitgtk-%{_sonameverpkg}-injected-bundles -Obsoletes: libwebkitgtk6_0-4 +# Package was wrongly named +Obsoletes: libwebkitgtk6_0-4 < 2.42.6 %else Requires: libjavascriptcoregtk%{_sover} = %{version} Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles @@ -296,7 +297,8 @@ more. %package -n libjavascriptcoregtk%{_soverlj6api} Summary: JavaScript Core Engine, GTK+ Port Group: System/Libraries -Obsoletes: libjavascriptcoregtk6_0-1 +# Package was wrongly named +Obsoletes: libjavascriptcoregtk6_0-1 < 2.42.6 %description -n libjavascriptcoregtk%{_soverlj6api} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -437,6 +439,7 @@ A small test browswer from webkit, useful for testing features. # Expand %%lang_package to Obsoletes its older-name counterpart + %package -n WebKitGTK-%{_apiver}-lang Summary: Translations for package %{name} Group: System/Localization