Accepting request 1073476 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1073476
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=164
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:05 +00:00 committed by Git OBS Bridge
commit 39c0a741d0
9 changed files with 388 additions and 86 deletions

View File

@ -1,20 +0,0 @@
Index: webkitgtk-2.37.90/Source/cmake/WebKitCompilerFlags.cmake
===================================================================
--- webkitgtk-2.37.90.orig/Source/cmake/WebKitCompilerFlags.cmake
+++ webkitgtk-2.37.90/Source/cmake/WebKitCompilerFlags.cmake
@@ -154,15 +154,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
WEBKIT_PREPEND_GLOBAL_CXX_FLAGS(-Wno-odr)
endif ()
- # Force SSE2 fp on x86 builds.
- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
- include(DetectSSE2)
- if (NOT SSE2_SUPPORT_FOUND)
- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
- endif ()
- endif ()
-
# Makes builds faster. The GCC manual warns about the possibility that the assembler being
# used may not support input from a pipe, but in practice the toolchains we support all do.
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-pipe)

35
regression-fix.patch Normal file
View File

@ -0,0 +1,35 @@
From 7bcb97382f2f347dc348c3c31416ae7fd760ce6b Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 17 Mar 2023 15:39:52 -0500
Subject: [PATCH] REGRESSION(261320@main): [GLib] Broke
WebKitUserContentManager::script-message-received
https://bugs.webkit.org/show_bug.cgi?id=254089
Reviewed by NOBODY (OOPS!).
I forgot to update the marshaller used by
WebKitUserContentManager::script-message-received. It worked perfectly
fine in my development environment for whatever reason, but was broken
in at least Ephy Tech Preview.
* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp:
---
Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
index af2d963bb3b3..f778b19bc816 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
@@ -106,7 +106,11 @@ static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass
G_TYPE_FROM_CLASS(gObjectClass),
static_cast<GSignalFlags>(G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
0, nullptr, nullptr,
+#if ENABLE(2022_GLIB_API)
+ g_cclosure_marshal_VOID__OBJECT,
+#else
g_cclosure_marshal_VOID__BOXED,
+#endif
G_TYPE_NONE, 1,
#if ENABLE(2022_GLIB_API)
JSC_TYPE_VALUE);

View File

@ -1,30 +0,0 @@
From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Mon, 16 Jan 2023 16:55:26 -0800
Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in
ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689
Unreviewed build fix.
* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h:
Canonical link: https://commits.webkit.org/258968@main
---
Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 +
1 file changed, 1 insertion(+)
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 <algorithm>
#include <array>
+#include <cstdint>
#include <string>
#include <vector>
--
2.39.0

View File

@ -1,3 +1,163 @@
-------------------------------------------------------------------
Tue Mar 21 08:17:44 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix provides of libwebkit2gtk-4.[01]: Provide WebKitGTK-4.x. This
symbol is only needed by the lang packages and those have been
renamed from WebKit2GTK to WebKitGTK.
-------------------------------------------------------------------
Fri Mar 17 19:06:13 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.40.0:
+ New GTK4 API is now stable.
+ Use ANGLE for WebGL implementation and enable WebGL2.
+ Prefer EGL over X11, intead of GLX, where available.
+ Add support for speech synthesis using Flite.
+ Enable the async clipboard API.
+ Add API to query the permission state of web features.
+ Add API to support asynchronously returning values from user
script messages.
+ Make it possible to handle WebKitDownload::decide-destination
signal asynchronously.
+ Add new JavaScript execution APIs.
+ Make webkit://gpu output exportable as JSON.
+ Fix large memory allocation when uploading content.
- Add regression-fix.patch: [GLib] Broke
WebKitUserContentManager::script-message-received
-------------------------------------------------------------------
Wed Mar 8 16:18:06 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.39.91:
+ Rename WebKitWebExtension to WebKitWebProcessExtension in GTK4
API.
+ Remove WebKitJavascriptResult in favor of using JSCValue
directly in GTK4 API.
+ Add new API to get the request body of WebKitURISchemeRequest.
+ Make it possible to handle WebKitDownload::decide-destination
signal asynchronously.
+ Allow WebKitDownload destination to be a path instead of a URI.
+ Make webkit://gpu output exportable as JSON.
+ Improve scrolling performance in accelerated compositing mode.
+ Implement KeyboardEvent.repeat.
+ Fix a crash in MiniBrowser when the favicon is updated.
+ Fix the build in Ubuntu 20.04 and Debian Stable.
+ Fix several crashes and rendering issues.
+ Updated translations.
- Drop no-forced-sse.patch: Due to changes in the code, trying to
build without SSE2 support fails even with this patch. We are
forced to give up on this, SSE2 support is now mandatory for all
build targets.
- Add new defines and sub-packages in conditional ways, upstream
did a lot of changes for new gtk4 variant.
-------------------------------------------------------------------
Sun Feb 26 17:23:07 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.39.90:
+ Add new JavaScript execution APIs.
+ Merge functions of registering and unregistering script message
handler in GTK4 API.
+ Mark non-derivable types as final and make instance and class
struct declarations private in GTK4 API.
+ Make favicon and snapshot API use GdkTexture instead of cairo
surfaces in GTK4 API.
+ Fix scrolling after a history navigation with PSON enabled.
+ Fix criticals from webkitOptionMenuSetEvent when opening any
combo box.
+ Fix large memory allocation when uploading content.
+ Always update the active uri of WebKitFrame.
+ Fix several crashes and rendering issues.
+ Updated translations.
- Drop webkit2gtk3-missing-include.patch: Fixed upstream
-------------------------------------------------------------------
Wed Feb 15 14:39:07 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.39.7:
+ Fix the webkit.h public header causing applications to fail to
build.
+ Fix several crashes and rendering issues.
- Changes from version 2.39.6:
+ Add support for speech synthesis using Flite.
+ Bring back WebKitConsoleMessage API implementation.
+ Fix async scroll event propagation for GTK4.
+ Add network session API when building with GTK4.
+ Make most public types final when building with GTK4.
+ Remove WebKitPrintCustomWidget when building with GTK4.
+ Remove most of the webkit_web_view_new_with_*() constructors
when building with GTK4.
+ Remove webkit_web_context_get/set_process_model when building
with GTK4.
+ Do not allow the sandbox to mount the entire home directory.
+ Fix several crashes and rendering issues.
- Add pkgconfig(gstreamer-transcoder-1.0) and pkgconfig(openssl)
BuildRequires: New dependencies.
- Pass conditional ENABLE_WEBDRIVER=ON/OFF to cmake, enable/disable
build of webdriver where apropiate.
-------------------------------------------------------------------
Wed Feb 15 14:39:05 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.39.5:
+ Enable WebGL2 by default again that was disabled by mistake.
+ Fix the build with WebGL disabled.
+ Fix the webkit.h public header causing applications to fail to
build.
- Changes from version 2.39.4:
+ Fix WebGL when sandbox is enabled.
+ Fix loading of media documents.
+ Add new API disable web security.
+ Disable support for HLS in media backend by default.
+ Fix several crashes and rendering issues.
+ Updated translations.
- Changes from version 2.39.3:
+ Add new API to query the permission state of web features.
+ Deprecate all web extension DOM APIs (WebKitDOMDocument,
WebKitDOMElement, WebKitDOMNode).
+ Add webkit_web_hit_test_result_get_js_node() to get the
JSCValue for the node.
+ Add WebKitWebFormManager and deprecate WebKitWebPage form
related signals.
+ Dont perform position queries on video sink when the player is
for audio only.
+ Fix gibberish text when loading alternate data.
+ Fix several crashes and rendering issues.
- Changes from version 2.39.2:
+ Add API to support asynchronously returning values from user
script messages.
+ Deprecate WebKitConsoleMessage API.
+ Deprecate event parameter of WebKitWebView::context-menu and
WebKitWebView::show-option-menu signals in favor of a getter in
WebKitConextMenu and WebKitOptionMenu.
+ Do not emit context-menu signals for media settings popup menu.
+ Use async scrolling also for keyboard scrolling.
+ Add support for client side certificates on WebSocket
connections.
+ Fix first party for cookies set on every media request.
+ Fix a crash on authentication dialog with GTK4.
+ Fix web process leak when webkit_download_set_destination is
called with empty destination.
+ Fix several warnings when building for ARMv7 (32-bits).
+ Fix several crashes and rendering issues.
- Changes from version 2.39.1:
+ Use ANGLE for WebGL implementation and enable WebGL2.
+ Remove internal nested wayland compositor making libwpe
mandatory when building with wayland enabled.
+ Prefer EGL over X11, intead of GLX, where available.
+ Add support for background-repeat: space.
+ Add API to check if a response policy decision is for the main
resource.
+ Fix rendering of checkbox and radio buttons in black
backgrounds.
+ Make checkbox, radio and inner spin button scale along by page
zoom.
+ Add support for get computed label and get computed role
WebDriver commands.
+ Fix several crashes and rendering issues.
- Rebase patches with quilt.
- Add unifdef BuildRequires: New dependency.
-------------------------------------------------------------------
Wed Feb 15 14:30:47 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -58,19 +58,21 @@ ExclusiveArch: do-not-build
%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 _apiver 6.0
%define _sover -6_0-0
%define _wk2sover -6_0-0
%define _sonamever 6.0
%define _sonameverpkg 6_0
%define _gtkver 4.0
%define _jscver 5.0
%define _jscver 6.0
%define _pkgconfig_suffix gtk-4.0
%define _usesoup2 0
%define _wk2sover6api 6_0-4
%define _soverlj6api 6_0-1
%endif
Name: webkit2%{_gtknamesuffix}
Version: 2.38.5
Version: 2.40.0
Release: 0
Summary: Library for rendering web content, GTK+ Port
License: BSD-3-Clause AND LGPL-2.0-or-later
@ -81,10 +83,8 @@ Source1: %{url}/releases/%{_name}-%{version}.tar.xz.asc
Source98: baselibs.conf
Source99: webkit2gtk3.keyring
# PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 webkit
Patch0: no-forced-sse.patch
# PATCH-FIX-UPSTREAM webkit2gtk3-missing-include.patch mgorse@suse.com -- fix the build with gcc 13.
Patch1: webkit2gtk3-missing-include.patch
# PATCH-FIX-UPSTREAM regression-fix.patch -- [GLib] Broke WebKitUserContentManager::script-message-received
Patch0: regression-fix.patch
BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGL-devel
@ -113,6 +113,7 @@ BuildRequires: perl >= 5.10.0
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: ruby >= 1.9
BuildRequires: unifdef
BuildRequires: xdg-dbus-proxy
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(atspi-2) >= 2.5.3
@ -134,6 +135,7 @@ BuildRequires: pkgconfig(gstreamer-mpegts-1.0)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gstreamer-tag-1.0)
BuildRequires: pkgconfig(gstreamer-transcoder-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
%if "%{flavor}" == "gtk3" || "%{flavor}" == "gtk3-soup2"
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
@ -160,6 +162,7 @@ BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0
BuildRequires: pkgconfig(libxslt) >= 1.1.7
BuildRequires: pkgconfig(manette-0.2)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-protocols)
@ -182,11 +185,15 @@ Summary: Library for rendering web content, GTK+ Port
# Require the injected bundles. The bundles are dlopen()ed
Group: System/Libraries
Requires: bubblewrap
%if "%{flavor}" == "gtk4"
Requires: libjavascriptcoregtk%{_soverlj6api} = %{version}
%else
Requires: libjavascriptcoregtk%{_sover} = %{version}
%endif
Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles
Requires: xdg-dbus-proxy
Provides: %{_pkgname_no_slpp} = %{version}
Provides: WebKit2GTK-%{_apiver}
Provides: WebKitGTK-%{_apiver}
Obsoletes: webkit2gtk3-plugin-process-gtk2 < %{version}
Recommends: geoclue2
Recommends: gstreamer-plugins-bad
@ -202,6 +209,49 @@ 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 libwebkitgtk%{_wk2sover6api}
Summary: Library for rendering web content, GTK+ Port
# Require the injected bundles. The bundles are dlopen()ed
Group: System/Libraries
Requires: bubblewrap
%if "%{flavor}" == "gtk4"
Requires: libjavascriptcoregtk%{_soverlj6api} = %{version}
Requires: webkitgtk-%{_sonameverpkg}-injected-bundles
%else
Requires: libjavascriptcoregtk%{_sover} = %{version}
Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles
%endif
Requires: xdg-dbus-proxy
Provides: %{_pkgname_no_slpp} = %{version}
Provides: WebKitGTK-%{_apiver}
Obsoletes: webkit2gtk3-plugin-process-gtk2 < %{version}
Recommends: geoclue2
Recommends: gstreamer-plugins-bad
Recommends: gstreamer-plugins-good
Recommends: xdg-desktop-portal-gtk
%description -n libwebkitgtk%{_wk2sover6api}
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.
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 webkitgtk-%{_sonameverpkg}-injected-bundles
Summary: Injected bundles for %{name}
Group: System/Libraries
%description -n webkitgtk-%{_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.
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-%{_sonameverpkg}-injected-bundles
Summary: Injected bundles for %{name}
Group: System/Libraries
@ -228,6 +278,51 @@ 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 libjavascriptcoregtk%{_soverlj6api}
Summary: JavaScript Core Engine, GTK+ Port
Group: System/Libraries
%description -n libjavascriptcoregtk%{_soverlj6api}
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.
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 typelib-1_0-WebKit-%{_sonameverpkg}
Summary: Introspection bindings for %{name}
Group: System/Libraries
%description -n typelib-1_0-WebKit-%{_sonameverpkg}
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.
It is able to display content such as HTML, SVG, XML, and others. It
also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and
more.
This package provides the GObject Introspection bindings for the GTK+
port of WebKit2.
%package -n typelib-1_0-WebKitWebProcessExtension-%{_sonameverpkg}
Summary: Introspection bindings for %{name}
Group: System/Libraries
%description -n typelib-1_0-WebKitWebProcessExtension-%{_sonameverpkg}
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.
It is able to display content such as HTML, SVG, XML, and others. It
also supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and
more.
This package provides the GObject Introspection bindings for the GTK+
port of WebKit2.
%package -n typelib-1_0-WebKit2-%{_sonameverpkg}
Summary: Introspection bindings for %{name}
Group: System/Libraries
@ -279,11 +374,19 @@ port of the JavaScript Core engine.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
%if "%{flavor}" == "gtk4"
Requires: libjavascriptcoregtk%{_soverlj6api} = %{version}
Requires: libwebkitgtk%{_wk2sover6api} = %{version}
Requires: typelib-1_0-JavaScriptCore-%{_sonameverpkg}
Requires: typelib-1_0-WebKit-%{_sonameverpkg}
Requires: typelib-1_0-WebKitWebProcessExtension-%{_sonameverpkg}
%else
Requires: libjavascriptcoregtk%{_sover} = %{version}
Requires: libwebkit2gtk%{_wk2sover} = %{version}
Requires: typelib-1_0-JavaScriptCore-%{_sonameverpkg}
Requires: typelib-1_0-WebKit2-%{_sonameverpkg}
Requires: typelib-1_0-WebKit2WebExtension-%{_sonameverpkg}
%endif
%description devel
WebKit is a web content engine, derived from KHTML and KJS from KDE,
@ -317,18 +420,18 @@ A small test browswer from webkit, useful for testing features.
# Expand %%lang_package to Obsoletes its older-name counterpart
%if "%{flavor}" == "gtk3-soup2"
%package -n WebKit2GTK-%{_apiver}-lang
%package -n WebKitGTK-%{_apiver}-lang
Summary: Translations for package %{name}
Group: System/Localization
Requires: WebKit2GTK-%{_apiver} = %{version}
Provides: WebKit2GTK-%{_apiver}-lang-all = %{version}
Requires: WebKitGTK-%{_apiver} = %{version}
Provides: WebKitGTK-%{_apiver}-lang-all = %{version}
Obsoletes: libwebkit2gtk3-lang < %{version}
BuildArch: noarch
%description -n WebKit2GTK-%{_apiver}-lang
%description -n WebKitGTK-%{_apiver}-lang
Provides translations for the "%{name}" package.
%else
%lang_package -n WebKit2GTK-%{_apiver}
%lang_package -n WebKitGTK-%{_apiver}
%endif
%prep
@ -361,10 +464,14 @@ export PYTHON=%{_bindir}/python3
-DCMAKE_C_COMPILER=gcc-10 \
-DCMAKE_CXX_COMPILER=g++-10 \
%endif
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \
%if "%{flavor}" == "gtk4"
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkitgtk%{_wk2sover} \
-DUSE_GTK4=ON \
-DENABLE_WEBDRIVER=ON \
%else
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DENABLE_WEBDRIVER=OFF \
%endif
-DUSE_AVIF=ON \
-DENABLE_MINIBROWSER=ON \
@ -386,13 +493,30 @@ export PYTHON=%{_bindir}/python3
%install
%ninja_install -C build
rm %{buildroot}%{_bindir}/WebKitWebDriver
%find_lang WebKit2GTK-%{_apiver}
%find_lang WebKitGTK-%{_apiver}
%post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig
%postun -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig
%post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
%postun -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
%if "%{flavor}" == "gtk4"
%ldconfig_scriptlets -n libwebkitgtk%{_wk2sover6api}
%ldconfig_scriptlets -n libjavascriptcoregtk%{_soverlj6api}
%else
%ldconfig_scriptlets -n libwebkit2gtk%{_wk2sover}
%ldconfig_scriptlets -n libjavascriptcoregtk%{_sover}
%endif
%if "%{flavor}" == "gtk4"
%files -n libwebkitgtk%{_wk2sover6api}
# Exclude jsc and MiniBrowser - we package them on their own
%exclude %{_libexecdir}/libwebkitgtk%{_wk2sover}/jsc
%exclude %{_libexecdir}/libwebkitgtk%{_wk2sover}/MiniBrowser
%{_libexecdir}/libwebkitgtk%{_wk2sover}/
%{_libdir}/libwebkitgtk-%{_apiver}.so.*
%files -n webkitgtk-%{_sonameverpkg}-injected-bundles
%dir %{_libdir}/webkitgtk-%{_apiver}
%dir %{_libdir}/webkitgtk-%{_apiver}/injected-bundle
%{_libdir}/webkitgtk-%{_apiver}/injected-bundle/libwebkitgtkinjectedbundle.so
%else
%files -n libwebkit2gtk%{_wk2sover}
# Exclude jsc and MiniBrowser - we package them on their own
@ -406,6 +530,22 @@ rm %{buildroot}%{_bindir}/WebKitWebDriver
%dir %{_libdir}/webkit2gtk-%{_apiver}/injected-bundle
%{_libdir}/webkit2gtk-%{_apiver}/injected-bundle/libwebkit2gtkinjectedbundle.so
%endif
%if "%{flavor}" == "gtk4"
%files -n libjavascriptcoregtk%{_soverlj6api}
%license Source/JavaScriptCore/COPYING.LIB
%{_libdir}/libjavascriptcoregtk-%{_apiver}.so.*
%files -n typelib-1_0-WebKit-%{_sonameverpkg}
%{_libdir}/girepository-1.0/WebKit-%{_sonamever}.typelib
%files -n typelib-1_0-WebKitWebProcessExtension-%{_sonameverpkg}
%{_libdir}/girepository-1.0/WebKitWebProcessExtension-%{_sonamever}.typelib
%else
%files -n libjavascriptcoregtk%{_sover}
%license Source/JavaScriptCore/COPYING.LIB
%{_libdir}/libjavascriptcoregtk-%{_apiver}.so.*
@ -416,24 +556,41 @@ rm %{buildroot}%{_bindir}/WebKitWebDriver
%files -n typelib-1_0-WebKit2WebExtension-%{_sonameverpkg}
%{_libdir}/girepository-1.0/WebKit2WebExtension-%{_sonamever}.typelib
%endif
%files -n typelib-1_0-JavaScriptCore-%{_sonameverpkg}
%{_libdir}/girepository-1.0/JavaScriptCore-%{_sonamever}.typelib
%files devel
%{_datadir}/gir-1.0/*.gir
%{_includedir}/webkitgtk-%{_apiver}/
%if "%{flavor}" == "gtk4"
%{_libdir}/libwebkitgtk-%{_sonamever}.so
%{_libdir}/pkgconfig/webkitgtk-%{_apiver}.pc
%{_libdir}/pkgconfig/webkitgtk-web-process-extension-%{_apiver}.pc
%else
%{_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
%endif
%{_libdir}/libjavascriptcoregtk-%{_sonamever}.so
%{_libdir}/pkgconfig/javascriptcoregtk-%{_apiver}.pc
%files -n webkit-jsc-%{_jscver}
%if "%{flavor}" == "gtk4"
%{_libexecdir}/libwebkitgtk%{_wk2sover}/jsc
%else
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc
%endif
%files minibrowser
%if "%{flavor}" == "gtk4"
%{_libexecdir}/libwebkitgtk%{_wk2sover}/MiniBrowser
%{_bindir}/WebKitWebDriver
%else
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/MiniBrowser
%endif
%files -n WebKit2GTK-%{_apiver}-lang -f WebKit2GTK-%{_apiver}.lang
%files -n WebKitGTK-%{_apiver}-lang -f WebKitGTK-%{_apiver}.lang
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7
size 33011600

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCY+yu2QAKCRDz0yLQ7EWC
w7UkAKCS0EoptKZRn3/Z+WgGerHQEQXaFQCg51h2++dwb1bqVZ05Q1YtHmoT2gk=
=or/S
-----END PGP SIGNATURE-----

3
webkitgtk-2.40.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
size 40042140

View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZBRcPwAKCRDz0yLQ7EWC
w9N0AJkBppB/tddEYzLkxOWIOqCTv4OUaQCgjauy+5yDquyWFZbHaxU7Eh/ofLg=
=XWt1
-----END PGP SIGNATURE-----