diff --git a/webkitgtk.spec b/webkitgtk.spec index 5074587..2238d19 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,9 +1,14 @@ %define majver %(echo %version | cut -d. -f 1-2) +%if "%?with_apiver" == "" %define apiver 4.0 %define libname libwebkit2gtk +%else +%define apiver %with_apiver +%define libname libwebkit2gtk-%{with_apiver} +%endif Name: webkitgtk -Version: 2.36.7 +Version: 2.38.1 Release: 1mamba Summary: Port of WebKit embeddable web component to GTK+ Group: System/Libraries @@ -21,9 +26,7 @@ BuildRequires: glibc-devel BuildRequires: libX11-devel BuildRequires: libXcomposite-devel BuildRequires: libXdamage-devel -BuildRequires: libXrender-devel -BuildRequires: libXt-devel -BuildRequires: libatk-devel +BuildRequires: libat-spi2-core-devel BuildRequires: libatomic-devel BuildRequires: libcairo-devel BuildRequires: libenchant-devel @@ -34,7 +37,6 @@ 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: libgtk3-devel @@ -44,13 +46,12 @@ 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: libsoup2-devel +BuildRequires: libsoup-devel BuildRequires: libsqlite-devel BuildRequires: libstdc++6-devel BuildRequires: libsystemd-devel @@ -85,8 +86,10 @@ 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 +%if "%?with_apiver" == "" Provides: %{name}-jsc Obsoletes: %{name}-jsc < 2.32.0 +%endif %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. @@ -118,16 +121,19 @@ Obsoletes: Webkit < 2.32.0 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 the data files necessary for Web Inspector to work. -%package doc +%package -n %{libname}-doc Group: Documentation Summary: Documentation for %{name} -%description doc +%description -n %{libname}-doc 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 the documentation for %{name}, %debug_package +# Don't clean build at the end +%global __spec_rmbuild_cmd /bin/true + %prep %setup -q #-D -T @@ -147,6 +153,11 @@ sed -i "s|WTF_CPU_ARM64|WTF_CPU_ARM|" CMakeLists.txt # 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" +%else +# Produce minimal debug info: 4.3 GB of debug data makes the +# build too slow and is too much to package for debuginfod +EXTRA_CFLAGS="-g1" +EXTRA_CXXFLAGS="-g1" %endif %cmake -d build \ @@ -155,11 +166,11 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" -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" \ +%ifnarch x86_64 -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" \ @@ -171,7 +182,15 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" %else -DENABLE_GTKDOC=ON \ %endif +%if "%?with_apiver" == "" -DUSE_SOUP2=ON \ +%endif +%if "%?with_apiver" == "4.1" + -DUSE_SOUP2=OFF \ +%endif +%if "%?with_apiver" == "5.0" + -DUSE_GTK4=ON \ +%endif -DENABLE_MINIBROWSER=ON #%ifnarch x86_64 @@ -192,17 +211,15 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" # Note: seen on arm ,2.30.4: in case of failure due to missing JavaScriptCore-4.gir: # make JavaScriptCore-4-gir -%make JavaScriptCore-4-gir all \ -%ifarch arm --j1 -%else --j2 -%endif +%make -j2 %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build +%if "%?with_apiver" != "" +rm -f %{buildroot}%{_bindir}/WebKitWebDriver +%endif %find_lang %{name} --all-name %clean @@ -233,7 +250,9 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" %files -n %{libname}-devel %defattr(-,root,root) +%if "%?with_apiver" == "" %{_bindir}/WebKitWebDriver +%endif %dir %{_includedir}/webkitgtk-%{apiver} %{_includedir}/webkitgtk-%{apiver}/* %{_libdir}/libjavascriptcoregtk-%{apiver}.so @@ -245,18 +264,19 @@ EXTRA_CXXFLAGS="-g0 -Wl,--no-keep-memory -Wl,--no-map-whole-files" %{_libdir}/pkgconfig/javascriptcoregtk-%{apiver}.pc %{_libdir}/pkgconfig/webkit2gtk-web-extension-%{apiver}.pc -%ifnarch arm -%files doc +%files -n %{libname}-doc %defattr(-,root,root) -%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 +%dir %{_datadir}/gtk-doc/html/javascriptcoregtk-%{apiver} +%{_datadir}/gtk-doc/html/javascriptcoregtk-%{apiver}/* +%dir %{_datadir}/gtk-doc/html/webkit2gtk-%{apiver} +%{_datadir}/gtk-doc/html/webkit2gtk-%{apiver}/* +%dir %{_datadir}/gtk-doc/html/webkit2gtk-web-extension-%{apiver} +%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-%{apiver}/* %changelog +* Mon Oct 31 2022 Automatic Build System 2.38.1-1mamba +- automatic version update by autodist + * Fri Aug 26 2022 Automatic Build System 2.36.7-1mamba - automatic version update by autodist