From 2216c5cb56c236ce163bdc0d98e3ad0f97229886 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:12:37 +0100 Subject: [PATCH] rebuuilt with CMAKE_BUILD_TYPE=Release to get 4.0 apiver instead of 4.1 [release 2.34.1-2mamba;Thu Nov 18 2021] --- webkitgtk.spec | 115 ++++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 55 deletions(-) diff --git a/webkitgtk.spec b/webkitgtk.spec index 6d65250..c0564e6 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,27 +1,10 @@ -# --enable-debug turn on debugging [default=no] -# --enable-indexeddb enable the indexed database API [default=no] - -# --enable-input-speech enable the speech input API [default=no] broken - -# --enable-image-resizer enable image resizer [default=no] -# --enable-wml enable support for WML [default=no] -# --enable-directory-upload enable support for directory upload [default=no] -# --enable-file-system enable support for HTML5 FileSystem API [default=no] -# --enable-web-timing enable support for Web Timing [default=no] -# --enable-blob enable support for Blob [default=no] -# --enable-coverage enable code coverage support [default=no] -# --enable-opcode-stats Enable Opcode statistics (default: disabled) -# --enable-gtk-doc use gtk-doc to build documentation [[default=no]] -# --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] -# --with-gtk=2.0|3.0 the GTK+ version to use (default: 2.0) - %define majver %(echo %version | cut -d. -f 1-2) %define apiver 4.0 %define libname libwebkit2gtk Name: webkitgtk -Version: 2.32.0 -Release: 1mamba +Version: 2.34.1 +Release: 2mamba Summary: Port of WebKit embeddable web component to GTK+ Group: System/Libraries Vendor: openmamba @@ -35,11 +18,11 @@ Patch2: webkitgtk-2.30.2-x86-arm-jit-build-workaround.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 @@ -49,20 +32,24 @@ BuildRequires: libgcc BuildRequires: libgcrypt-devel BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel +BuildRequires: libglvnd-devel +BuildRequires: libgpg-error-devel BuildRequires: libgst-plugins-base-devel BuildRequires: libgstreamer-devel -BuildRequires: libgtk-devel +BuildRequires: libgtk3-devel BuildRequires: libharfbuzz-devel BuildRequires: libhyphen-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel +BuildRequires: liblcms2-devel +BuildRequires: libmanette-devel BuildRequires: libnotify-devel BuildRequires: libopenjpeg-devel BuildRequires: libpango-devel BuildRequires: libpng-devel BuildRequires: libseccomp-devel BuildRequires: libsecret-devel -BuildRequires: libsoup-devel +BuildRequires: libsoup2-devel BuildRequires: libsqlite-devel BuildRequires: libstdc++6-devel BuildRequires: libsystemd-devel @@ -141,9 +128,8 @@ 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 @@ -154,39 +140,50 @@ sed -i "s|WTF_CPU_ARM64|WTF_CPU_ARM|" CMakeLists.txt %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 -#EXTRA_CFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" -#EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" -#%endif +%ifnarch x86_64 +# To workaround ar 4GB file limit see also: +# https://build.opensuse.org/package/view_file/openSUSE:Factory/webkit2gtk3/webkit2gtk3.spec +EXTRA_CFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" +EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" +%endif %cmake -d build \ \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \ + -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \ %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} \ -%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" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -%ifarch arm - -DENABLE_SPELLCHECK=0 %endif +%ifarch arm + -DATOMICS_REQUIRE_LIBATOMIC=ON \ + -DENABLE_GTKDOC=OFF \ + -DENABLE_SPELLCHECK=0 \ +%else + -DENABLE_GTKDOC=ON \ +%endif + -DUSE_SOUP2=ON \ + -DENABLE_MINIBROWSER=ON + +#%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 +# -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" \ # -DENABLE_JIT=OFF \ @@ -196,13 +193,15 @@ sed -i "s|WTF_CPU_ARM64|WTF_CPU_ARM|" CMakeLists.txt %make JavaScriptCore-4-gir all \ %ifarch arm -j1 +%else +-j2 %endif %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -%find_lang WebKit2GTK-%{apiver} +%find_lang %{name} --all-name %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -217,7 +216,7 @@ sed -i "s|WTF_CPU_ARM64|WTF_CPU_ARM|" CMakeLists.txt %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas : -%files -n %{libname} -f WebKit2GTK-%{apiver}.lang +%files -n %{libname} -f %{name}.lang %defattr(-,root,root) %{_libdir}/libwebkit2gtk-%{apiver}.so.* %{_libdir}/libjavascriptcoregtk-%{apiver}.so.* @@ -247,15 +246,21 @@ sed -i "s|WTF_CPU_ARM64|WTF_CPU_ARM|" CMakeLists.txt %ifnarch arm %files doc %defattr(-,root,root) -%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}/* +%dir %{_datadir}/gtk-doc/html/jsc-glib-4.0 +%{_datadir}/gtk-doc/html/jsc-glib-4.0/* +%dir %{_datadir}/gtk-doc/html/webkit2gtk-4.0 +%{_datadir}/gtk-doc/html/webkit2gtk-4.0/* +%dir %{_datadir}/gtk-doc/html/webkitdomgtk-4.0 +%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/* %endif %changelog +* Thu Nov 18 2021 Silvan Calarco 2.34.1-2mamba +- rebuuilt with CMAKE_BUILD_TYPE=Release to get 4.0 apiver instead of 4.1 + +* Sun Oct 24 2021 Automatic Build System 2.34.1-1mamba +- automatic version update by autodist + * Mon Mar 29 2021 Automatic Build System 2.32.0-1mamba - automatic version update by autodist