diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1c05e388d2..88f8f6d040 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,11 +5,11 @@ base: core24 grade: stable confinement: strict +environment: + QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qt6/plugins" apps: tiled: - command-chain: &command-chain - - bin/desktop-launch command: usr/bin/tiled common-id: org.mapeditor.Tiled.desktop plugs: @@ -22,7 +22,6 @@ apps: - opengl - network tmxviewer: - command-chain: *command-chain command: usr/bin/tmxviewer plugs: &basic-plugs - desktop @@ -32,11 +31,9 @@ apps: - home - removable-media tmxrasterizer: - command-chain: *command-chain command: usr/bin/tmxrasterizer plugs: *basic-plugs terraingenerator: - command-chain: *command-chain command: usr/bin/terraingenerator plugs: *basic-plugs @@ -48,48 +45,44 @@ parts: craftctl set version="$(git describe | sed 's/v//')" override-build: | qbs setup-toolchains --detect + qbs setup-qt /usr/bin/qmake6 qt6 + qbs config defaultProfile qt6 qbs build --jobs "${CRAFT_PARALLEL_BUILD_COUNT}" --command-echo-mode command-line config:release qbs.installPrefix:"/usr" projects.Tiled.version:$(craftctl get version) projects.Tiled.useRPaths:false qbs install --install-root "${CRAFT_PART_INSTALL}" config:release parse-info: - usr/share/metainfo/org.mapeditor.Tiled.appdata.xml source: . build-packages: + - build-essential + - dpkg-dev + - libzstd-dev - pkg-config - # FIXME: Python plugin compiles and loads, but can't find platform libraries - # - python-dev - - qttools5-dev-tools - qbs - - libqt5svg5-dev - - qtdeclarative5-dev + - qt6-base-dev + - qt6-declarative-dev + - qt6-l10n-tools + - qt6-svg-dev - zlib1g-dev - - libzstd-dev - stage-packages: - - libqt5quick5 - - qt5-image-formats-plugins - - qtwayland5 - # - libpython2.7 - - libzstd1 - after: [desktop-qt5] - - desktop-qt5: - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: qt - plugin: make - make-parameters: ["FLAVOR=qt5"] - build-packages: - - build-essential - - qtbase5-dev - - dpkg-dev + # FIXME: Python plugin compiles and loads, but can't find platform libraries + # - python-dev stage-packages: - - libxkbcommon0 - - dmz-cursor-theme - - light-themes - adwaita-icon-theme - - shared-mime-info - - libqt5concurrent5 - - libqt5gui5 - - libqt5svg5 # for loading icon themes which are svg + - dmz-cursor-theme + - fcitx-frontend-qt6 - libgdk-pixbuf2.0-0 + - libproxy1v5 + - libqt6concurrent6t64 + - libqt6gui6t64 + - libqt6openglwidgets6t64 + - libqt6quick6 + - libqt6svg6 # for loading icons which are svg + - libqt6widgets6t64 + - libxkbcommon0 + - libzstd1 + - light-themes - locales-all + - qt6-image-formats-plugins + - qt6-wayland + - shared-mime-info - xdg-user-dirs - - fcitx-frontend-qt5 + # - libpython2.7