[neon/snap-packaging/elisa-snap] /: Add logo, alsa and gstreamer + temp libpulse0 fix.

[Scarlett Moore]

Git commit 4044e56af36186476d1147d5151df0cbad8c9277 by Scarlett Moore.
Committed on 13/06/2024 at 17:39.
Pushed by scarlettmoore into branch 'master'.

Add logo, alsa and gstreamer + temp libpulse0 fix.

A  +-    --    logo.png
M  +29   -6    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/elisa-snap/-/commit/4044e56af36186476d1147d5151df0cbad8c9277

diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..893f52d
Binary files /dev/null and b/logo.png differ
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 632a6c2..aa16a8a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -22,11 +22,24 @@ apps:
         - alsa
         command-chain:
         - snap/command-chain/desktop-launch6
+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:/usr/lib:/lib"
+  GST_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer-1.0"
+  GST_PLUGIN_SYSTEM_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer-1.0"
+  GST_PLUGIN_SCANNER: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
 slots:
     session-dbus-interface:
         interface: dbus
         name: org.kde.elisa
         bus: session
+layout:
+    /usr/lib/$CRAFT_ARCH_TRIPLET/alsa-lib:
+        symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/alsa-lib
+    /usr/share/alsa:
+        symlink: $SNAP/usr/share/alsa
+    "/etc/alsa/conf.d":
+        bind: "$SNAP/etc/alsa/conf.d"
+
 package-repositories:
 -   type: apt
     components:
@@ -43,6 +56,7 @@ parts:
         plugin: cmake
         build-packages:
         - libvlc-dev
+        - libpulse0
         stage-packages:
         - gstreamer1.0-alsa
         - gstreamer1.0-libav
@@ -50,11 +64,12 @@ parts:
         - gstreamer1.0-plugins-good
         - gstreamer1.0-plugins-base
         - gstreamer1.0-plugins-bad
-        source: .
-        source-type: local
+        - libpulse0
+        source: https://invent.kde.org/multimedia/elisa.git
+        source-branch: release/24.05
         cmake-parameters:
         - -DCMAKE_INSTALL_PREFIX=/usr
-        - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+        - -DCMAKE_BUILD_TYPE=Release
         - -DQT_MAJOR_VERSION=6
         - -DBUILD_WITH_QT6=ON
         - -DBUILD_TESTING=OFF
@@ -66,9 +81,17 @@ parts:
         - -DCMAKE_INSTALL_RUNSTATEDIR=/run
         - -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON
         - -DCMAKE_VERBOSE_MAKEFILE=ON
-        - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET
+        - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         - --log-level=STATUS
-        - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET
+        - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+        - "DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/snap/kf6-core22-sdk/current/usr"
+        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/snap/kf6-core22-sdk/current/usr"
+        build-environment:
+            - PATH: /snap/kde-qt6-core22-sdk/current/usr/bin${PATH:+:$PATH}
+            - PKG_CONFIG_PATH: /snap/kde-qt6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+            - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+            - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+            - LD_LIBRARY_PATH: "/snap/kde-qt6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core22-sdk/current/usr/lib:/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kf6-core22-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/lib/:$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
         prime:
         - -usr/lib/*/cmake/*
         - -usr/include/*
@@ -79,7 +102,7 @@ parts:
         - -usr/lib/gcc/$SNAPCRAFT_ARCH_TRIPLET/6.0.0
         - -usr/lib/aspell/*
         - "-usr/share/lintian"
-    override-build: |
+        override-build: |
             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|'