diff --git a/Makefile b/Makefile index d12d239..fd9745f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: snap clean snap: - snapcraft -v + snapcraft pack -v clean: snapcraft clean -v diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b6a2f41..18a3dc0 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: iaito confinement: classic compression: lzo grade: stable -base: core24 +base: core26 platforms: amd64: build-on: [amd64] @@ -141,13 +141,13 @@ parts: - libnvidia-egl-wayland1 # Theming # qt6-xdgdesktopportal-platformtheme # added in manual-patchelf - - libqt6dbus6t64 + - libqt6dbus6 # QT6 - qt6-wayland - libqt6core6t64 - - libqt6gui6t64 - - libqt6network6t64 - - libqt6widgets6t64 + - libqt6gui6 + - libqt6network6 + - libqt6widgets6 - libqt6svg6 # also for loading icon themes which are svg - libqt6svgwidgets6 prime: @@ -204,8 +204,8 @@ parts: stage-packages: - qt6-wayland - qt6-xdgdesktopportal-platformtheme - - libqt6gui6t64 - - libqt6network6t64 + - libqt6gui6 + - libqt6network6 - libqt6svg6 - libnvidia-egl-wayland1 - libgl1-mesa-dri @@ -218,7 +218,7 @@ parts: - usr/share/egl/egl_external_platform.d override-prime: | craftctl default - LIBRARY_PATH="/snap/core24/current/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}" + LIBRARY_PATH="/snap/core26/current/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}" patchelf --force-rpath --set-rpath "\$ORIGIN/../..:\$ORIGIN/../../..:\$ORIGIN/../../../libproxy:$LIBRARY_PATH" "$CRAFT_PRIME/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/qt6/plugins/"*/*.so patchelf --force-rpath --set-rpath "\$ORIGIN/..:$LIBRARY_PATH" "$CRAFT_PRIME/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/dri/"*.so patchelf --force-rpath --set-rpath "\$ORIGIN:$LIBRARY_PATH" "$CRAFT_PRIME/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/"libgallium-*.so