diff --git a/distro/debian/dms-git/debian/control b/distro/debian/dms-git/debian/control index a43ca59b..2e30550c 100644 --- a/distro/debian/dms-git/debian/control +++ b/distro/debian/dms-git/debian/control @@ -29,6 +29,7 @@ Depends: ${misc:Depends}, qml6-module-qtquick-templates, qml6-module-qtquick-window, qt6ct +Suggests: cups-pk-helper Provides: dms Conflicts: dms Replaces: dms diff --git a/distro/debian/dms/debian/control b/distro/debian/dms/debian/control index 5813c75a..04b9a76e 100644 --- a/distro/debian/dms/debian/control +++ b/distro/debian/dms/debian/control @@ -28,6 +28,7 @@ Depends: ${misc:Depends}, qml6-module-qtquick-templates, qml6-module-qtquick-window, qt6ct +Suggests: cups-pk-helper Conflicts: dms-git Replaces: dms-git Description: DankMaterialShell - Modern Wayland Desktop Shell diff --git a/distro/fedora/dms-git.spec b/distro/fedora/dms-git.spec index dfa416a2..bff7161d 100644 --- a/distro/fedora/dms-git.spec +++ b/distro/fedora/dms-git.spec @@ -38,6 +38,7 @@ Recommends: quickshell-git # Recommended system packages Recommends: NetworkManager Recommends: qt6-qtmultimedia +Suggests: cups-pk-helper Suggests: qt6ct %description diff --git a/distro/fedora/dms.spec b/distro/fedora/dms.spec index 4a0c2aa4..08d54db3 100644 --- a/distro/fedora/dms.spec +++ b/distro/fedora/dms.spec @@ -28,6 +28,7 @@ Recommends: danksearch Recommends: matugen Recommends: NetworkManager Recommends: qt6-qtmultimedia +Suggests: cups-pk-helper Suggests: qt6ct %description diff --git a/distro/opensuse/dms-git.spec b/distro/opensuse/dms-git.spec index 17d26398..b74e0b25 100644 --- a/distro/opensuse/dms-git.spec +++ b/distro/opensuse/dms-git.spec @@ -25,6 +25,7 @@ Recommends: matugen Recommends: quickshell-git Recommends: NetworkManager Recommends: qt6-qtmultimedia +Suggests: cups-pk-helper Suggests: qt6ct Provides: dms diff --git a/distro/opensuse/dms.spec b/distro/opensuse/dms.spec index 5edbd330..1be30720 100644 --- a/distro/opensuse/dms.spec +++ b/distro/opensuse/dms.spec @@ -27,6 +27,7 @@ Recommends: danksearch Recommends: matugen Recommends: NetworkManager Recommends: qt6-qtmultimedia +Suggests: cups-pk-helper Suggests: qt6ct %description diff --git a/distro/ubuntu/dms-git/debian/rules b/distro/ubuntu/dms-git/debian/rules index ade5c976..23246450 100755 --- a/distro/ubuntu/dms-git/debian/rules +++ b/distro/ubuntu/dms-git/debian/rules @@ -28,8 +28,17 @@ override_dh_auto_build: # Launchpad build environment has no internet access test -d dms-git-repo || (echo "ERROR: dms-git-repo directory not found!" && exit 1) - # Patch go.mod to use Go 1.24 base version (Ubuntu has 1.24.4, project requires 1.24.6) - sed -i 's/^go 1\.24\.[0-9]*/go 1.24/' dms-git-repo/core/go.mod + # Patch go.mod for Launchpad: align go directive w/latest Go toolchain + GO_VERSION=$$(go env GOVERSION | sed -E 's/^go([0-9]+\.[0-9]+).*/\1/'); \ + if [ -n "$$GO_VERSION" ]; then \ + sed -E -i "s/^go 1\.[0-9]+(\.[0-9]+)?/go $$GO_VERSION/" dms-git-repo/core/go.mod; \ + if [ -f dms-git-repo/core/vendor/modules.txt ]; then \ + sed -E -i "s/^(## explicit; go )1\.[0-9]+(\.[0-9]+)?$$/\1$$GO_VERSION/" dms-git-repo/core/vendor/modules.txt; \ + fi; \ + else \ + echo "Warning: Could not detect Go version, leaving go.mod go directive unchanged"; \ + fi + sed -E -i '/^toolchain go[0-9.]+$$/d' dms-git-repo/core/go.mod # Build dms-cli from source # Detect architecture diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index cc4d0943..654e952b 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -961,10 +961,7 @@ Singleton { } if (!isGreeterMode) { - // Skip with matugen because, our script runner will do it. - if (!matugenAvailable) { - PortalService.setLightMode(light); - } + PortalService.setLightMode(light); if (typeof SettingsData !== "undefined") { SettingsData.updateCosmicThemeMode(light); } diff --git a/quickshell/Modules/DankBar/DankBarWindow.qml b/quickshell/Modules/DankBar/DankBarWindow.qml index 5a94e45a..f2d77b2c 100644 --- a/quickshell/Modules/DankBar/DankBarWindow.qml +++ b/quickshell/Modules/DankBar/DankBarWindow.qml @@ -48,10 +48,11 @@ PanelWindow { return; } + let section = "center"; if (clockButtonRef && clockButtonRef.visualContent && dankDashPopoutLoader.item.setTriggerPosition) { // Calculate barPosition from axis.edge const barPosition = axis?.edge === "left" ? 2 : (axis?.edge === "right" ? 3 : (axis?.edge === "top" ? 0 : 1)); - const section = clockButtonRef.section || "center"; + section = clockButtonRef.section || "center"; let triggerPos, triggerWidth; if (section === "center") {