From 0dfd135d0224e08f057b24faef2771be8722186b Mon Sep 17 00:00:00 2001 From: Zaoqi Date: Wed, 5 Feb 2020 13:18:43 +0800 Subject: [PATCH 1/2] fix https://github.com/QubesOS/qubes-issues/issues/5619 --- archlinux/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index ec77329..6b0155a 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -10,7 +10,7 @@ arch=("x86_64") url="http://qubes-os.org/" license=('GPL') groups=() -makedepends=(gcc make pkg-config "qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python2 python3 lsb-release pandoc) +makedepends=(gcc make pkg-config "qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python2 python lsb-release pandoc) checkdepends=() provides=() conflicts=() @@ -61,10 +61,10 @@ build() { # * core systemd services and drop-ins # * basic network functionality (setting IP address, DNS, default gateway) package_qubes-vm-core() { - depends=("qubes-vm-utils>=3.1.3" python2 python3-xdg ethtool ntp net-tools + depends=("qubes-vm-utils>=3.1.3" python2 python-xdg ethtool ntp net-tools gnome-packagekit imagemagick fakeroot notification-daemon dconf - zenity qubes-libvchan "qubes-db-vm>=3.2.1" haveged python3-gobject - python3-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg + zenity qubes-libvchan "qubes-db-vm>=3.2.1" haveged python-gobject + python-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg socat ) optdepends=(gnome-keyring gnome-settings-daemon python2-nautilus gpk-update-viewer qubes-vm-networking qubes-vm-keyring) @@ -126,7 +126,7 @@ EOF # package_qubes-vm-networking() { pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM" - depends=(qubes-vm-core "qubes-vm-utils>=3.1.3" python3 ethtool net-tools + depends=(qubes-vm-core "qubes-vm-utils>=3.1.3" python ethtool net-tools "qubes-db-vm>=3.2.1" networkmanager iptables tinyproxy nftables ) install=PKGBUILD-networking.install From 7dea32379cdf803ab523e59f91d4a5c7b0d38ccf Mon Sep 17 00:00:00 2001 From: Zaoqi Date: Thu, 6 Feb 2020 14:05:07 +0800 Subject: [PATCH 2/2] archlinux/PKGBUILD: remove python2 --- archlinux/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 6b0155a..824e3f6 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -10,7 +10,7 @@ arch=("x86_64") url="http://qubes-os.org/" license=('GPL') groups=() -makedepends=(gcc make pkg-config "qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python2 python lsb-release pandoc) +makedepends=(gcc make pkg-config "qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python lsb-release pandoc) checkdepends=() provides=() conflicts=() @@ -61,13 +61,13 @@ build() { # * core systemd services and drop-ins # * basic network functionality (setting IP address, DNS, default gateway) package_qubes-vm-core() { - depends=("qubes-vm-utils>=3.1.3" python2 python-xdg ethtool ntp net-tools + depends=("qubes-vm-utils>=3.1.3" python-xdg ethtool ntp net-tools gnome-packagekit imagemagick fakeroot notification-daemon dconf zenity qubes-libvchan "qubes-db-vm>=3.2.1" haveged python-gobject python-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg socat ) - optdepends=(gnome-keyring gnome-settings-daemon python2-nautilus gpk-update-viewer qubes-vm-networking qubes-vm-keyring) + optdepends=(gnome-keyring gnome-settings-daemon python-nautilus gpk-update-viewer qubes-vm-networking qubes-vm-keyring) install=PKGBUILD.install # Note: Archlinux removed use of directory such as /sbin /bin /usr/sbin (https://mailman.archlinux.org/pipermail/arch-dev-public/2012-March/022625.html)