Skip to content

Update for F41 dom0 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 27, 2024
Merged

Update for F41 dom0 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cbd8fd
Remove dependencies irrelevant to KDE
marmarek Sep 18, 2024
c3a1694
Remove obsolete ksysguard
marmarek Sep 19, 2024
59da3c3
ci: switch to R4.3
marmarek Sep 24, 2024
1902f25
Set PATH to use Xwayland wrapper
marmarek Oct 14, 2024
ea3f4d0
Update layout.js for the version in F41
marmarek Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
3 changes: 3 additions & 0 deletions config/10-gui-daemon-shmoverride.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 3 additions & 5 deletions kde-panel-layout.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
8 changes: 1 addition & 7 deletions kde-settings-qubes.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down