Sgmoore/add core24 support

extensions/desktop/command-chain-kde/Makefile

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+BIN_DIR := $(DESTDIR)/snap/command-chain
+GPU_WRAPPER :=
+
+scripts = hooks-configure-desktop desktop-launch run $(GPU_WRAPPER)
+
+*:
+	install -D -m755 "$@" "$(BIN_DIR)"/"$@"
+
+install: $(scripts)
+
+.PHONY: $(scripts)

extensions/desktop/command-chain-kde/desktop-launch

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -- "${SNAP}/kf6/command-chain/desktop-launch6" "$@"
+# shellcheck source=/dev/null
+source "${SNAP}/snap/command-chain/run"

extensions/desktop/command-chain-kde/gpu-2404-wrapper

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -- "${SNAP}/gpu-2404/bin/gpu-2404-provider-wrapper" "$@"
+# shellcheck source=/dev/null
+source "${SNAP}/snap/command-chain/run"

extensions/desktop/command-chain-kde/hooks-configure-desktop

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -- "${SNAP}/kf6/command-chain/hooks-configure-desktop" "$@"
+# shellcheck source=/dev/null
+source "${SNAP}/snap/command-chain/run"

extensions/desktop/command-chain-kde/hooks-configure-fonts

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -- "${SNAP}/kf6/command-chain/hooks-configure-fonts" "$@"
+# shellcheck source=/dev/null
+source "${SNAP}/snap/command-chain/run"

extensions/desktop/command-chain-kde/run

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  echo "run <command>"
+  exit 1
+fi
+
+if [ -z "${SNAP}" ]; then
+  echo "Not running inside a snap context: SNAP not declared"
+  exit
+fi
+
+
+if [ ! -f "$1" ]; then
+  echo "Content snap command-chain for $1 not found: ensure slot is connected"
+  exit
+fi
+
+# emulate "exec $@" using "source"
+# have to disable "unused variables" because checkshell doesn't know that $BASH_ARGV0 is $0
+# shellcheck disable=SC2034  # Unused variables left for readability
+BASH_ARGV0=$1
+shift
+# shellcheck source=/dev/null
+source "$0"

snapcraft/extensions/kde_neon_6.py

@@ -26,8 +26,8 @@
 
 from .extension import Extension, get_extensions_data_dir, prepend_to_env
 
-_QT6_SDK_SNAP = {"core22": "kde-qt6-core22-sdk"}
-_KF6_SDK_SNAP = {"core22": "kf6-core22-sdk"}
+_QT6_SDK_SNAP = {"core22": "kde-qt6-core22-sdk", "core24": "kde-qt6-core24-sdk"}
+_KF6_SDK_SNAP = {"core22": "kf6-core22-sdk", "core24": "kf6-core24-sdk"}
 
 
 @dataclasses.dataclass
@@ -38,6 +38,8 @@ class KDESnaps6:
     kf6_sdk_snap: str
     content_qt6: str
     content_kf6: str
+    gpu_plugs: Dict[str, Any]
+    gpu_layouts: Dict[str, Any]
     qt6_builtin: bool = True
     kf6_builtin: bool = True
 
@@ -51,7 +53,11 @@ class KDENeon6(Extension):
     It configures each application with the following plugs:
 
     \b
+    - Common GTK themes.
+    - breeze GTK theme.
+    - Common Qt themes.
     - Common Icon Themes.
+    - Breeze Icon theme.
     - Common Sound Themes.
     - The Qt6 and KDE Frameworks 6 runtime libraries and utilities.
 
@@ -73,7 +79,7 @@ class KDENeon6(Extension):
     @staticmethod
     @overrides
     def get_supported_bases() -> Tuple[str, ...]:
-        return ("core22",)
+        return ("core22", "core24")
 
     @staticmethod
     @overrides
@@ -87,8 +93,11 @@ def is_experimental(base: Optional[str]) -> bool:
 
     @overrides
     def get_app_snippet(self) -> Dict[str, Any]:
