Browse Source

Install KDE actions for KDE5

Fixes QubesOS/qubes-issues#3449
Marek Marczykowski-Górecki 6 năm trước cách đây
mục cha
commit
d4f6eb1f4a
3 tập tin đã thay đổi với 8 bổ sung0 xóa
  1. 3 0
      Makefile
  2. 1 0
      debian/qubes-core-agent.install
  3. 4 0
      rpm_spec/core-agent.spec

+ 3 - 0
Makefile

@@ -4,6 +4,7 @@ VERSION := $(shell cat version)
 
 DIST ?= fc18
 KDESERVICEDIR ?= /usr/share/kde4/services
+KDE5SERVICEDIR ?= /usr/share/kservices5/ServiceMenus/
 SBINDIR ?= /usr/sbin
 BINDIR ?= /usr/bin
 LIBDIR ?= /usr/lib
@@ -249,6 +250,8 @@ install-common: install-doc
 	install -m 0644 misc/qubes-suspend-module-blacklist $(DESTDIR)/etc/qubes-suspend-module-blacklist
 	install -d $(DESTDIR)/$(KDESERVICEDIR)
 	install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDESERVICEDIR)
+	install -d $(DESTDIR)/$(KDE5SERVICEDIR)
+	install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDE5SERVICEDIR)
 	install -d $(DESTDIR)/etc/qubes-rpc
 	install -m 0755 qubes-rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell} $(DESTDIR)/etc/qubes-rpc
 	install -m 0755 qubes-rpc/qubes.VMRootShell $(DESTDIR)/etc/qubes-rpc

+ 1 - 0
debian/qubes-core-agent.install

@@ -138,6 +138,7 @@ usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf
 usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf
 usr/share/glib-2.0/schemas/*
 usr/share/kde4/services/*.desktop
+usr/share/kservices5/ServiceMenus/*.desktop
 usr/share/man/man1/qvm-*
 usr/share/qubes/mime-override/globs
 usr/share/qubes/qubes-master-key.asc

+ 4 - 0
rpm_spec/core-agent.spec

@@ -279,6 +279,7 @@ Thunar support for Qubes VM tools
 %define _builddir %(pwd)
 
 %define kde_service_dir /usr/share/kde4/services
+%define kde5_service_dir /usr/share/kservices5/ServiceMenus
 
 %prep
 # we operate on the current directory, so no need to unpack anything
@@ -550,6 +551,9 @@ rm -f %{name}-%{version}
 %{kde_service_dir}/qvm-copy.desktop
 %{kde_service_dir}/qvm-move.desktop
 %{kde_service_dir}/qvm-dvm.desktop
+%{kde5_service_dir}/qvm-copy.desktop
+%{kde5_service_dir}/qvm-move.desktop
+%{kde5_service_dir}/qvm-dvm.desktop
 %config(noreplace) /etc/X11/xorg-preload-apps.conf
 /etc/fstab
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*