[neon/snap-packaging/elisa-snap] /: Add screen-inhibit-control plug.

[Scarlett Moore]

Git commit 9fcfd8db9b8cd8afa572a68bae8e7459dc791d46 by Scarlett Moore.
Committed on 25/06/2024 at 13:21.
Pushed by scarlettmoore into branch 'master'.

Add screen-inhibit-control plug.

M  +14   -32   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/elisa-snap/-/commit/9fcfd8db9b8cd8afa572a68bae8e7459dc791d46

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3faaf49..8404795 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -20,14 +20,23 @@ apps:
         - removable-media
         - alsa
         - mpris
+        - screen-inhibit-control
         command-chain:
         - snap/command-chain/desktop-launch6
+plugs:
+    gtk-gtk3-themes:
+        interface: "content"
+        target: "$SNAP/data-dir/themes"
+        default-provider: "gtk-common-themes"
 environment:
-  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core22-sdk/current/usr/lib:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/elisa:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:/usr/lib:/lib"
-  GST_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
-  GST_PLUGIN_SYSTEM_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
-  GST_PLUGIN_SCANNER: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
-  ALSA_CONFIG_PATH: "$SNAP/etc/asound.conf"
+  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/ffmpeg-2204/current/usr/lib:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/elisa:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:/usr/lib:/lib"
+  PATH: /snap/ffmpeg-2204/current/usr/bin:/snap/kf6-core22/current/usr/bin:$SNAP/usr/bin:/usr/bin:/bin
+  XDG_DATA_DIRS: $SNAP/usr/share:/snap/kf6-core22/current/usr/share:$SNAP/.local/usr/share:$SNAP/usr/share:$SNAP/data-dir
+  XDG_CONFIG_HOME: $SNAP/etc/xdg:/snap/kf6-core22/current/etc/xdg:/etc/xdg
+  GST_PLUGIN_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
+  GST_PLUGIN_SYSTEM_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
+  GST_PLUGIN_SCANNER: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
+  ALSA_CONFIG_PATH: "$SNAP/kf6/etc/asound.conf"
   QT_MEDIA_BACKEND: "ffmpeg"
   QT_PLUGIN_PATH: /snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
 layout:
@@ -65,13 +74,6 @@ parts:
         - libasound2
         - libasound2-plugins
         - libasound2-data
-        - gstreamer1.0-alsa
-        - gstreamer1.0-libav
-        - gstreamer1.0-plugins-ugly
-        - gstreamer1.0-plugins-good
-        - gstreamer1.0-plugins-base
-        - gstreamer1.0-plugins-bad
-        - gstreamer1.0-tools
         - libpulse0
         stage-snaps:
         - ffmpeg-2204
@@ -116,26 +118,6 @@ parts:
             craftctl default
 
             sed -i "${CRAFT_PART_INSTALL}/usr/share/applications/org.kde.elisa.desktop" -e 's|Icon=elisa$|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/elisa.svg|'
-    alsa-pulseaudio:
-        plugin: dump
-        source: .
-        override-pull: |
-            mkdir etc -p
-            cat > etc/asound.conf <<EOF
-            pcm.!default {
-                type pulse
-                fallback "sysdefault"
-                hint {
-                    show on
-                    description "Default ALSA Output (currently PulseAudio Sound Server)"
-                }
-            }
-            ctl.!default {
-                type pulse
-                fallback "sysdefault"
-            }
-            EOF
-
     cleanup:
         after:
         - elisa