[packages/wpe-webkit] - updated to 2.44.4; dropped 1.1 and 2.0 APIs here (moved to gtk-webkit1.1.spec with 2.46+)

qboosh qboosh at pld-linux.org
Wed Oct 9 19:48:36 CEST 2024


commit 31491139cc25e9d119dcd155859a11bcde433005
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 9 19:33:34 2024 +0200

    - updated to 2.44.4; dropped 1.1 and 2.0 APIs here (moved to gtk-webkit1.1.spec with 2.46+)

 wpe-webkit.spec | 250 +++-----------------------------------------------------
 1 file changed, 10 insertions(+), 240 deletions(-)
---
diff --git a/wpe-webkit.spec b/wpe-webkit.spec
index 41fd4c0..3218f01 100644
--- a/wpe-webkit.spec
+++ b/wpe-webkit.spec
@@ -8,16 +8,8 @@
 # - ENABLE_WPE_PLATFORM? (BR: libinput-devel >= 1.19.0 wayland-devel >= 1.20 wayland-protocols >= 1.24 xorg-lib-libxkbcommon-devel >= 0.4.0)
 #
 # Conditional build:
-%bcond_without	libsoup2	# libWPEWebKit-1.0 (libsoup2 based) variant
-%bcond_without	libsoup3	# libWPEWebKit-1.1/2.0 (libsoup3 based) variants (HTTP/2 support)
-%bcond_without	api_1_1		# libWPEWebKit-1.1 (libsoup3 based) variant
-%bcond_without	api_2_0		# libWPEWebKit-2.0 (libsoup3 based) variant
 %bcond_with	lowmem		# try to reduce build memory usage by adjusting gcc gc
 #
-%if %{without libsoup3}
-%undefine	with_api_1_1
-%undefine	with_api_2_0
-%endif
 # it's not possible to build this with debuginfo on 32bit archs due to
 # memory constraints during linking
 %ifarch %{ix86} x32
@@ -26,13 +18,13 @@
 Summary:	Port of WebKit embeddable web component to WPE
 Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do WPE
 Name:		wpe-webkit
-# NOTE: 2.44.x is stable, 2.45.x devel
-Version:	2.44.1
+# keep 2.44.x here for API 1.0; for 2.46+ with API 1.1 & 2.0 see wpe-webkit1.1.spec
+Version:	2.44.4
 Release:	1
 License:	BSD-like
 Group:		X11/Libraries
-Source0:	https://wpewebkit.org/releases/wpewebkit-%{version}.tar.xz
-# Source0-md5:	51290d5cf1e032145f2a30971393b006
+Source0:	https://wpewebkit.org/releases/wpewebkit-%{version}.tar.lz
+# Source0-md5:	b1e1a6c27132df5b799a449453f7f8cd
 Patch0:		%{name}-x32.patch
 Patch2:		%{name}-driver-version-suffix.patch
 Patch3:		parallel-gir.patch
@@ -73,14 +65,14 @@ BuildRequires:	libjpeg-devel
 BuildRequires:	libjxl-devel >= 0.7.0
 BuildRequires:	libpng-devel
 BuildRequires:	libseccomp-devel
-%{?with_libsoup2:BuildRequires:	libsoup-devel >= 2.54}
-%{?with_libsoup3:BuildRequires:	libsoup3-devel >= 3.0}
+BuildRequires:	libsoup-devel >= 2.54
 BuildRequires:	libstdc++-devel >= 6:10.2
 BuildRequires:	libtasn1-devel
 BuildRequires:	libwebp-devel
 BuildRequires:	libwpe-devel >= 1.14.0
 BuildRequires:	libxml2-devel >= 1:2.8.0
 BuildRequires:	libxslt-devel >= 1.1.7
+BuildRequires:	lzip
 BuildRequires:	openjpeg2-devel >= 2.2.0
 BuildRequires:	perl-base >= 1:5.10.0
 BuildRequires:	pkgconfig
@@ -97,7 +89,6 @@ BuildRequires:	unifdef
 BuildRequires:	wpebackend-fdo-devel >= 1.9.0
 BuildRequires:	woff2-devel >= 1.0.2
 BuildRequires:	xdg-dbus-proxy
-BuildRequires:	xz
 BuildRequires:	zlib-devel
 Requires:	at-spi2-atk-libs >= 2.5.3
 Requires:	atk >= 1:2.16.0
@@ -164,138 +155,6 @@ API documentation for WebKit WPE port.
 %description apidocs -l pl.UTF-8
 Dokumentacja API portu WebKitu do WPE.
 
-%package -n wpe-webkit1.1
-Summary:	Port of WebKit embeddable web component to WPE with HTTP/2 support
-Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do WPE z obsługą HTTP/2
-Group:		X11/Libraries
-Requires:	at-spi2-atk-libs >= 2.5.3
-Requires:	atk >= 1:2.16.0
-Requires:	cairo >= 1.16.0
-Requires:	fontconfig-libs >= 2.13.0
-Requires:	freetype >= 1:2.9.0
-Requires:	glib2 >= 1:2.67.1
-Requires:	gstreamer >= 1.2.3
-Requires:	gstreamer-plugins-base >= 1.2.3
-Requires:	harfbuzz >= 1.4.2
-Requires:	libepoxy >= 1.5.4
-Requires:	libgcrypt >= 1.7.0
-Requires:	libjxl >= 0.7.0
-Requires:	libsoup3 >= 3.0.0
-Requires:	libwpe >= 1.14.0
-Requires:	libxml2 >= 1:2.8.0
-Requires:	libxslt >= 1.1.7
-Requires:	openjpeg2 >= 2.2.0
-Requires:	woff2 >= 1.0.2
-Requires:	wpebackend-fdo >= 1.9.0
-
-%description -n wpe-webkit1.1
-wpe-webkit1.1 is a port of the WebKit embeddable web component to WPE
-with HTTP/2 (libsoup 3) support.
-
-WPE (Webkit Port for Embedded) is the reference WebKit port for
-embedded and low-consumption computer devices.
-
-%description -n wpe-webkit1.1 -l pl.UTF-8
-wpe-webkit1.1 to port osadzalnego komponentu WWW WebKit do WPE z
-obsługą HTTP/2 (libsoup 3).
-
-WPE (Webkit Port for Embedded) to wzorcowy port biblioteki WebKit dla
-urządzeń komputerowych wbudowanych oraz o niskim poborze energii.
-
-%package -n wpe-webkit1.1-devel
-Summary:	Development files for WebKit for WPE with HTTP/2 support
-Summary(pl.UTF-8):	Pliki programistyczne komponentu WebKit dla WPE z obsługą HTTP/2
-Group:		X11/Development/Libraries
-Requires:	glib2-devel >= 1:2.67.1
-Requires:	libsoup3-devel >= 3.0.0
-Requires:	libstdc++-devel >= 6:10.2
-Requires:	libwpe-devel >= 1.14.0
-Requires:	wpe-webkit1.1 = %{version}-%{release}
-
-%description -n wpe-webkit1.1-devel
-Development files for WebKit for WPE with HTTP/2 support.
-
-%description -n wpe-webkit1.1-devel -l pl.UTF-8
-Pliki programistyczne komponentu WebKit dla WPE z obsługą HTTP/2.
-
-%package -n wpe-webkit1.1-apidocs
-Summary:	API documentation for WebKit WPE port with HTTP/2 support
-Summary(pl.UTF-8):	Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2
-Group:		Documentation
-BuildArch:	noarch
-
-%description -n wpe-webkit1.1-apidocs
-API documentation for WebKit WPE port with HTTP/2 support.
-
-%description -n wpe-webkit1.1-apidocs -l pl.UTF-8
-Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2.
-
-%package -n wpe-webkit2
-Summary:	Port of WebKit embeddable web component to WPE with HTTP/2 support
-Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do WPE z obsługą HTTP/2
-Group:		X11/Libraries
-Requires:	at-spi2-atk-libs >= 2.5.3
-Requires:	atk >= 1:2.16.0
-Requires:	cairo >= 1.16.0
-Requires:	fontconfig-libs >= 2.13.0
-Requires:	freetype >= 1:2.9.0
-Requires:	glib2 >= 1:2.70.0
-Requires:	gstreamer >= 1.2.3
-Requires:	gstreamer-plugins-base >= 1.2.3
-Requires:	harfbuzz >= 1.4.2
-Requires:	libepoxy >= 1.5.4
-Requires:	libgcrypt >= 1.7.0
-Requires:	libjxl >= 0.7.0
-Requires:	libsoup3 >= 3.0.0
-Requires:	libwpe >= 1.14.0
-Requires:	libxml2 >= 1:2.8.0
-Requires:	libxslt >= 1.1.7
-Requires:	openjpeg2 >= 2.2.0
-Requires:	woff2 >= 1.0.2
-Requires:	wpebackend-fdo >= 1.9.0
-
-%description -n wpe-webkit2
-wpe-webkit2 is a port of the WebKit embeddable web component to WPE
-with HTTP/2 (libsoup 3) support.
-
-WPE (Webkit Port for Embedded) is the reference WebKit port for
-embedded and low-consumption computer devices.
-
-%description -n wpe-webkit2 -l pl.UTF-8
-wpe-webkit2 to port osadzalnego komponentu WWW WebKit do WPE z
-obsługą HTTP/2 (libsoup 3).
-
-WPE (Webkit Port for Embedded) to wzorcowy port biblioteki WebKit dla
-urządzeń komputerowych wbudowanych oraz o niskim poborze energii.
-
-%package -n wpe-webkit2-devel
-Summary:	Development files for WebKit for WPE with HTTP/2 support
-Summary(pl.UTF-8):	Pliki programistyczne komponentu WebKit dla WPE z obsługą HTTP/2
-Group:		X11/Development/Libraries
-Requires:	glib2-devel >= 1:2.70.0
-Requires:	libsoup3-devel >= 3.0.0
-Requires:	libstdc++-devel >= 6:10.2
-Requires:	libwpe-devel >= 1.14.0
-Requires:	wpe-webkit2 = %{version}-%{release}
-
-%description -n wpe-webkit2-devel
-Development files for WebKit for WPE with HTTP/2 support.
-
-%description -n wpe-webkit2-devel -l pl.UTF-8
-Pliki programistyczne komponentu WebKit dla WPE z obsługą HTTP/2.
-
-%package -n wpe-webkit2-apidocs
-Summary:	API documentation for WebKit WPE port with HTTP/2 support
-Summary(pl.UTF-8):	Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2
-Group:		Documentation
-BuildArch:	noarch
-
-%description -n wpe-webkit2-apidocs
-API documentation for WebKit WPE port with HTTP/2 support.
-
-%description -n wpe-webkit2-apidocs -l pl.UTF-8
-Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2.
-
 %prep
 %setup -q -n wpewebkit-%{version}
 %patch0 -p1
@@ -306,8 +165,7 @@ Dokumentacja API portu WebKitu do WPE z obsługą HTTP/2.
 %if %{with lowmem}
 CXXFLAGS="%{rpmcxxflags} -DNDEBUG --param ggc-min-expand=20 --param ggc-min-heapsize=65536"
 %endif
-for kind in %{?with_libsoup2:soup2} %{?with_api_1_1:soup3-1.1} %{?with_api_2_0:soup3-2.0} ; do
-%cmake -B build-${kind} \
+%cmake -B build-soup2 \
 	-DENABLE_GEOLOCATION=ON \
 	-DENABLE_GTKDOC=ON \
 %ifarch x32
@@ -318,25 +176,21 @@ for kind in %{?with_libsoup2:soup2} %{?with_api_1_1:soup3-1.1} %{?with_api_2_0:s
 	-DENABLE_VIDEO=ON \
 	-DENABLE_WEB_AUDIO=ON \
 	-DENABLE_WEBGL=ON \
-	$([ "$kind" = "soup3-1.1" ] && echo -DENABLE_WPE_1_1_API=ON) \
 %ifarch %{ix86} %{x8664} x32
 	-DHAVE_SSE2_EXTENSIONS=ON \
 %endif
 	-DPORT=WPE \
 	-DSHOULD_INSTALL_JS_SHELL=ON \
 	-DUSE_LIBBACKTRACE=OFF \
-	$([ "$kind" = "soup2" ] && echo -DUSE_SOUP2=ON)
+	-DUSE_SOUP2=ON
 
-%{__make} -C build-${kind}
-done
+%{__make} -C build-soup2
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for kind in %{?with_libsoup2:soup2} %{?with_api_1_1:soup3-1.1} %{?with_api_2_0:soup3-2.0} ; do
-%{__make} -C build-${kind} install \
+%{__make} -C build-soup2 install \
 	DESTDIR=$RPM_BUILD_ROOT
-done
 
 install -d $RPM_BUILD_ROOT%{_gidocdir}
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/wpe-* $RPM_BUILD_ROOT%{_gidocdir}
@@ -347,13 +201,6 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post	-n wpe-webkit1.1 -p /sbin/ldconfig
-%postun	-n wpe-webkit1.1 -p /sbin/ldconfig
-
-%post	-n wpe-webkit2 -p /sbin/ldconfig
-%postun	-n wpe-webkit2 -p /sbin/ldconfig
-
-%if %{with libsoup2}
 %files
 %defattr(644,root,root,755)
 %doc NEWS
@@ -389,80 +236,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_gidocdir}/wpe-javascriptcore-1.0
 %{_gidocdir}/wpe-web-extension-1.0
 %{_gidocdir}/wpe-webkit-1.0
