From 0f06263cac029d0c27b02394e75d0c90a521ba9e Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Thu, 30 May 2024 15:58:18 +0200 Subject: [PATCH] Add missing dependencies Missing dependencies: - v4l-utils: necessary for webcam sharing; - lib(ayatana-)appindictor-gtk3: necessary for notifications icons; - libnotify-bin/libnotify: necessary for notify-send; - libnotify4/libnotify: necessary to register notifications; and - (desktop-)notification-daemon: necessary to serve notifications. Packaging: - Fix project URL; and - Do not build DomU files for Dom0. For: https://github.com/QubesOS/qubes-issues/issues/6426 Fixes: https://github.com/QubesOS/qubes-issues/issues/8453 Fixes: https://github.com/QubesOS/qubes-issues/issues/7991 Fixes: https://github.com/QubesOS/qubes-video-companion/issues/20 --- Makefile.builder | 2 +- debian/control | 3 +++ rpm_spec/qubes-video-companion-dom0.spec.in | 10 +++++++++- rpm_spec/qubes-video-companion.spec.in | 9 +++++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile.builder b/Makefile.builder index 83b2b63..594ac69 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1,7 +1,7 @@ RPM_SPEC_FILES := rpm_spec/qubes-video-companion.spec ifeq ($(PACKAGE_SET),dom0) -RPM_SPEC_FILES += rpm_spec/qubes-video-companion-dom0.spec +RPM_SPEC_FILES := rpm_spec/qubes-video-companion-dom0.spec endif DEBIAN_BUILD_DIRS := debian diff --git a/debian/control b/debian/control index ccd19bc..ec52dc4 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,9 @@ Depends: gir1.2-ayatanaappindicator3-0.1, python3, v4l-utils, acl, + libnotify-bin, + libnotify4, + notification-daemon, ${misc:Depends}, Suggests: v4l2loopback-dkms (>= 0.12.5-1), diff --git a/rpm_spec/qubes-video-companion-dom0.spec.in b/rpm_spec/qubes-video-companion-dom0.spec.in index 96a90e1..ec016b1 100644 --- a/rpm_spec/qubes-video-companion-dom0.spec.in +++ b/rpm_spec/qubes-video-companion-dom0.spec.in @@ -9,7 +9,7 @@ Release: @REL@%{?dist} Summary: Securely stream webcams and share screens across virtual machines License: MIT -URL: https://github.com/elliotkillick/qubes-video-companion +URL: https://github.com/QubesOS/qubes-video-companion Source0: %{vm_name}-%{version}.tar.gz BuildArch: noarch @@ -19,6 +19,14 @@ BuildRequires: python3-setuptools BuildRequires: python3-devel Requires: gstreamer1-plugins-good +Requires: v4l-utils +%if 0%{?fedora} <= 37 +Requires: libappindicator-gtk3 +%else +Requires: libayatana-appindicator-gtk3 +%endif +Requires: desktop-notification-daemon +Requires: libnotify %description Qubes Video Companion is a tool for securely streaming webcams and sharing diff --git a/rpm_spec/qubes-video-companion.spec.in b/rpm_spec/qubes-video-companion.spec.in index c7c925b..07ef5b5 100644 --- a/rpm_spec/qubes-video-companion.spec.in +++ b/rpm_spec/qubes-video-companion.spec.in @@ -7,7 +7,7 @@ Release: @REL@%{?dist} Summary: Securely stream webcams and share screens across virtual machines License: MIT -URL: https://github.com/elliotkillick/qubes-video-companion +URL: https://github.com/QubesOS/qubes-video-companion Source0: %{name}-%{version}.tar.gz BuildArch: noarch @@ -37,6 +37,9 @@ BuildArch: noarch Requires: gstreamer1-plugins-good Requires: python3 Requires: v4l-utils +Requires: libayatana-appindicator-gtk3 +Requires: desktop-notification-daemon +Requires: libnotify Requires: qubes-video-companion-license %description sender @@ -73,8 +76,10 @@ BuildArch: noarch BuildRequires: pandoc Requires: gstreamer1-plugins-good Requires: python3 -Requires: qubes-video-companion-license Requires: acl +Requires: desktop-notification-daemon +Requires: libnotify +Requires: qubes-video-companion-license %description receiver Qubes Video Companion is a tool for securely streaming webcams and sharing