Bug#839878: gnome-software FTCBFS: requests --enable-firmware without depending on libfwupd-dev

[Helmut Grohne]

Source: gnome-software
Version: 3.22.0-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

gnome-software fails to cross build from source to architectures other
than arm or x86 family. It lists libfwupd-dev in Build-Depends for them,
but when it comes to deciding whether to pass --enable-firmware, it
examines the build architecture. Thus cross building gnome-software e.g.
from amd64 to ppc64el, causes --enable-firmware to be passed but no
libfwupd-dev to be installed.

Unfortunately, I cannot verify whether this fixes the full cross build,
because meanwhile gnome-software's Build-Dependens have become
unsatisfiable for the purpose of cross building. I hope you can apply
the attached patch nonetheless. I'll retry building it once it becomes
feasible again.

Helmut
-------------- next part --------------
diff --minimal -Nru gnome-software-3.22.0/debian/changelog gnome-software-3.22.0/debian/changelog
--- gnome-software-3.22.0/debian/changelog	2016-09-22 20:48:42.000000000 +0200
+++ gnome-software-3.22.0/debian/changelog	2016-10-05 22:01:02.000000000 +0200
@@ -1,3 +1,10 @@
+gnome-software (3.22.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Deconfuse build vs. host. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 05 Oct 2016 22:00:41 +0200
+
 gnome-software (3.22.0-1) unstable; urgency=medium
 
   [ Jeremy Bicha ]
diff --minimal -Nru gnome-software-3.22.0/debian/rules gnome-software-3.22.0/debian/rules
--- gnome-software-3.22.0/debian/rules	2016-09-22 20:48:42.000000000 +0200
+++ gnome-software-3.22.0/debian/rules	2016-10-05 22:00:39.000000000 +0200
@@ -13,7 +13,7 @@
 	GS_CONFIGURE_FLAGS += --enable-limba --enable-flatpak
 
 	# Enable fwupd support on supported architectures
-	ifneq (,$(findstring $(DEB_BUILD_ARCH), amd64 arm64 armhf i386))
+	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
 		GS_CONFIGURE_FLAGS += --enable-firmware
 	endif
 endif