commit 44a25b11f701c2a04345932b32d39e8a1d89f0bd
Author: Jakub Bogusz <[email protected]>
Date: Mon Apr 24 22:08:34 2023 +0200
- started update to 2.38.5
- added gir patch to add missing inter-gir dependencies
gtk-webkit4-gir.patch | 20 ++++++++++++++++++++
gtk-webkit4.spec | 10 +++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 53b0af7..65dc75f 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -22,14 +22,15 @@ Summary: Port of WebKit embeddable web component to GTK+
3
Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3
Name: gtk-webkit4
# NOTE: 2.34.x is stable, 2.35.x devel
-Version: 2.36.1
-Release: 3
+Version: 2.38.5
+Release: 1
License: BSD-like
Group: X11/Libraries
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: e6100df7f82d95a4e65176b10f5ab011
+# Source0-md5: de05d314a3ecb5fb3835e4d84f8f466d
Patch0: x32.patch
Patch1: %{name}-icu59.patch
+Patch2: %{name}-gir.patch
URL: https://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -280,8 +281,10 @@ Dokumentacja API portu WebKitu do GTK 4.
%setup -q -n webkitgtk-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
+CXXFLAGS="%{rpmcxxflags} --param ggc-min-expand=50 --param
ggc-min-heapsize=1024"
for kind in %{?with_gtk3:%{?with_libsoup2:soup2} %{?with_libsoup3:soup3}}
%{?with_gtk4:gtk4} ; do
install -d build-${kind}
cd build-${kind}
@@ -293,6 +296,7 @@ cd build-${kind}
-DENABLE_GEOLOCATION=ON \
$([ "$kind" != "gtk4" ] && echo -DENABLE_GTKDOC=ON) \
%{!?with_introspection:-DENABLE_INTROSPECTION=OFF} \
+ -DENABLE_UNIFIED_BUILDS=OFF \
-DENABLE_VIDEO=ON \
%{!?with_wayland:-DENABLE_WAYLAND_TARGET=OFF} \
-DENABLE_WEB_AUDIO=ON \
diff --git a/gtk-webkit4-gir.patch b/gtk-webkit4-gir.patch
new file mode 100644
index 0000000..7fd9584
--- /dev/null
+++ b/gtk-webkit4-gir.patch
@@ -0,0 +1,20 @@
+#--- webkitgtk-2.38.5/Source/WebKit/PlatformGTK.cmake.orig 2022-09-14
13:58:10.556863500 +0200
+#+++ webkitgtk-2.38.5/Source/WebKit/PlatformGTK.cmake 2023-04-22
19:21:53.186764446 +0200
+#@@ -764,3 +764,6 @@ GI_INTROSPECT(WebKit2WebExtension ${WEBK
+# GI_DOCGEN(WebKit2WebExtension gtk/webkit2gtk-webextension.toml.in
+# CONTENT_TEMPLATES gtk/urlmap.js
+# )
+#+
+#+add_dependencies(gir-WebKit2 gir-JavaScriptCore)
+#+add_dependencies(gir-WebKit2WebExtension gir-JavaScriptCore)
+--- webkitgtk-2.38.5/Source/cmake/FindGI.cmake.orig 2023-02-14
10:01:07.457508800 +0100
++++ webkitgtk-2.38.5/Source/cmake/FindGI.cmake 2023-04-22 19:21:53.186764446
+0200
+@@ -265,7 +265,7 @@ function(GI_INTROSPECT namespace nsversi
+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY
GI_GIR_LIBRARY)
+ if (dep_gir_path)
+ list(APPEND scanner_flags
"--include-uninstalled=${dep_gir_path}")
+- list(APPEND gir_deps "${dep_gir_path}")
++ list(APPEND gir_deps "gir-${dep}")
+ else ()
+ message(AUTHOR_WARNING
+ "Target '${dep}' listed as a dependency but it has not "
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/44a25b11f701c2a04345932b32d39e8a1d89f0bd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
