Bug#941632: gnome-panel FTCBFS: gtk-doc does not work during cross

Helmut Grohne helmut at subdivi.de
Thu Oct 3 07:52:24 BST 2019


Source: gnome-panel
Version: 3.34.0-2
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

gnome-panel fails to cross build from source, because it runs gtk-doc
and this is not compatible with cross compilation at all. Fortunately,
gnome-panel has split out its documentation to an arch:all package, so
all we need to do here is skip gtk-doc for arch-only builds. Please
consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru gnome-panel-3.34.0/debian/changelog gnome-panel-3.34.0/debian/changelog
--- gnome-panel-3.34.0/debian/changelog	2019-10-01 11:02:08.000000000 +0200
+++ gnome-panel-3.34.0/debian/changelog	2019-10-03 08:44:37.000000000 +0200
@@ -1,3 +1,10 @@
+gnome-panel (3.34.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: --disable-gtk-doc on arch-only builds. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 03 Oct 2019 08:44:37 +0200
+
 gnome-panel (3.34.0-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.4.1, no changes needed.
diff --minimal -Nru gnome-panel-3.34.0/debian/control gnome-panel-3.34.0/debian/control
--- gnome-panel-3.34.0/debian/control	2019-10-01 11:02:08.000000000 +0200
+++ gnome-panel-3.34.0/debian/control	2019-10-03 08:43:12.000000000 +0200
@@ -10,7 +10,6 @@
 Build-Depends: debhelper (>= 11),
                evolution-data-server-dev (>= 3.5.3),
                gnome-pkg-tools (>= 0.17),
-               gtk-doc-tools (>= 1.25),
                libcairo2-dev (>= 1.10.0),
                libdconf-dev (>= 0.13.4),
                libecal2.0-dev (>= 3.33.2),
@@ -32,7 +31,7 @@
                libxrandr-dev (>= 2:1.3.0),
                pkg-config (>= 0.9.0),
                yelp-tools
-Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
+Build-Depends-Indep: gtk-doc-tools (>= 1.25), libglib2.0-doc, libgtk-3-doc
 Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-panel
 Vcs-Git: https://salsa.debian.org/gnome-team/gnome-panel.git
diff --minimal -Nru gnome-panel-3.34.0/debian/rules gnome-panel-3.34.0/debian/rules
--- gnome-panel-3.34.0/debian/rules	2019-10-01 11:02:08.000000000 +0200
+++ gnome-panel-3.34.0/debian/rules	2019-10-03 08:44:34.000000000 +0200
@@ -3,11 +3,13 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
+DOPACKAGES=$(shell dh_listpackages)
+
 %:
 	dh $@ --with gnome
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir=$$\{prefix}/lib --enable-gtk-doc --disable-Werror
+	dh_auto_configure -- --libdir=$$\{prefix}/lib --$(if $(filter libpanel-applet-doc,$(DOPACKAGES)),en,dis)able-gtk-doc --disable-Werror
 
 override_dh_install:
 	find debian/tmp -name '*.la' -print -delete


More information about the pkg-gnome-maintainers mailing list