diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55e8a44..89acaae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,7 @@ include: -- file: /r4.1/gitlab-base.yml +- file: /r4.3/gitlab-base.yml project: QubesOS/qubes-continuous-integration -- file: /r4.1/gitlab-dom0.yml +- file: /r4.3/gitlab-host.yml project: QubesOS/qubes-continuous-integration -- file: /r4.1/gitlab-vm.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.2/gitlab-base.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.2/gitlab-host.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.2/gitlab-vm.yml +- file: /r4.3/gitlab-vm.yml project: QubesOS/qubes-continuous-integration diff --git a/Makefile b/Makefile index e2c416f..756c8aa 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,8 @@ install: install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kicker.js.qubes install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickerdash.js.qubes install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js.qubes + install -D -m 0644 config/10-gui-daemon-shmoverride.conf \ + $(DESTDIR)/usr/lib/systemd/user/plasma-kwin_wayland.service.d/10-gui-daemon-shmoverride.conf clean: rm -rf debian/changelog.* diff --git a/config/10-gui-daemon-shmoverride.conf b/config/10-gui-daemon-shmoverride.conf new file mode 100644 index 0000000..db25d00 --- /dev/null +++ b/config/10-gui-daemon-shmoverride.conf @@ -0,0 +1,3 @@ +# Adjust PATH to use Xwayland wrapper +[Service] +Environment=PATH=/usr/libexec/qubes/wrappers:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin diff --git a/kde-panel-layout.patch b/kde-panel-layout.patch index 6513e31..94e3582 100644 --- a/kde-panel-layout.patch +++ b/kde-panel-layout.patch @@ -1,17 +1,15 @@ --- /usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js.orig 2023-08-03 01:11:03.210000000 +0200 +++ /usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js 2023-08-03 01:11:33.814000000 +0200 -@@ -21,9 +21,11 @@ +@@ -21,7 +21,11 @@ } } --var kickoff = panel.addWidget("org.kde.plasma.kickoff") --kickoff.currentConfigGroup = ["Shortcuts"] --kickoff.writeConfig("global", "Alt+F1") +-panel.addWidget("org.kde.plasma.kickoff") +var qubesMenu = panel.addWidget('org.kde.plasma.quicklaunch') +qubesMenu.currentConfigGroup = ['General'] +qubesMenu.writeConfig('launcherUrls', ['file:///usr/share/applications/open-qubes-app-menu.desktop']) +qubesMenu.currentConfigGroup = ["Shortcuts"] +qubesMenu.writeConfig("global", "Alt+F1") - //panel.addWidget("org.kde.plasma.showActivityManager") panel.addWidget("org.kde.plasma.pager") + panel.addWidget("org.kde.plasma.icontasks") diff --git a/kde-settings-qubes.spec.in b/kde-settings-qubes.spec.in index 4bade8a..0d85845 100644 --- a/kde-settings-qubes.spec.in +++ b/kde-settings-qubes.spec.in @@ -21,7 +21,6 @@ Requires: kde-settings Requires: kdelibs Requires: kdeplasma-addons Requires: kscreen -Requires: ksysguardd Requires: oxygen-cursor-themes Requires: oxygen-icon-theme Requires: plasma-workspace @@ -34,12 +33,6 @@ Requires: kde-baseapps > 16.08.3 Conflicts: kde-baseapps = 2000:16.08.3 Obsoletes: qubes-kde-Dom0 <= 5.12.3 -# other 3rd party packages that are useful in Dom0 - -# The konsole really looks awful without those fonts: -Requires: dejavu-sans-mono-fonts -Requires: dejavu-sans-fonts - # Qubes-customized menus Requires: qubes-menus @@ -94,6 +87,7 @@ Qubes colorful frames for Breeze plasma theme. %{_datadir}/kde-settings/kde-profile/default/share/config/klipperrc %{_datadir}/kde-settings/kde-profile/default/share/config/nepomukserverrc %{_datadir}/kde-settings/kde-profile/default/share/kde4/services/kcm_nepomuk.desktop +/usr/lib/systemd/user/plasma-kwin_wayland.service.d/10-gui-daemon-shmoverride.conf %files -n plasma-breeze-qubes /usr/bin/qubes-generate-color-palette