Bug#1000599: Don't require xdg-desktop-portal on Ubuntu i386

2021-12-25 Thread Alberto Garcia
On Tue, Dec 21, 2021 at 02:40:12PM +, Simon McVittie wrote:

> > 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
> 
> I don't think this change was correct. xdg-desktop-portal and its
> backends are Multi-Arch: foreign, which means that an amd64 x-d-p
> and x-d-p-gtk can satisfy the Recommends from an i386 Webkit, which
> can (and does!) make D-Bus calls to an amd64 xdg-desktop-portal
> (and, via that, to xdg-desktop-portal-gtk).

If you think I should revert this change please file a new bug,
thanks!

Berto



Bug#1000599: Don't require xdg-desktop-portal on Ubuntu i386

2021-12-21 Thread Simon McVittie
On Thu, 25 Nov 2021 at 19:11:28 +0100, Sebastien Bacher wrote:
> 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

I don't think this change was correct. xdg-desktop-portal and its
backends are Multi-Arch: foreign, which means that an amd64 x-d-p and
x-d-p-gtk can satisfy the Recommends from an i386 Webkit, which can (and
does!) make D-Bus calls to an amd64 xdg-desktop-portal (and, via that,
to xdg-desktop-portal-gtk).

The situation that is now broken is fairly obscure (have an i386 app that
depends on Webkit, don't have an amd64 app that depends on Webkit, and
don't have Flatpak or Snap either) but I think it would be better if the
Recommends remained in place.

https://bugs.debian.org/985914 is a genuine bug related to this, but it's
a bug that can only correctly be fixed by x-d-p-kde, not by other
components. x-d-p-wlr seems to have the equivalent bug, which I'll open now.

smcv



Bug#1000599: Don't require xdg-desktop-portal on Ubuntu i386

2021-11-25 Thread Alberto Garcia
Control: tags -1 pending

On Thu, Nov 25, 2021 at 07:11:28PM +0100, Sebastien Bacher wrote:
> 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, applied.

https://salsa.debian.org/webkit-team/webkit/-/commit/87f7e1bd2d3bd55d123b0b46100a8ac45b9e1b8e

Berto



Bug#1000599: Don't require xdg-desktop-portal on Ubuntu i386

2021-11-25 Thread Sebastien Bacher

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.0 +0100
+++ webkit2gtk-2.34.2/debian/changelog	2021-11-25 18:51:31.0 +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   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.0 +0100
+++ webkit2gtk-2.34.2/debian/rules	2021-11-25 18:51:31.0 +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"