Source: cinnamon-settings-daemon
Version: 5.0.4-2
Severity: important
Tags: patch
Hello,
cinnamon-settings-daemon currently FTBFS on non-linux architectures with
the following error:
../meson.build:57:0: ERROR: Dependency "gudev-1.0" not found, tried pkgconfig
The attached patch fixes this.
In addintion I also disabled polkit on non-linux architectures as it's
not doing anything (polkit daemon is not built on these, only the libs)
I also explicitly disabled wacom and logind support for consistency
And dropped a useless dependency on cinnamon-settings-daemon-dev
Could you please apply that patch?
Kind regards,
Laurent Bigonville
-- System Information:
Debian Release: bookworm/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1,
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 5.15.0-2-amd64 (SMP w/8 CPU threads)
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8),
LANGUAGE=fr_BE:fr
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: SELinux: enabled - Mode: Permissive - Policy name: refpolicy
diff -Nru cinnamon-settings-daemon-5.0.4/debian/changelog
cinnamon-settings-daemon-5.0.4/debian/changelog
--- cinnamon-settings-daemon-5.0.4/debian/changelog 2021-09-29
13:20:03.000000000 +0200
+++ cinnamon-settings-daemon-5.0.4/debian/changelog 2021-12-13
09:57:32.000000000 +0100
@@ -1,3 +1,14 @@
+cinnamon-settings-daemon (5.0.4-3) UNRELEASED; urgency=medium
+
+ * Explicitly disable gudev on non-linux architectures, this fixes the FTBFS
+ * Disable polkit support on non-linux architectures, polkit is not
+ functional on these, only the libraries are built there
+ * Explicitly disable wacom and logind support on non-linux architectures
+ * Drop the libdbus-glib-1-dev dependency in cinnamon-settings-daemon-dev,
+ that looks useless looking at the pkg-config file
+
+ -- Laurent Bigonville <bi...@debian.org> Mon, 13 Dec 2021 09:57:32 +0100
+
cinnamon-settings-daemon (5.0.4-2) unstable; urgency=medium
* Release to unstable.
diff -Nru cinnamon-settings-daemon-5.0.4/debian/control
cinnamon-settings-daemon-5.0.4/debian/control
--- cinnamon-settings-daemon-5.0.4/debian/control 2021-09-29
13:20:03.000000000 +0200
+++ cinnamon-settings-daemon-5.0.4/debian/control 2021-12-13
09:51:44.000000000 +0100
@@ -25,7 +25,7 @@
liblcms2-dev,
libnotify-dev (>= 0.7.0),
libnss3-dev,
- libpolkit-gobject-1-dev,
+ libpolkit-gobject-1-dev [linux-any],
libpulse-dev (>= 0.9.16),
librsvg2-dev [!s390x !hurd-any !kfreebsd-any],
libsystemd-dev [linux-any],
@@ -81,7 +81,6 @@
Package: cinnamon-settings-daemon-dev
Architecture: any
Depends:
- libdbus-glib-1-dev (>= 0.74),
libglib2.0-dev (>= 2.26.0),
${misc:Depends},
${shlibs:Depends},
diff -Nru cinnamon-settings-daemon-5.0.4/debian/rules
cinnamon-settings-daemon-5.0.4/debian/rules
--- cinnamon-settings-daemon-5.0.4/debian/rules 2021-09-29 13:20:03.000000000
+0200
+++ cinnamon-settings-daemon-5.0.4/debian/rules 2021-12-13 09:47:54.000000000
+0100
@@ -5,12 +5,17 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+CONFFLAGS = -Duse_gudev=disabled -Duse_polkit=disabled -Duse_logind=disabled
-Duse_wacom=disabled
+endif
+
%:
dh $@
override_dh_auto_configure:
dh_auto_configure -- \
- --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-settings-daemon
+ --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-settings-daemon \
+ $(CONFFLAGS)
override_dh_makeshlibs:
# Disabled, there are no shared libraries, but some plugins that cause
this