-%endif
-
-%if %{with api_1_1}
-%files -n wpe-webkit1.1
-%defattr(644,root,root,755)
-%doc NEWS
-%attr(755,root,root) %{_bindir}/WPEWebDriver-1.1
-%attr(755,root,root) %{_libdir}/libWPEWebKit-1.1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libWPEWebKit-1.1.so.0
-%{_libdir}/girepository-1.0/WPEJavaScriptCore-1.1.typelib
-%{_libdir}/girepository-1.0/WPEWebExtension-1.1.typelib
-%{_libdir}/girepository-1.0/WPEWebKit-1.1.typelib
-%if "%{_libexecdir}" != "%{_libdir}"
-%dir %{_libexecdir}/wpe-webkit-1.1
-%endif
-%attr(755,root,root) %{_libexecdir}/wpe-webkit-1.1/WPENetworkProcess
-%attr(755,root,root) %{_libexecdir}/wpe-webkit-1.1/WPEWebProcess
-%attr(755,root,root) %{_libexecdir}/wpe-webkit-1.1/jsc
-%dir %{_libdir}/wpe-webkit-1.1
-%attr(755,root,root) %{_libdir}/wpe-webkit-1.1/libWPEWebInspectorResources.so
-%dir %{_libdir}/wpe-webkit-1.1/injected-bundle
-%attr(755,root,root) %{_libdir}/wpe-webkit-1.1/injected-bundle/libWPEInjectedBundle.so
-
-%files -n wpe-webkit1.1-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libWPEWebKit-1.1.so
-%{_includedir}/wpe-webkit-1.1
-%{_datadir}/gir-1.0/WPEJavaScriptCore-1.1.gir
-%{_datadir}/gir-1.0/WPEWebExtension-1.1.gir
-%{_datadir}/gir-1.0/WPEWebKit-1.1.gir
-%{_pkgconfigdir}/wpe-web-extension-1.1.pc
-%{_pkgconfigdir}/wpe-webkit-1.1.pc
-
-%files -n wpe-webkit1.1-apidocs
-%defattr(644,root,root,755)
-%{_gidocdir}/wpe-javascriptcore-1.1
-%{_gidocdir}/wpe-web-extension-1.1
-%{_gidocdir}/wpe-webkit-1.1
-%endif
-
-%if %{with api_2_0}
-%files -n wpe-webkit2
-%defattr(644,root,root,755)
-%doc NEWS
-%attr(755,root,root) %{_bindir}/WPEWebDriver-2.0
-%attr(755,root,root) %{_libdir}/libWPEWebKit-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libWPEWebKit-2.0.so.1
-%{_libdir}/girepository-1.0/WPEJavaScriptCore-2.0.typelib
-%{_libdir}/girepository-1.0/WPEWebKit-2.0.typelib
-%{_libdir}/girepository-1.0/WPEWebProcessExtension-2.0.typelib
-%if "%{_libexecdir}" != "%{_libdir}"
-%dir %{_libexecdir}/wpe-webkit-2.0
-%endif
-%attr(755,root,root) %{_libexecdir}/wpe-webkit-2.0/WPENetworkProcess
-%attr(755,root,root) %{_libexecdir}/wpe-webkit-2.0/WPEWebProcess
-%attr(755,root,root) %{_libexecdir}/wpe-webkit-2.0/jsc
-%dir %{_libdir}/wpe-webkit-2.0
-%attr(755,root,root) %{_libdir}/wpe-webkit-2.0/libWPEWebInspectorResources.so
-%dir %{_libdir}/wpe-webkit-2.0/injected-bundle
-%attr(755,root,root) %{_libdir}/wpe-webkit-2.0/injected-bundle/libWPEInjectedBundle.so
-
-%files -n wpe-webkit2-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libWPEWebKit-2.0.so
-%{_includedir}/wpe-webkit-2.0
-%{_datadir}/gir-1.0/WPEJavaScriptCore-2.0.gir
-%{_datadir}/gir-1.0/WPEWebKit-2.0.gir
-%{_datadir}/gir-1.0/WPEWebProcessExtension-2.0.gir
-%{_pkgconfigdir}/wpe-web-process-extension-2.0.pc
-%{_pkgconfigdir}/wpe-webkit-2.0.pc
-
-%files -n wpe-webkit2-apidocs
-%defattr(644,root,root,755)
-%{_gidocdir}/wpe-javascriptcore-2.0
-%{_gidocdir}/wpe-web-process-extension-2.0
-%{_gidocdir}/wpe-webkit-2.0
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wpe-webkit.git/commitdiff/31491139cc25e9d119dcd155859a11bcde433005



More information about the pld-cvs-commit mailing list