update to 2.30.4 [release 2.30.4-1mamba;Sun Jan 17 2021]

webkitgtk.spec

@@ -20,7 +20,7 @@
 %define        libname libwebkit2gtk
 
 Name:          webkitgtk
-Version:       2.30.2
+Version:       2.30.4
 Release:       1mamba
 Summary:       Port of WebKit embeddable web component to GTK+
 Group:         System/Libraries
@@ -65,6 +65,7 @@ BuildRequires: libsecret-devel
 BuildRequires: libsoup-devel
 BuildRequires: libsqlite-devel
 BuildRequires: libstdc++6-devel
+BuildRequires: libsystemd-devel
 BuildRequires: libtasn1-devel
 BuildRequires: libwayland-devel
 BuildRequires: libwayland-egl-devel
@@ -143,13 +144,19 @@ This package contains the documentation for %{name},
 %debug_package
 
 %prep
-%setup -q -D -T
-:<< _EOF
+%setup -q
+#-D -T
+#:<< _EOF
 %ifarch arm %{ix86}
 %patch2 -p1
 %endif
+%ifarch arm
+sed -i "s|ARM64|ARMv7|" Source/JavaScriptCore/CMakeLists.txt
+sed -i "s|WTF_CPU_ARM64|WTF_CPU_ARM|" CMakeLists.txt
+%endif
 
 %build
+#:<< _EOF
 #%ifnarch x86_64
 ## To workaround ar 4GB file limit see also:
 ## https://build.opensuse.org/package/view_file/openSUSE:Factory/webkit2gtk3/webkit2gtk3.spec
@@ -171,7 +178,11 @@ This package contains the documentation for %{name},
    -DPORT=GTK \
    -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
    -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \
+%ifarch arm
+   -DENABLE_GTKDOC=OFF \
+%else
    -DENABLE_GTKDOC=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" \
@@ -182,7 +193,13 @@ This package contains the documentation for %{name},
 
 #   -DENABLE_JIT=OFF \
 
-%make
+# Note: seen on arm ,2.30.4: in case of failure due to missing JavaScriptCore-4.gir:
+# make JavaScriptCore-4-gir
+
+%make \
+%ifarch arm aarch64
+-j1
+%endif
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -230,6 +247,7 @@ This package contains the documentation for %{name},
 %{_libdir}/pkgconfig/javascriptcoregtk-%{apiver}.pc
 %{_libdir}/pkgconfig/webkit2gtk-web-extension-%{apiver}.pc
 
+%ifnarch arm
 %files doc
 %defattr(-,root,root)
 %dir %{_datadir}/gtk-doc/html/jsc-glib-%{apiver}
@@ -238,8 +256,12 @@ This package contains the documentation for %{name},
 %{_datadir}/gtk-doc/html/webkit2gtk-%{apiver}/*
 %dir %{_datadir}/gtk-doc/html/webkitdomgtk-%{apiver}
 %{_datadir}/gtk-doc/html/webkitdomgtk-%{apiver}/*
+%endif
 
 %changelog
+* Sun Jan 17 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.30.4-1mamba
+- update to 2.30.4
+
 * Sat Nov 14 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.30.2-1mamba
 - update to 2.30.2