From b7cc72282051a7eecf7e76c3765fbfe64cb7fe4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 19 Sep 2024 18:28:02 +0200 Subject: [PATCH 1/5] snap: Updated to Qt 6 --- snap/snapcraft.yaml | 59 ++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d6be81bfad..97c638d8a6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,6 +5,8 @@ base: core24 grade: stable confinement: strict +environment: + QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qt6/plugins" apps: tiled: @@ -54,23 +56,36 @@ parts: - usr/share/metainfo/org.mapeditor.Tiled.appdata.xml source: . build-packages: + - build-essential + - 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 + # FIXME: Python plugin compiles and loads, but can't find platform libraries + # - python-dev stage-packages: - - libqt5quick5 - - qt5-image-formats-plugins - - qtwayland5 - # - libpython2.7 + - adwaita-icon-theme + - dmz-cursor-theme + - fcitx-frontend-qt6 + - libgdk-pixbuf2.0-0 + - libqt6concurrent6t64 + - libqt6gui6t64 + - libqt6quick6 + - libqt6svg6 # for loading icons which are svg + - libxkbcommon0 - libzstd1 - xkb-data - after: [desktop-qt5] + - light-themes + - locales-all + - qt6-image-formats-plugins + - qt6-wayland + - shared-mime-info + - xdg-user-dirs + #- libpython2.7 qaseprite: source: https://github.com/mapeditor/qaseprite/releases/download/1.0/qaseprite-1.0-source.tar.gz @@ -97,26 +112,4 @@ parts: - libxcursor1 - libxi6 - zlib1g - 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 - stage-packages: - - libxkbcommon0 - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - shared-mime-info - - libqt5concurrent5 - - libqt5gui5 - - libqt5svg5 # for loading icon themes which are svg - - libgdk-pixbuf2.0-0 - - locales-all - - xdg-user-dirs - - fcitx-frontend-qt5 From 453933577e5bb3867812d497b6304b2c2397df3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 19 Sep 2024 18:43:50 +0200 Subject: [PATCH 2/5] snap: Fix problem with finding qmake --- snap/snapcraft.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 97c638d8a6..2e0a83a899 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,7 +49,11 @@ parts: craftctl default craftctl set version="$(git describe | sed 's/v//')" override-build: | + qmake6 -version + qmake6 -query 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: From f6cf96fd987bd4995ba97493d81e3c17ce994dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 3 Oct 2024 11:06:24 +0200 Subject: [PATCH 3/5] Try removing the command-chain --- snap/snapcraft.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2e0a83a899..f724af4b36 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -10,8 +10,6 @@ environment: apps: tiled: - command-chain: &command-chain - - bin/desktop-launch command: usr/bin/tiled common-id: org.mapeditor.Tiled.desktop plugs: @@ -24,7 +22,6 @@ apps: - opengl - network tmxviewer: - command-chain: *command-chain command: usr/bin/tmxviewer plugs: &basic-plugs - desktop @@ -34,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 @@ -49,8 +44,6 @@ parts: craftctl default craftctl set version="$(git describe | sed 's/v//')" override-build: | - qmake6 -version - qmake6 -query qbs setup-toolchains --detect qbs setup-qt /usr/bin/qmake6 qt6 qbs config defaultProfile qt6 From 7f37aab4a8a2f3a7b718f8c13d25717deef84eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 3 Oct 2024 14:11:54 +0200 Subject: [PATCH 4/5] Added libqt6widgets6t64 and libqt6openglwidgets6t64 --- snap/snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f724af4b36..463d038c51 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -71,8 +71,10 @@ parts: - libgdk-pixbuf2.0-0 - libqt6concurrent6t64 - libqt6gui6t64 + - libqt6openglwidgets6t64 - libqt6quick6 - libqt6svg6 # for loading icons which are svg + - libqt6widgets6t64 - libxkbcommon0 - libzstd1 - xkb-data From 976cf0cadae509ed4b8f2aef7f6836d5f51b7558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 21 Oct 2024 08:17:14 +0200 Subject: [PATCH 5/5] Added libproxy1v5 --- snap/snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 463d038c51..c0af3fd214 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -69,6 +69,7 @@ parts: - dmz-cursor-theme - fcitx-frontend-qt6 - libgdk-pixbuf2.0-0 + - libproxy1v5 - libqt6concurrent6t64 - libqt6gui6t64 - libqt6openglwidgets6t64