+        command_chain = ["snap/command-chain/desktop-launch"]
+        if self.yaml_data["base"] == "core24":
+            command_chain.insert(0, "snap/command-chain/gpu-2404-wrapper")
         return {
-            "command-chain": ["snap/command-chain/desktop-launch6"],
+            "command-chain": command_chain,
             "plugs": [
                 "desktop",
                 "desktop-legacy",
@@ -109,6 +118,30 @@ def kde_snaps(self) -> KDESnaps6:
         qt6_sdk_snap = _QT6_SDK_SNAP[base]
         kf6_sdk_snap = _KF6_SDK_SNAP[base]
 
+        match base:
+            case "core22":
+                gpu_plugs = {}
+                gpu_layouts = {
+                    "/usr/share/libdrm": {"bind": "$SNAP/kf6-core22/usr/share/libdrm"},
+                }
+            case "core24":
+                gpu_plugs = {
+                    "gpu-2404": {
+                        "interface": "content",
+                        "target": "$SNAP/gpu-2404",
+                        "default-provider": "mesa-2404",
+                    },
+                }
+                gpu_layouts = {
+                    "/usr/share/libdrm": {"bind": "$SNAP/gpu-2404/libdrm"},
+                    "/usr/share/drirc.d": {"symlink": "$SNAP/gpu-2404/drirc.d"},
+                    "/usr/share/X11/XErrorDB": {
+                        "symlink": "$SNAP/gpu-2404/X11/XErrorDB"
+                    },
+                }
+            case _:
+                raise AssertionError(f"Unsupported base: {base}")
+
         build_snaps: List[str] = []
         for part in self.yaml_data["parts"].values():
             build_snaps.extend(part.get("build-snaps", []))
@@ -139,34 +172,74 @@ def kde_snaps(self) -> KDESnaps6:
             kf6_sdk_snap=kf6_sdk_snap,
             content_kf6=content_kf6_snap,
             kf6_builtin=kf6_builtin,
+            gpu_layouts=gpu_layouts,
+            gpu_plugs=gpu_plugs,
         )
 
     @overrides
     def get_root_snippet(self) -> Dict[str, Any]:
         platform_kf6_snap = self.kde_snaps.content_kf6
         content_kf6_snap = self.kde_snaps.content_kf6 + "-all"
+        gpu_plugs = self.kde_snaps.gpu_plugs
+        gpu_layouts = self.kde_snaps.gpu_layouts
 
         return {
             "assumes": ["snapd2.58.3"],  # for 'snapctl is-connected'
             "compression": "lzo",
             "plugs": {
                 "desktop": {"mount-host-font-cache": False},
+                "gtk-2-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "gtk-common-themes",
+                },
+                "gtk-2-theme-breeze": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "gtk-theme-breeze",
+                },
+                "gtk-3-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "gtk-common-themes",
+                },
+                "gtk-3-theme-breeze": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "gtk-theme-breeze",
+                },
+                "icon-theme-breeze": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/icons",
+                    "default-provider": "icon-theme-breeze",
+                },
                 "icon-themes": {
                     "interface": "content",
                     "target": "$SNAP/data-dir/icons",
                     "default-provider": "gtk-common-themes",
                 },
+                "qt-sound-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/sounds",
+                    "default-provider": "qt-common-themes",
+                },
                 "sound-themes": {
                     "interface": "content",
                     "target": "$SNAP/data-dir/sounds",
                     "default-provider": "gtk-common-themes",
                 },
+                "qt-6-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/kf6",
+                    "default-provider": "qt-common-themes",
+                },
                 platform_kf6_snap: {
                     "content": content_kf6_snap,
                     "interface": "content",
                     "default-provider": platform_kf6_snap,
                     "target": "$SNAP/kf6",
                 },
+                **gpu_plugs,
             },
             "environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/kf6"},
             "hooks": {
@@ -178,6 +251,7 @@ def get_root_snippet(self) -> Dict[str, Any]:
             "layout": {
                 "/usr/share/X11": {"symlink": "$SNAP/kf6/usr/share/X11"},
                 "/usr/share/qt6": {"symlink": "$SNAP/kf6/usr/share/qt6"},
+                **gpu_layouts,
             },
         }
 
@@ -278,7 +352,11 @@ def get_parts_snippet(self) -> Dict[str, Any]:
         # We can change this to the lightweight command-chain when
         # the content snap includes the desktop-launch from
         # https://github.com/canonical/snapcraft-desktop-integration
-        source = get_extensions_data_dir() / "desktop" / "kde-neon-6"
+        source = get_extensions_data_dir() / "desktop" / "command-chain-kde"
+
+        gpu_opts = {}
+        if self.yaml_data["base"] == "core24":
+            gpu_opts["make-parameters"] = ["GPU_WRAPPER=gpu-2404-wrapper"]
 
         if self.kde_snaps.kf6_builtin:
             return {
@@ -301,6 +379,7 @@ def get_parts_snippet(self) -> Dict[str, Any]:
                         "libgl-dev",
                         "libglvnd-dev",
                     ],
+                    **gpu_opts,
                 },
             }
 
@@ -309,5 +388,6 @@ def get_parts_snippet(self) -> Dict[str, Any]:
                 "source": str(source),
                 "plugin": "make",
                 "make-parameters": [f"PLATFORM_PLUG={self.kde_snaps.content_kf6}"],
+                **gpu_opts,
             },
         }

tests/unit/commands/test_list_extensions.py

@@ -48,7 +48,7 @@ def test_command(emitter, command):
         gnome-3-34              core18
         gnome-3-38              core20
         kde-neon                core18, core20, core22
-        kde-neon-6              core22
+        kde-neon-6              core22, core24
         ros1-noetic             core20
         ros1-noetic-desktop     core20
         ros1-noetic-perception  core20
@@ -96,7 +96,7 @@ def test_command_extension_dups(emitter, command):
         gnome-3-34              core18
         gnome-3-38              core20
         kde-neon                core18, core20, core22
-        kde-neon-6              core22
+        kde-neon-6              core22, core24
         ros1-noetic             core20
         ros1-noetic-desktop     core20
         ros1-noetic-perception  core20