Package: webkit2gtk
Version: 2.34.2-1
Severity: minor
Dear maintainers,
The Ubuntu i386 archive is a partial one aimed at multiarch purpose and
doesn't include desktop services as the xdg portal. The attached patch
which is stacked on top of the recently submitted one to disable lto
removes the recommends on the portal on that distribution and architecture
Thanks for considering!
Sebastien Bacher
diff -Nru webkit2gtk-2.34.2/debian/changelog webkit2gtk-2.34.2/debian/changelog
--- webkit2gtk-2.34.2/debian/changelog 2021-11-25 18:51:31.000000000 +0100
+++ webkit2gtk-2.34.2/debian/changelog 2021-11-25 18:51:31.000000000 +0100
@@ -3,6 +3,8 @@
* debian/rules:
- explicitly disable lto since when it's on the build is failing,
that doesn't impact Debian by default but is an issue on Ubuntu
+ - don't Recommends xdg-desktop-portal-gtk on Ubuntu i386, it's a partial
+ architecture and the binary doesn't exist
-- Sebastien Bacher <seb...@debian.org> Thu, 25 Nov 2021 18:51:31 +0100
diff -Nru webkit2gtk-2.34.2/debian/rules webkit2gtk-2.34.2/debian/rules
--- webkit2gtk-2.34.2/debian/rules 2021-11-25 18:51:31.000000000 +0100
+++ webkit2gtk-2.34.2/debian/rules 2021-11-25 18:51:31.000000000 +0100
@@ -66,8 +66,13 @@
CPPFLAGS += -DNDEBUG -DG_DISABLE_CAST_CHECKS
endif
+# Don't Recommends xdg portals on Ubuntu i386 where it doesn't exist
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
+ EXTRA_CMAKE_ARGUMENTS += -DENABLE_BUBBLEWRAP_SANDBOX=ON
+ DH_GENCONTROL_ARGS += -Vbwrap:Depends="bubblewrap (>= 0.3.1), \
+ xdg-dbus-proxy"
# Disable the bubblewrap sandbox if libseccomp-dev is not available
-ifeq ($(shell pkg-config --exists libseccomp && echo yes),yes)
+else ifeq ($(shell pkg-config --exists libseccomp && echo yes),yes)
EXTRA_CMAKE_ARGUMENTS += -DENABLE_BUBBLEWRAP_SANDBOX=ON
DH_GENCONTROL_ARGS += -Vbwrap:Depends="bubblewrap (>= 0.3.1), \
xdg-dbus-proxy"
