Remove make-parameters for core22 as it is only used in core24 gpu

wrapper. Add GTK_USE_PORTAL as it is also needed by qt apps.
canonical · Oct 14, 2024 · d1c5ecb · d1c5ecb
1 parent 19d47f7
commit d1c5ecb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/snapcraft/extensions/kde_neon_6.py b/snapcraft/extensions/kde_neon_6.py
@@ -236,7 +236,10 @@ def get_root_snippet(self) -> Dict[str, Any]:
                 },
                 **gpu_plugs,
             },
-            "environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/kf6"},
+            "environment": {
+                "SNAP_DESKTOP_RUNTIME": "$SNAP/kf6",
+                "GTK_USE_PORTAL": "1",
+            },
             "hooks": {
                 "configure": {
                     "plugs": ["desktop"],
@@ -358,7 +361,6 @@ def get_parts_snippet(self) -> Dict[str, Any]:
                 "kde-neon-6/sdk": {
                     "source": str(source),
                     "plugin": "make",
-                    "make-parameters": [f"PLATFORM_PLUG={self.kde_snaps.content_kf6}"],
                     "build-snaps": [
                         self.kde_snaps.qt6_sdk_snap,
                         self.kde_snaps.kf6_sdk_snap,
@@ -382,7 +384,6 @@ def get_parts_snippet(self) -> Dict[str, Any]:
             "kde-neon-6/sdk": {
                 "source": str(source),
                 "plugin": "make",
-                "make-parameters": [f"PLATFORM_PLUG={self.kde_snaps.content_kf6}"],
-                **gpu_opts,
+               **gpu_opts,
             },
         }
diff --git a/tests/unit/extensions/test_kde_neon_6.py b/tests/unit/extensions/test_kde_neon_6.py
@@ -241,7 +241,10 @@ def test_get_root_snippet_core24(kde_neon_6_extension_core24):
     assert kde_neon_6_extension_core24.get_root_snippet() == {
         "assumes": ["snapd2.58.3"],
         "compression": "lzo",
-        "environment": {"SNAP_DESKTOP_RUNTIME": "$SNAP/kf6"},
+        "environment": {
+            "SNAP_DESKTOP_RUNTIME": "$SNAP/gnome-platform",
+            "GTK_USE_PORTAL": "1",
+        },
         "hooks": {
             "configure": {
                 "plugs": ["desktop"],
@@ -698,7 +701,6 @@ def test_get_parts_snippet(kde_neon_6_extension):
         "kde-neon-6/sdk": {
             "source": str(source),
             "plugin": "make",
-            "make-parameters": ["PLATFORM_PLUG=kf6-core22"],
             "build-snaps": ["kde-qt6-core22-sdk", "kf6-core22-sdk"],
             "build-packages": [
                 "gettext",