Source: gnome-settings-daemon
Version: 3.30.1.2-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
gnome-settings-daemon fails to cross build from source, because
gsd-power-enums-update cannot be run. The build system wants to run it,
but it is not marked as native. It's not installed anywhere, so marking
it native is feasible. The attached patch implements that and makes
gnome-settings-daemon cross buildable. Please consider applying it.
Helmut
diff --minimal -Nru gnome-settings-daemon-3.30.1.2/debian/changelog
gnome-settings-daemon-3.30.1.2/debian/changelog
--- gnome-settings-daemon-3.30.1.2/debian/changelog 2018-12-10
17:42:34.000000000 +0100
+++ gnome-settings-daemon-3.30.1.2/debian/changelog 2018-12-15
19:10:49.000000000 +0100
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.30.1.2-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: gsd-power-enums-update should be native.
+ + It therefore needs libglib2.0-dev:native.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 15 Dec 2018 19:10:49 +0100
+
gnome-settings-daemon (3.30.1.2-2) unstable; urgency=medium
[ Iain Lane ]
diff --minimal -Nru gnome-settings-daemon-3.30.1.2/debian/control
gnome-settings-daemon-3.30.1.2/debian/control
--- gnome-settings-daemon-3.30.1.2/debian/control 2018-12-10
17:42:34.000000000 +0100
+++ gnome-settings-daemon-3.30.1.2/debian/control 2018-12-15
19:10:31.000000000 +0100
@@ -21,6 +21,7 @@
libgeoclue-2-dev (>= 2.3.1),
libgeocode-glib-dev (>= 3.10.0),
libglib2.0-dev (>= 2.53.0),
+ libglib2.0-dev:native (>= 2.53.0),
libgnome-desktop-3-dev (>= 3.11.1),
libgtk-3-dev (>= 3.16),
libgudev-1.0-dev [linux-any],
diff --minimal -Nru gnome-settings-daemon-3.30.1.2/debian/patches/cross.patch
gnome-settings-daemon-3.30.1.2/debian/patches/cross.patch
--- gnome-settings-daemon-3.30.1.2/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ gnome-settings-daemon-3.30.1.2/debian/patches/cross.patch 2018-12-15
19:10:49.000000000 +0100
@@ -0,0 +1,14 @@
+--- gnome-settings-daemon-3.30.1.2.orig/plugins/power/meson.build
++++ gnome-settings-daemon-3.30.1.2/plugins/power/meson.build
+@@ -54,9 +54,8 @@
+ gsd_power_enums_update = executable(
+ 'gsd-power-enums-update',
+ sources,
+- include_directories: top_inc,
+- dependencies: deps,
+- c_args: cflags
++ dependencies: [dependency('gobject-2.0', native: true)],
++ native: true
+ )
+
+ if enable_gudev
diff --minimal -Nru gnome-settings-daemon-3.30.1.2/debian/patches/series
gnome-settings-daemon-3.30.1.2/debian/patches/series
--- gnome-settings-daemon-3.30.1.2/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ gnome-settings-daemon-3.30.1.2/debian/patches/series 2018-12-15
19:10:43.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
