[neon/snap-packaging/snapcraft-desktop-integration] /: Add WITH_GRAPHICS sed to Makefile, Set default theme to Breeze, Fix

[Scarlett Moore]

Git commit 7bd496e945c00efa41f387bf1c724004445e4bf0 by Scarlett Moore.
Committed on 14/10/2024 at 14:14.
Pushed by scarlettmoore into branch 'master'.

Add WITH_GRAPHICS sed to Makefile, Set default theme to Breeze, Fix
launcher path.

M  +1    -1    command-chain/desktop-launch
M  +1    -1    kde-neon-6/Makefile
M  +10   -0    kde-neon-6/launcher-specific

https://invent.kde.org/neon/snap-packaging/snapcraft-desktop-integration/-/commit/7bd496e945c00efa41f387bf1c724004445e4bf0

diff --git a/command-chain/desktop-launch b/command-chain/desktop-launch
index 721ce22..e0d0e64 100644
--- a/command-chain/desktop-launch
+++ b/command-chain/desktop-launch
@@ -1,5 +1,5 @@
 !/bin/bash
 
-set -- "${SNAP}/kf6-core24/command-chain/desktop-launch6" "$@"
+set -- "${SNAP}/kf6/snap/command-chain/desktop-launch6" "$@"
 # shellcheck source=/dev/null
 source "${SNAP}/snap/command-chain/run"
diff --git a/kde-neon-6/Makefile b/kde-neon-6/Makefile
index 10d76e4..adf36a2 100644
--- a/kde-neon-6/Makefile
+++ b/kde-neon-6/Makefile
@@ -19,7 +19,7 @@ clean:
 $(DEST_LAUNCHER):
 	@cat $(SRC_DIR)/init > $(DEST_LAUNCHER)
   # tail -n +2 to remove the shebang
-	@tail -n +2 $(SRC_DIR)/desktop-exports | sed -e "s/%PLATFORM_PLUG%/$${PLATFORM_PLUG:?}/" >> $(DEST_LAUNCHER)
+	@tail -n +2 $(SRC_DIR)/desktop-exports | sed -e "s/%PLATFORM_PLUG%/$${PLATFORM_PLUG:?}/" -e "s/%WITH_GRAPHICS%/$(WITH_GRAPHICS)/" >> $(DEST_LAUNCHER)
 	@tail -n +2 $(SRC_DIR)/launcher-specific >> $(DEST_LAUNCHER)
 	@tail -n +2 $(SRC_DIR)/mark-and-exec >> $(DEST_LAUNCHER)
 
diff --git a/kde-neon-6/launcher-specific b/kde-neon-6/launcher-specific
index 309ffbe..75f736a 100644
--- a/kde-neon-6/launcher-specific
+++ b/kde-neon-6/launcher-specific
@@ -3,6 +3,13 @@
 # KDE NEON launcher specific part #
 ###################################
 
+# shellcheck disable=SC2154
+if [ "$wayland_available" = true ]; then
+  export GDK_BACKEND="wayland"
+  export CLUTTER_BACKEND="wayland"
+  export QT_QPA_PLATFORM=wayland-egl
+fi
+
 # Add paths for games
 append_dir PATH "$SNAP/usr/games"
 append_dir PATH "$SNAP_DESKTOP_RUNTIME/usr/games"
@@ -26,6 +33,9 @@ append_dir QT_PLUGIN_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/"
 append_dir QML2_IMPORT_PATH "$SNAP/usr/lib/$ARCH/qt6/qml"
 append_dir QML2_IMPORT_PATH "$SNAP_DESKTOP_RUNTIME/usr/lib/$ARCH/qt6/qml"
 
+# Qt style breeze
+append_dir QT_STYLE_OVERRIDE "Breeze"
+
 # Fix locating the QtWebEngineProcess executable
 export QTWEBENGINEPROCESS_PATH="$SNAP_DESKTOP_RUNTIME/usr/lib/qt6/libexec/QtWebEngineProcess"