x86 build fixed, restored gtk-doc, build MiniBrowser [release 2.28.0-2mamba;Fri Mar 27 2020]

webkitgtk.spec

@@ -20,8 +20,8 @@
 %define        libname libwebkit2gtk
 
 Name:          webkitgtk
-Version:       2.22.2
+Version:       2.28.0
-Release:       1mamba
+Release:       2mamba
 Summary:       Port of WebKit embeddable web component to GTK+
 Group:         System/Libraries
 Vendor:        openmamba
@@ -34,12 +34,11 @@ Patch1:        webkitgtk-2.16.6-arm-sync_add_and_fetch_8_duplicate.patch
 License:       BSD, LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: ldconfig
 BuildRequires: libGL-devel
 BuildRequires: libX11-devel
 BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXt-devel
 BuildRequires: libatk-devel
 BuildRequires: libcairo-devel
 BuildRequires: libenchant-devel
@@ -52,14 +51,15 @@ BuildRequires: libglib-devel
 BuildRequires: libgst-plugins-base-devel
 BuildRequires: libgstreamer-devel
 BuildRequires: libgtk-devel
-BuildRequires: libgtk2-devel
 BuildRequires: libharfbuzz-devel
 BuildRequires: libhyphen-devel
 BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libnotify-devel
+BuildRequires: libopenjpeg-devel
 BuildRequires: libpango-devel
 BuildRequires: libpng-devel
+BuildRequires: libseccomp-devel
 BuildRequires: libsecret-devel
 BuildRequires: libsoup-devel
 BuildRequires: libsqlite-devel
@@ -69,6 +69,8 @@ BuildRequires: libwayland-devel
 BuildRequires: libwayland-egl-devel
 BuildRequires: libwebp-devel
 BuildRequires: libwoff2-devel
+BuildRequires: libwpe-devel
+BuildRequires: libwpebackend-fdo-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: libz-devel
@@ -83,6 +85,8 @@ BuildRequires: gperf
 BuildRequires: icu
 BuildRequires: libtool
 BuildRequires: perl
+BuildRequires: bubblewrap
+BuildRequires: xdg-dbus-proxy
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -91,6 +95,8 @@ WebKit/GTK+ is the new GTK+ port of the WebKit, an open-source web content engin
 %package -n %{libname}
 Summary:       Port of WebKit embeddable web component to GTK+
 Group:         System/Libraries
+Provides:      %{name}-jsc
+Obsoletes:     %{name}-jsc
 
 %description -n %{libname}
 WebKit/GTK+ is the new GTK+ port of the WebKit, an open-source web content engine that powers numerous applications such as web browsers, email clients, feed readers, web and text editors, and a whole lot more.
@@ -105,14 +111,14 @@ WebKit/GTK+ is the new GTK+ port of the WebKit, an open-source web content engin
 
 This package contains libraries and header files need for development.
 
-%package jsc
+#%package jsc
-Group:         Applications/Networking
+#Group:         Applications/Networking
-Summary:       JavaScriptCore shell for WebKit GTK+
+#Summary:       JavaScriptCore shell for WebKit GTK+
-Requires:      %{libname} = %{?epoch:%epoch:}%{version}-%{release}
+#Requires:      %{libname} = %{?epoch:%epoch:}%{version}-%{release}
-
+#
-%description jsc
+#%description jsc
-WebKit/GTK+ is the new GTK+ port of the WebKit, an open-source web content engine that powers numerous applications such as web browsers, email clients, feed readers, web and text editors, and a whole lot more.
+#WebKit/GTK+ is the new GTK+ port of the WebKit, an open-source web content engine that powers numerous applications such as web browsers, email clients, feed readers, web and text editors, and a whole lot more.
-This package contains WebKit's JavaScript engine. It allows you to interact with the JavaScript engine directly.
+#This package contains WebKit's JavaScript engine. It allows you to interact with the JavaScript engine directly.
 
 %package webinspector
 Group:         Applications/Networking
@@ -133,67 +139,50 @@ WebKit/GTK+ is the new GTK+ port of the WebKit, an open-source web content engin
 
 This package contains the documentation for %{name},
 
-%prep
+%debug_package
-%setup -q -D -T
 
-#%patch0 -p0
+%prep
-#% ifarch arm
+%setup -q
-#% patch1 -p1
+#-D -T
-#%endif
 
 %build
-#./autogen.sh
+#:<< _EOF
-
-#%ifarch arm %{ix86}
-## Use linker flags to reduce memory consumption on low-mem architectures
-#EXTRA_CFLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-#%endif
-
 %ifnarch x86_64
-# To workaround ar 4GB file limit:
+# To workaround ar 4GB file limit see also:
-# https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/1043507
+# https://build.opensuse.org/package/view_file/openSUSE:Factory/webkit2gtk3/webkit2gtk3.spec
-EXTRA_CFLAGS="-g0 -Wl,--no-keep-memory"
+EXTRA_CFLAGS="-g0 -Wl,--no-keep-memory -fuse-ld=gold -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped"
-EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory"
+EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -fuse-ld=gold -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped"
 %endif
 
