From 8916c5095f43d0795e85e62f89bed47ef0579845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 7 Aug 2025 11:49:46 +0200 Subject: [PATCH] Pull in notification proxy together with gui daemon Skip it on bookworm and Ubuntu, as it isn't available there. QubesOS/qubes-issues#889 --- debian/control | 1 + debian/rules | 9 +++++++++ rpm_spec/gui-daemon.spec.in | 1 + 3 files changed, 11 insertions(+) diff --git a/debian/control b/debian/control index dcdcd76c..6cdf79eb 100644 --- a/debian/control +++ b/debian/control @@ -35,6 +35,7 @@ Depends: qubes-core-qrexec (>= 4.1.5), python3-qubesimgconverter (>= 4.1.4), socat, + ${daemon:Depends}, ${shlibs:Depends}, ${misc:Depends} Recommends: diff --git a/debian/rules b/debian/rules index 872bcac4..1d484269 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DESTDIR=$(shell pwd)/debian/tmp export LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) +DIST := $(shell grep ^VERSION_CODENAME= /etc/os-release | cut -d = -f 2) + + %: dh $@ --with config-package @@ -29,6 +32,12 @@ override_dh_auto_install: override_dh_install: dh_install --fail-missing +override_db_gencontrol: + if [ "$(DIST)" != "bookworm" ] && [ "$(DIST)" != "jammy" ] && [ "$(DIST)" != "noble" ]; then \ + echo "daemon:Depends=qubes-notification-daemon" >> debian/qubes-gui-daemon.substvars; \ + fi + dh_gencontrol + # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) diff --git a/rpm_spec/gui-daemon.spec.in b/rpm_spec/gui-daemon.spec.in index adcf041d..81dc1c21 100644 --- a/rpm_spec/gui-daemon.spec.in +++ b/rpm_spec/gui-daemon.spec.in @@ -42,6 +42,7 @@ Requires: python%{python3_pkgversion}-qubesimgconverter >= 4.1.4 Requires: socat Requires: group(qubes) Requires: (%{name}-selinux if selinux-policy) +Requires: qubes-notification-daemon BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools