- added gir patch (additional WebKit2 gir dependency on JavaScriptCore gir, should...

diff --git a/gtk-webkit4-gir.patch b/gtk-webkit4-gir.patch
new file mode 100644 (file)
index 0000000..7e427fa
--- /dev/null
+++ b/gtk-webkit4-gir.patch
@@ -0,0 +1,14 @@
+--- webkitgtk-2.24.1/Source/WebKit/PlatformGTK.cmake.orig      2019-04-08 11:30:53.000000000 +0200
++++ webkitgtk-2.24.1/Source/WebKit/PlatformGTK.cmake   2019-04-22 09:07:32.025569199 +0200
+@@ -855,6 +855,11 @@
+ 
+     ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib)
+     ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib)
++
++    # ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir is created from different directory
++    # so cmake needs top-level target dependency
++    # note: NAME_WE cuts all extensions, so WebKit2-${WEBKITGTK_API_VERSION}.gir becomes WebKit2-4 not WebKit2-4.0
++    add_dependencies(WebKit2-4-gir JavaScriptCore-4-gir)
+ endif ()
+ 
+ install(TARGETS webkit2gtkinjectedbundle

diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 0010f29cd59484dc4926fa8d1e54c7d3abed6851..90e83b831e14ddcf1abcf52dd3cda359dd884feb 100644 (file)
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -24,6 +24,7 @@ Source0:      https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5: ed70e2bf2476a58b17df3d051f42ce6a
 Patch0:                x32.patch
 Patch1:                %{name}-icu59.patch
+Patch2:                %{name}-gir.patch
 URL:           https://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
@@ -156,6 +157,7 @@ Dokumentacja API WebKita.
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build