-CFLAGS="%{optflags} -DNDEBUG -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY $EXTRA_CFLAGS"
-CXXFLAGS="%{optflags} -DNDEBUG $EXTRA_CXXFLAGS"
-
 %cmake -d build \
+\
+%ifnarch x86_64
+   -DCMAKE_C_FLAGS="$EXTRA_CFLAGS" \
+   -DCMAKE_CXX_FLAGS="$EXTRA_CXXFLAGS" \
+   -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O2 -g1" \
+   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -g1" \
+%else
+   -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O2 -g1" \
+   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -g1" \
+%endif
    -DPORT=GTK \
    -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
    -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \
+   -DENABLE_GTKDOC=ON \
+   -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" \
 %ifarch arm
    -DENABLE_JIT=OFF \
    -DENABLE_SPELLCHECK=0
 %endif
 
-### https://bugs.webkit.org/show_bug.cgi?id=34846
+%make
-## V=1 seems a workaround for make error 'argument list too long'
-%make || %make -j1
-#V=1 || make V=1
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall -C build
-#%ifarch arm %{ix86}
-## Use linker flags to reduce memory consumption on low-mem architectures
-#EXTRA_CFLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-#%endif
-
-#CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY $EXTRA_CFLAGS"
-
-#% makeinstall V=1
-
-#mkdir -p %{buildroot}%{_bindir}/
-#install -m 755 Programs/GtkLauncher %{buildroot}%{_bindir}/GtkLauncher
-
-#for doc in WebKit/LICENSE WebKit/gtk/po/README WebKit/gtk/NEWS Source/WebCore/icu/LICENSE Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2 \
-#	   Source/WebCore/LICENSE-LGPL-2.1 Source/JavaScriptCore/COPYING.LIB Source/JavaScriptCore/THANKS Source/JavaScriptCore/AUTHORS \
-#	   Source/JavaScriptCore/icu/README Source/JavaScriptCore/icu/LICENSE Source/JavaScriptCore/pcre/COPYING Source/JavaScriptCore/pcre/AUTHORS ;do
-#  mkdir -p %{buildroot}%{_docdir}/webkitgtk-%{version}
-#  cp -p $doc %{buildroot}%{_docdir}/webkitgtk-%{version}/$(echo $doc | sed -e 's!/!.!g')
-#done
 
 %find_lang WebKit2GTK-%{apiver}
 
@@ -218,6 +207,8 @@ CXXFLAGS="%{optflags} -DNDEBUG $EXTRA_CXXFLAGS"
 %{_libdir}/girepository-1.0/WebKit2-%{apiver}.typelib
 %{_libdir}/girepository-1.0/WebKit2WebExtension-%{apiver}.typelib
 %{_libdir}/webkit2gtk-%{apiver}/injected-bundle/libwebkit2gtkinjectedbundle.so
+%{_libexecdir}/webkit2gtk-%{apiver}/MiniBrowser
+%{_libexecdir}/webkit2gtk-%{apiver}/jsc
 %dir %{_libexecdir}/webkit2gtk-%{apiver}
 %{_libexecdir}/webkit2gtk-%{apiver}/WebKit*
 
@@ -235,20 +226,25 @@ CXXFLAGS="%{optflags} -DNDEBUG $EXTRA_CXXFLAGS"
 %{_libdir}/pkgconfig/javascriptcoregtk-%{apiver}.pc
 %{_libdir}/pkgconfig/webkit2gtk-web-extension-%{apiver}.pc
 
-#%files doc
+%files doc
-#%defattr(-,root,root)
-#%dir %{_datadir}/gtk-doc/html/webkitgtk
-#%{_datadir}/gtk-doc/html/webkitgtk/*
-#%dir %{_datadir}/gtk-doc/html/webkit2gtk
-#%{_datadir}/gtk-doc/html/webkit2gtk/*
-#%dir %{_datadir}/gtk-doc/html/webkitdomgtk
-#%{_datadir}/gtk-doc/html/webkitdomgtk/*
-
-%files jsc
 %defattr(-,root,root)
-%{_libexecdir}/webkit2gtk-%{apiver}/jsc
+%dir %{_datadir}/gtk-doc/html/jsc-glib-%{apiver}
+%{_datadir}/gtk-doc/html/jsc-glib-%{apiver}/*
+%dir %{_datadir}/gtk-doc/html/webkit2gtk-%{apiver}
+%{_datadir}/gtk-doc/html/webkit2gtk-%{apiver}/*
+%dir %{_datadir}/gtk-doc/html/webkitdomgtk-%{apiver}
+%{_datadir}/gtk-doc/html/webkitdomgtk-%{apiver}/*
 
 %changelog
+* Fri Mar 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.28.0-2mamba
+- x86 build fixed, restored gtk-doc, build MiniBrowser
+
+* Fri Mar 13 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.28.0-1mamba
+- update to 2.28.0
+
+* Fri Dec 28 2018 Automatic Build System <autodist@mambasoft.it> 2.22.5-1mamba
+- automatic version update by autodist
+
 * Fri Sep 28 2018 Automatic Build System <autodist@mambasoft.it> 2.22.2-1mamba
 - automatic version update by autodist