From 0801e8e3e45b85ea79326e87d51bae5ed98d6505eea608a004b605a7531560cf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Sep 2021 06:26:36 +0000 Subject: [PATCH 1/3] Accepting request 921030 from GNOME:Next Sub the new stable - supersede - Update to version 2.34.0: + Fix another regression in JavaScriptCore on 32bit systems. - Update to version 2.33.91: + Use the right display refresh monitor for animations in accelerated compositng mode. + Fix several issues in JavaScriptCore on 32bit systems. + Prefer python3 over python2 in CMake. - Update to version 2.33.90: + Show TLS protocol version and ciphersuite name in the inspector when building with libsoup3. + Add multi-track support to media backend. + Avoid strong alias computations in font fallback code. + Fix deadlock tearing down pipeline when using fallback sink. + Fix the build with gtk-doc enabled. + Fix several crashes and rendering issues. - Add fix-warnings.patch: silence return-type warnings. - Add a 3rd flavor: gtk3 with libsoup2 (which retains compatibility to the olderversions, identified as API version 4.0). - Add _multibuild file and enable build of webkit2gtk4. - Update to version 2.33.3: + Add support for display capture. + Add new API to access/modify capture devices states. + Add new API to configure the memory pressure handler. + Add support for client side certifiates authentication. + Add support color-schemes CSS property. OBS-URL: https://build.opensuse.org/request/show/921030 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=313 --- _multibuild | 6 ++ baselibs.conf | 4 +- fix-warnings.patch | 52 ++++++++++++++++++ no-forced-sse.patch | 10 ++-- webkit2gtk3.changes | 82 +++++++++++++++++++++++++++ webkit2gtk3.spec | 107 ++++++++++++++++++++++++++++-------- webkitgtk-2.32.4.tar.xz | 3 - webkitgtk-2.32.4.tar.xz.asc | 6 -- webkitgtk-2.34.0.tar.xz | 3 + webkitgtk-2.34.0.tar.xz.asc | 6 ++ 10 files changed, 240 insertions(+), 39 deletions(-) create mode 100644 _multibuild create mode 100644 fix-warnings.patch delete mode 100644 webkitgtk-2.32.4.tar.xz delete mode 100644 webkitgtk-2.32.4.tar.xz.asc create mode 100644 webkitgtk-2.34.0.tar.xz create mode 100644 webkitgtk-2.34.0.tar.xz.asc diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..3e5bd03 --- /dev/null +++ b/_multibuild @@ -0,0 +1,6 @@ + + gtk3 + gtk3-soup2 + gtk4 + + diff --git a/baselibs.conf b/baselibs.conf index 50f826f..c5d485c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libjavascriptcoregtk-4_0-18 -libwebkit2gtk-4_0-37 +libjavascriptcoregtk-4_1-0 +libwebkit2gtk-4_1-0 diff --git a/fix-warnings.patch b/fix-warnings.patch new file mode 100644 index 0000000..e55a79d --- /dev/null +++ b/fix-warnings.patch @@ -0,0 +1,52 @@ +From bca7975b39efea16e6e669853fe897d0d6bd89f7 Mon Sep 17 00:00:00 2001 +From: "commit-queue@webkit.org" + +Date: Fri, 3 Sep 2021 12:07:18 +0000 +Subject: [PATCH] Silence more -Wreturn-type warnings + https://bugs.webkit.org/show_bug.cgi?id=229858 + +Unreviewed. + +Patch by Michael Catanzaro on 2021-09-03 + +* runtime/TemporalDuration.cpp: +(JSC::propertyName): +* runtime/TemporalObject.cpp: +(JSC::roundNumberToIncrement): + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@281986 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/JavaScriptCore/ChangeLog | 12 ++++++++++++ + Source/JavaScriptCore/runtime/TemporalDuration.cpp | 2 ++ + Source/JavaScriptCore/runtime/TemporalObject.cpp | 2 ++ + 3 files changed, 16 insertions(+) + +diff --git a/Source/JavaScriptCore/runtime/TemporalDuration.cpp b/Source/JavaScriptCore/runtime/TemporalDuration.cpp +index 67ad4e819ff4..0da24a52557e 100644 +--- a/Source/JavaScriptCore/runtime/TemporalDuration.cpp ++++ b/Source/JavaScriptCore/runtime/TemporalDuration.cpp +@@ -42,6 +42,8 @@ static PropertyName propertyName(VM& vm, unsigned index) + JSC_TEMPORAL_UNITS(JSC_TEMPORAL_DURATION_PROPERTY_NAME) + #undef JSC_TEMPORAL_DURATION_PROPERTY_NAME + } ++ ++ RELEASE_ASSERT_NOT_REACHED(); + } + + const ClassInfo TemporalDuration::s_info = { "Object", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(TemporalDuration) }; +diff --git a/Source/JavaScriptCore/runtime/TemporalObject.cpp b/Source/JavaScriptCore/runtime/TemporalObject.cpp +index 9535719f7ec1..e9b872d2418a 100644 +--- a/Source/JavaScriptCore/runtime/TemporalObject.cpp ++++ b/Source/JavaScriptCore/runtime/TemporalObject.cpp +@@ -328,6 +328,8 @@ double roundNumberToIncrement(double x, double increment, RoundingMode mode) + case RoundingMode::HalfExpand: + return std::round(quotient) * increment; + } ++ ++ RELEASE_ASSERT_NOT_REACHED(); + } + + } // namespace JSC +-- +2.32.0 + diff --git a/no-forced-sse.patch b/no-forced-sse.patch index d213e69..3d18ee4 100644 --- a/no-forced-sse.patch +++ b/no-forced-sse.patch @@ -15,12 +15,12 @@ of makefilery. Source/cmake/WebKitCompilerFlags.cmake | 9 --------- 1 file changed, 9 deletions(-) -Index: webkitgtk-2.26.3/Source/cmake/WebKitCompilerFlags.cmake +Index: webkitgtk-2.33.3/Source/cmake/WebKitCompilerFlags.cmake =================================================================== ---- webkitgtk-2.26.3.orig/Source/cmake/WebKitCompilerFlags.cmake -+++ webkitgtk-2.26.3/Source/cmake/WebKitCompilerFlags.cmake -@@ -137,15 +137,6 @@ if (COMPILER_IS_GCC_OR_CLANG) - if (CMAKE_COMPILER_IS_GNUCXX) +--- webkitgtk-2.33.3.orig/Source/cmake/WebKitCompilerFlags.cmake ++++ webkitgtk-2.33.3/Source/cmake/WebKitCompilerFlags.cmake +@@ -148,15 +148,6 @@ if (COMPILER_IS_GCC_OR_CLANG) + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined) endif () - diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 2d0d7e8..6b32a9b 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Wed Sep 22 16:18:00 UTC 2021 - Dominique Leuenberger + +- Update to version 2.34.0: + + Fix another regression in JavaScriptCore on 32bit systems. + +------------------------------------------------------------------- +Mon Sep 20 02:33:51 UTC 2021 - Michael Gorse + +- Update to version 2.33.91: + + Use the right display refresh monitor for animations in + accelerated compositng mode. + + Fix several issues in JavaScriptCore on 32bit systems. + + Prefer python3 over python2 in CMake. + +------------------------------------------------------------------- +Mon Sep 20 02:33:50 UTC 2021 - Michael Gorse + +- Update to version 2.33.90: + + Show TLS protocol version and ciphersuite name in the + inspector when building with libsoup3. + + Add multi-track support to media backend. + + Avoid strong alias computations in font fallback code. + + Fix deadlock tearing down pipeline when using fallback sink. + + Fix the build with gtk-doc enabled. + + Fix several crashes and rendering issues. +- Add fix-warnings.patch: silence return-type warnings. + +------------------------------------------------------------------- +Mon Sep 20 02:33:05 UTC 2021 - Dominique Leuenberger + +- Add a 3rd flavor: gtk3 with libsoup2 (which retains compatibility + to the olderversions, identified as API version 4.0). + +------------------------------------------------------------------- +Mon Sep 20 02:33:04 UTC 2021 - Dominique Leuenberger + +- Add _multibuild file and enable build of webkit2gtk4. + +------------------------------------------------------------------- +Mon Sep 20 02:33:03 UTC 2021 - Dominique Leuenberger + +- Update to version 2.33.3: + + Add support for display capture. + + Add new API to access/modify capture devices states. + + Add new API to configure the memory pressure handler. + + Add support for client side certifiates authentication. + + Add support color-schemes CSS property. + + Add support for dark scrollbars. + + Keep GtkSettings used by web processes in sync with the + settings set in the UI process. + + Add support for drawing the scrollbars corner. + + Allow to opt-out of GL rendering at runtime for media player. + + Add support for A420 compositing in media player. + + Improve pinch to zoom gesture in accerlerated compositing mode. + + Fix cookies configuration after a network process crash. + + Fix touchscreen navigation swipe when the page scrolls + horizontally. + + Fix rendering of elliptic radial gradients. + + Fix several crashes and rendering issues. + + Updated translations. +- Drop fix-lto.patch: fixed upstream. +- Add pkgconfig(lcms2) BuildRequires: new dependency. +- Replace pkgconfig(libsoup-2.4) BuildRequires with + pkgconfig(libsoup-3.0): Follow upstreams port to Libsoup 3.0. + ------------------------------------------------------------------- Sun Sep 19 19:00:09 UTC 2021 - Michael Gorse @@ -71,6 +137,22 @@ Mon Jul 26 15:38:26 UTC 2021 - Michael Gorse process. - Disable WPE renderer: our FDO backend is now too old. +------------------------------------------------------------------- +Mon Jul 26 15:38:26 UTC 2021 - Michael Gorse + +- Update to version 2.32.3 (boo#1188697): + + Properly set the cookies settings after a network process + crash. + + Fix accessibility tree after a cross site navigation with PSON + enabled. + + Ensure WebKitScriptWorld::window-object-cleared signal is + always emitted. + + Fix several crashes and rendering issues. + + Security fixes: CVE-2021-21775, CVE-2021-21779, CVE-2021-30663, + CVE-2021-30665, CVE-2021-30689, CVE-2021-30720, CVE-2021-30734, + CVE-2021-30744, CVE-2021-30749, CVE-2021-30795, CVE-2021-30797, + CVE-2021-30799. + ------------------------------------------------------------------- Mon Jul 19 18:36:42 UTC 2021 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b3307e9..c0eb4b2 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,5 +1,5 @@ # -# spec file for package webkit2gtk3 +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,7 +16,33 @@ # +%define flavor @BUILD_FLAVOR@%nil + +%define _name webkitgtk +%if "%{flavor}" == "" +# gtknamesuffix is just so we do not have to rename the source package - no package is generated here +%define _gtknamesuffix gtk3 +ExclusiveArch: do-not-build +%endif + +%if "%{flavor}" == "gtk3" +%define _gtknamesuffix gtk3 %define _pkgname_no_slpp libwebkit2gtk3 +%define _apiver 4.1 +%define _sover -4_1-0 +%define _wk2sover -4_1-0 +%define _sonamever 4.1 +%define _sonameverpkg 4_1 +%define _gtkver 3.0 +%define _jscver 4.1 +%define _pkgconfig_suffix gtk-3.0 +%define _usesoup2 0 +%endif + +%if "%{flavor}" == "gtk3-soup2" +%define _gtknamesuffix gtk3-soup2 +%define _pkgname_no_slpp libwebkit2gtk3 +%define _apiver 4.0 %define _sover -4_0-18 %define _wk2sover -4_0-37 %define _sonamever 4.0 @@ -24,14 +50,30 @@ %define _gtkver 3.0 %define _jscver 4 %define _pkgconfig_suffix gtk-3.0 -%define _name webkitgtk +%define _usesoup2 1 +%endif + +%if "%{flavor}" == "gtk4" +%define _gtknamesuffix gtk4 +%define _pkgname_no_slpp libwebkit2gtk4 +%define _apiver 5.0 +%define _sover -5_0-0 +%define _wk2sover -5_0-0 +%define _sonamever 5.0 +%define _sonameverpkg 5_0 +%define _gtkver 4.0 +%define _jscver 5.0 +%define _pkgconfig_suffix gtk-4.0 +%define _usesoup2 0 +%endif + # gold linker not available on old s390/s390x %define _gold_linker 1 %ifarch ppc ppc64le s390 %define _gold_linker 0 %endif -Name: webkit2gtk3 -Version: 2.32.4 +Name: webkit2%{_gtknamesuffix} +Version: 2.34.0 Release: 0 Summary: Library for rendering web content, GTK+ Port License: BSD-3-Clause AND LGPL-2.0-or-later @@ -44,6 +86,8 @@ Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox. Patch0: no-forced-sse.patch +# PATCH-FIX-UPSTREAM fix-warnings.patch mgorse@suse.com -- silence return-type warnings. +Patch1: fix-warnings.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel @@ -90,15 +134,26 @@ BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-tag-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) +%if "%{flavor}" == "gtk3" || "%{flavor}" == "gtk3-soup2" BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +%endif +%if "%{flavor}" == "gtk4" +BuildRequires: pkgconfig(gtk4) >= 3.98.50 +BuildRequires: pkgconfig(xcomposite) +%endif BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.2 +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libbrotlidec) >= 1.0.1 BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.61.90 +%if %{_usesoup2} +BuildRequires: pkgconfig(libsoup-2.4) >= 2.54.0 +%else +BuildRequires: pkgconfig(libsoup-3.0) >= 2.99.9 +%endif BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) @@ -130,7 +185,7 @@ Summary: Library for rendering web content, GTK+ Port Group: System/Libraries Requires: bubblewrap Requires: libjavascriptcoregtk%{_sover} = %{version} -Requires: webkit2gtk-4_0-injected-bundles +Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles Requires: xdg-dbus-proxy Provides: %{_pkgname_no_slpp} = %{version} Obsoletes: webkit2gtk3-plugin-process-gtk2 @@ -144,11 +199,11 @@ It is able to display content such as HTML, SVG, XML, and others. It also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more. -%package -n webkit2gtk-4_0-injected-bundles +%package -n webkit2gtk-%{_sonameverpkg}-injected-bundles Summary: Injected bundles for %{name} Group: System/Libraries -%description -n webkit2gtk-4_0-injected-bundles +%description -n webkit2gtk-%{_sonameverpkg}-injected-bundles WebKit is a web content engine, derived from KHTML and KJS from KDE, and used primarily in Apple's Safari browser. It is made to be embedded in other applications, such as mail readers, or web browsers. @@ -290,11 +345,17 @@ export PYTHON=%{_bindir}/python3 -DCMAKE_BUILD_TYPE=Release \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \ -DPORT=GTK \ +%if "%{flavor}" == "gtk4" + -DUSE_GTK4=ON \ +%endif -DENABLE_MINIBROWSER=ON \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ +%if %{_usesoup2} + -DUSE_SOUP2=ON \ +%endif %ifarch aarch64 -DENABLE_JIT=OFF \ -DENABLE_C_LOOP=ON \ @@ -306,7 +367,8 @@ export PYTHON=%{_bindir}/python3 %install %ninja_install -C build -%find_lang WebKit2GTK-4.0 +rm %{buildroot}%{_bindir}/WebKitWebDriver +%find_lang WebKit2GTK-%{_apiver} %post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig %postun -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig @@ -318,17 +380,16 @@ export PYTHON=%{_bindir}/python3 %exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc %exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser %{_libexecdir}/libwebkit2gtk%{_wk2sover}/ -%{_libdir}/libwebkit2gtk-4.0.so.* -%{_bindir}/WebKitWebDriver +%{_libdir}/libwebkit2gtk-%{_apiver}.so.* -%files -n webkit2gtk-4_0-injected-bundles -%dir %{_libdir}/webkit2gtk-4.0 -%dir %{_libdir}/webkit2gtk-4.0/injected-bundle -%{_libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so +%files -n webkit2gtk-%{_sonameverpkg}-injected-bundles +%dir %{_libdir}/webkit2gtk-%{_apiver} +%dir %{_libdir}/webkit2gtk-%{_apiver}/injected-bundle +%{_libdir}/webkit2gtk-%{_apiver}/injected-bundle/libwebkit2gtkinjectedbundle.so %files -n libjavascriptcoregtk%{_sover} %license Source/JavaScriptCore/COPYING.LIB -%{_libdir}/libjavascriptcoregtk-4.0.so.* +%{_libdir}/libjavascriptcoregtk-%{_apiver}.so.* %files -n typelib-1_0-WebKit2-%{_sonameverpkg} %{_libdir}/girepository-1.0/WebKit2-%{_sonamever}.typelib @@ -341,12 +402,12 @@ export PYTHON=%{_bindir}/python3 %files devel %{_datadir}/gir-1.0/*.gir -%{_includedir}/webkitgtk-4.0/ -%{_libdir}/libwebkit2gtk-4.0.so -%{_libdir}/libjavascriptcoregtk-4.0.so -%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc -%{_libdir}/pkgconfig/webkit2gtk-4.0.pc -%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc +%{_includedir}/webkitgtk-%{_apiver}/ +%{_libdir}/libwebkit2gtk-%{_sonamever}.so +%{_libdir}/libjavascriptcoregtk-%{_sonamever}.so +%{_libdir}/pkgconfig/javascriptcoregtk-%{_apiver}.pc +%{_libdir}/pkgconfig/webkit2gtk-%{_apiver}.pc +%{_libdir}/pkgconfig/webkit2gtk-web-extension-%{_apiver}.pc %files -n webkit-jsc-%{_jscver} %{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc @@ -354,6 +415,6 @@ export PYTHON=%{_bindir}/python3 %files minibrowser %{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser -%files -n %{_pkgname_no_slpp}-lang -f WebKit2GTK-4.0.lang +%files -n %{_pkgname_no_slpp}-lang -f WebKit2GTK-%{_apiver}.lang %changelog diff --git a/webkitgtk-2.32.4.tar.xz b/webkitgtk-2.32.4.tar.xz deleted file mode 100644 index eee14e6..0000000 --- a/webkitgtk-2.32.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd -size 23327956 diff --git a/webkitgtk-2.32.4.tar.xz.asc b/webkitgtk-2.32.4.tar.xz.asc deleted file mode 100644 index 0a6e8f6..0000000 --- a/webkitgtk-2.32.4.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYURqiAAKCRDz0yLQ7EWC -w9+SAJwN6Q7lTZgc9lxWQL3B4lbRQRmG9QCgs2qAd3eR88c8sf8TYmRMIAYsOeg= -=DC0M ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.34.0.tar.xz b/webkitgtk-2.34.0.tar.xz new file mode 100644 index 0000000..42e3b92 --- /dev/null +++ b/webkitgtk-2.34.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:880c8ee626f67019f67557ca09e59a23ecf245e60f6173215f1a8823cb09af34 +size 24998292 diff --git a/webkitgtk-2.34.0.tar.xz.asc b/webkitgtk-2.34.0.tar.xz.asc new file mode 100644 index 0000000..575eb26 --- /dev/null +++ b/webkitgtk-2.34.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYUrziAAKCRDz0yLQ7EWC +w0NeAJwJgGcP2gyLMciO+w0B6lYKhd5SlwCfXd2PHl2rTrZWgmWwl62qrwQ80uM= +=5q65 +-----END PGP SIGNATURE----- From 6adf63bcc6aafd88df2248776d9c4093e4154185f4f0ad669c26106074ace6ad Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Sep 2021 08:38:41 +0000 Subject: [PATCH 2/3] Accepting request 922100 from GNOME:Next - Rename -lang packages to WebKit2GTK-%{_apiver}, making the translations between the three flavors co-exist. OBS-URL: https://build.opensuse.org/request/show/922100 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=314 --- webkit2gtk3.changes | 6 ++++++ webkit2gtk3.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 6b32a9b..c73992e 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 29 06:47:28 UTC 2021 - Dominique Leuenberger + +- Rename -lang packages to WebKit2GTK-%{_apiver}, making the + translations between the three flavors co-exist. + ------------------------------------------------------------------- Wed Sep 22 16:18:00 UTC 2021 - Dominique Leuenberger diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index c0eb4b2..7d323fe 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -188,6 +188,7 @@ Requires: libjavascriptcoregtk%{_sover} = %{version} Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles Requires: xdg-dbus-proxy Provides: %{_pkgname_no_slpp} = %{version} +Provides: WebKit2GTK-%{_apiver} Obsoletes: webkit2gtk3-plugin-process-gtk2 %description -n libwebkit2gtk%{_wk2sover} @@ -312,7 +313,7 @@ Group: Development/Tools/Other %description minibrowser A small test browswer from webkit, useful for testing features. -%lang_package -n %{_pkgname_no_slpp} +%lang_package -n WebKit2GTK-%{_apiver} %prep %autosetup -p1 -n webkitgtk-%{version} @@ -415,6 +416,6 @@ rm %{buildroot}%{_bindir}/WebKitWebDriver %files minibrowser %{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser -%files -n %{_pkgname_no_slpp}-lang -f WebKit2GTK-%{_apiver}.lang +%files -n WebKit2GTK-%{_apiver}-lang -f WebKit2GTK-%{_apiver}.lang %changelog From 5c5441359321e7b67ff3d45dca673a09913ae47088a12d74b543516a99760f74 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Sep 2021 10:23:03 +0000 Subject: [PATCH 3/3] Accepting request 922145 from GNOME:Next - Add libjavascriptcoregtk-4_0-18 and llibwebkit2gtk-4_0-37 to baselibs.conf: provide those libraries as multilib version. OBS-URL: https://build.opensuse.org/request/show/922145 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=315 --- baselibs.conf | 2 ++ webkit2gtk3.changes | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index c5d485c..71ec90e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ +libjavascriptcoregtk-4_0-18 libjavascriptcoregtk-4_1-0 +libwebkit2gtk-4_0-37 libwebkit2gtk-4_1-0 diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index c73992e..7f496fb 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 29 10:16:33 UTC 2021 - Dominique Leuenberger + +- Add libjavascriptcoregtk-4_0-18 and llibwebkit2gtk-4_0-37 to + baselibs.conf: provide those libraries as multilib version. + ------------------------------------------------------------------- Wed Sep 29 06:47:28 UTC 2021 - Dominique Leuenberger