feat(extensions): add content interfaces for qt-common-themes to KDE …

…Neon 6 (canonical#4884)
farshidtz · Jul 10, 2024 · fb1834c · fb1834c
1 parent ccba428
commit fb1834c
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 0 deletions.
diff --git a/snapcraft/extensions/kde_neon_6.py b/snapcraft/extensions/kde_neon_6.py
@@ -51,6 +51,8 @@ class KDENeon6(Extension):
     It configures each application with the following plugs:
 
     \b
+    - Common GTK themes.
+    - Common Qt themes.
     - Common Icon Themes.
     - Common Sound Themes.
     - The Qt6 and KDE Frameworks 6 runtime libraries and utilities.
@@ -151,16 +153,51 @@ def get_root_snippet(self) -> Dict[str, Any]:
             "compression": "lzo",
             "plugs": {
                 "desktop": {"mount-host-font-cache": False},
+                "gtk-2-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "gtk-common-themes",
+                },
+                "kde-gtk2-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "qt-common-themes",
+                },
+                "kde-gtk3-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "qt-common-themes",
+                },
+                "gtk-3-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/themes",
+                    "default-provider": "gtk-common-themes",
+                },
+                "qt-icon-themes": {
+                    "interface": "content",
+                    "target": "$SNAP/data-dir/icons",
+                    "default-provider": "qt-common-themes",
+                },
                 "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",

diff --git a/tests/unit/extensions/test_kde_neon_6.py b/tests/unit/extensions/test_kde_neon_6.py
@@ -121,16 +121,51 @@ def test_get_root_snippet(kde_neon_6_extension):
         },
         "plugs": {
             "desktop": {"mount-host-font-cache": False},
+            "gtk-2-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "gtk-common-themes",
+            },
+            "kde-gtk2-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "qt-common-themes",
+            },
+            "kde-gtk3-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "qt-common-themes",
+            },
+            "gtk-3-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "gtk-common-themes",
+            },
+            "qt-icon-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/icons",
+                "default-provider": "qt-common-themes",
+            },
             "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",
+            },
             "kf6-core22": {
                 "content": "kf6-core22-all",
                 "interface": "content",
@@ -158,16 +193,51 @@ def test_get_root_snippet_with_external_sdk(kde_neon_6_extension_with_build_snap
         },
         "plugs": {
             "desktop": {"mount-host-font-cache": False},
+            "gtk-2-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "gtk-common-themes",
+            },
+            "kde-gtk2-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "qt-common-themes",
+            },
+            "kde-gtk3-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "qt-common-themes",
+            },
+            "gtk-3-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/themes",
+                "default-provider": "gtk-common-themes",
+            },
+            "qt-icon-themes": {
+                "interface": "content",
+                "target": "$SNAP/data-dir/icons",
+                "default-provider": "qt-common-themes",
+            },
             "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",
+            },
             "kf6-core22": {
                 "content": "kf6-core22-all",
                 "interface": "content",