[Pkg-utopia-maintainers] Bug#1089122: udisks2 FTCBFS: gtk-doc scanner fails

Helmut Grohne helmut at subdivi.de
Thu Dec 5 21:25:45 GMT 2024


Source: udisks2
Version: 2.10.1-11
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

udisks2 fails to cross build from source, because running the gtk-doc
scanner fails. This is a common problem and the solution usually is not
to run it as the documentation usually resides in an arch:all package
and we actually don't have to generate it during an arch-only build.
This is mostly implemented in udisks2 via the nodoc build profile
already and a cross build specifying nodoc actually works. So rather
than making this conditional on the nodoc build profile, I recommend
skipping gtk-doc in arch-only builds. As a result a nodoc build simply
becomes an arch-only build and the build profile becomes redundant. The
attached patch takes the liberty to simply discard the now unused
profile. I hope you like it, but if you prefer keeping the profile,
that's fine as well.

Helmut
-------------- next part --------------
diff --minimal -Nru udisks2-2.10.1/debian/changelog udisks2-2.10.1/debian/changelog
--- udisks2-2.10.1/debian/changelog	2024-09-27 01:26:14.000000000 +0200
+++ udisks2-2.10.1/debian/changelog	2024-12-05 22:05:16.000000000 +0100
@@ -1,3 +1,10 @@
+udisks2 (2.10.1-11.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Skip gtk-doc in arch-only build. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 05 Dec 2024 22:05:16 +0100
+
 udisks2 (2.10.1-11) unstable; urgency=medium
 
   * Replace dependency on dbus with default-dbus-system-bus | dbus-system-bus.
diff --minimal -Nru udisks2-2.10.1/debian/control udisks2-2.10.1/debian/control
--- udisks2-2.10.1/debian/control	2024-09-27 01:26:14.000000000 +0200
+++ udisks2-2.10.1/debian/control	2024-12-05 22:05:16.000000000 +0100
@@ -36,8 +36,8 @@
                polkitd,
                systemd-dev,
                xsltproc,
-Build-Depends-Indep: libglib2.0-doc <!nodoc>,
-                     policykit-1-doc <!nodoc>,
+Build-Depends-Indep: libglib2.0-doc,
+                     policykit-1-doc,
 Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/utopia-team/udisks2.git
@@ -130,7 +130,6 @@
 Suggests: devhelp,
 Recommends: libglib2.0-doc,
             policykit-1-doc,
-Build-Profiles: <!nodoc>
 Description: udisks2 documentation
  The udisks daemon serves as an interface to system block devices,
  implemented via D-Bus. It handles operations such as querying, mounting,
diff --minimal -Nru udisks2-2.10.1/debian/rules udisks2-2.10.1/debian/rules
--- udisks2-2.10.1/debian/rules	2024-09-27 01:26:14.000000000 +0200
+++ udisks2-2.10.1/debian/rules	2024-12-05 22:05:16.000000000 +0100
@@ -11,7 +11,7 @@
 	dh_auto_configure -- \
 		--enable-btrfs \
 		--enable-lvm2 \
-		--enable-gtk-doc=$(if $(filter nodoc,$(DEB_BUILD_PROFILES)),no,yes) \
+		--enable-gtk-doc=$(if $(filter udisks2-doc,$(shell dh_listpackages)),yes,no) \
 		--enable-fhs-media \
 		--with-udevdir=/usr/lib/udev \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system


More information about the Pkg-utopia-maintainers mailing list