[Pkg-utopia-maintainers] Bug#1126065: upower FTCBFS: fails running gtk-doc scanner

[Helmut Grohne]

Source: upower
Version: 1.91.0-1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

upower fails to cross build from source, because it fails running the
gtk-doc scanner. Fortunately, the documentation has been separated to an
arch:all -doc package, so running it actually is not necessary during a
cross build, which always is an arch-only build. I'm proposing a patch
to skip running it in arch-only builds in general. Note that demoting
the dependency requires an explicit dependency on docbook-xsl, which was
formerly implied. Once applying the patch, upower can be cross built.

Helmut
-------------- next part --------------
diff -Nru upower-1.91.0/debian/changelog upower-1.91.0/debian/changelog
--- upower-1.91.0/debian/changelog	2025-11-26 23:00:07.000000000 +0100
+++ upower-1.91.0/debian/changelog	2026-01-21 11:38:59.000000000 +0100
@@ -1,3 +1,10 @@
+upower (1.91.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Skip gtk-doc in arch-only builds. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 21 Jan 2026 11:38:59 +0100
+
 upower (1.91.0-1) unstable; urgency=medium
 
   * New upstream version 1.91.0
diff -Nru upower-1.91.0/debian/control upower-1.91.0/debian/control
--- upower-1.91.0/debian/control	2025-11-26 23:00:07.000000000 +0100
+++ upower-1.91.0/debian/control	2026-01-21 11:38:59.000000000 +0100
@@ -8,11 +8,11 @@
                debhelper (>= 13.11.6),
                dh-sequence-gir,
                dh-exec,
+               docbook-xsl,
                meson (>= 0.60.0),
                gobject-introspection (>= 1.80),
                gir1.2-gobject-2.0-dev,
                gir1.2-gio-2.0-dev,
-               gtk-doc-tools,
                gettext (>= 0.19.8),
                libglib2.0-dev (>= 2.76),
                libgudev-1.0-dev (>= 238) [linux-any],
@@ -22,7 +22,8 @@
                pkgconf,
                systemd-dev [linux-any],
                xsltproc,
-Build-Depends-Indep: libglib2.0-doc <!nodoc>,
+Build-Depends-Indep: gtk-doc-tools,
+                     libglib2.0-doc <!nodoc>,
 Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/utopia-team/upower.git
 Vcs-Browser: https://salsa.debian.org/utopia-team/upower/
diff -Nru upower-1.91.0/debian/rules upower-1.91.0/debian/rules
--- upower-1.91.0/debian/rules	2025-11-26 23:00:07.000000000 +0100
+++ upower-1.91.0/debian/rules	2026-01-21 11:38:57.000000000 +0100
@@ -19,7 +19,7 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-Dman=true \
-		-Dgtk-doc=true \
+		-Dgtk-doc=$(if $(filter upower-doc,$(shell dh_listpackages)),true,false) \
 		-Dintrospection=enabled \
 		-Dpolkit=enabled \
 		$(EXTRA_MESON_ARGS)