From b034ec9409189f28ca14b31d9dfcd6a7d61ffda7 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/7] snap: Updated to Qt 6 --- snap/snapcraft.yaml | 55 ++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1c05e388d2..a71135d9ba 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,42 +56,33 @@ parts: - 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 + - libqt6concurrent6t64 + - libqt6gui6t64 + - libqt6quick6 + - libqt6svg6 # for loading icons which are svg + - libxkbcommon0 + - libzstd1 + - light-themes - locales-all + - qt6-image-formats-plugins + - qt6-wayland + - shared-mime-info - xdg-user-dirs - - fcitx-frontend-qt5 + # - libpython2.7 From 7bf064ac71b86eb5e8512f3f5935f19b7e50d6b4 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/7] snap: Try to fix problem with finding qmake --- snap/snapcraft.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a71135d9ba..21ea62411b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -55,6 +55,8 @@ parts: parse-info: - usr/share/metainfo/org.mapeditor.Tiled.appdata.xml source: . + build-environment: + - QT_SELECT: qt6 build-packages: - build-essential - dpkg-dev @@ -65,6 +67,7 @@ parts: - qt6-declarative-dev - qt6-l10n-tools - qt6-svg-dev + - qtchooser - zlib1g-dev # FIXME: Python plugin compiles and loads, but can't find platform libraries # - python-dev From 42efe6c84431a48a2d7457a97aea42055401b62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 1 Oct 2024 09:55:15 +0200 Subject: [PATCH 3/7] snap: Added some debug prints --- snap/snapcraft.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 21ea62411b..591ae4ca62 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,6 +49,9 @@ parts: craftctl default craftctl set version="$(git describe | sed 's/v//')" override-build: | + qmake -version + qmake -query + qtchooser -list-versions qbs setup-toolchains --detect 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 From f31b18aaa3e9674c3b0e3cbf589f6487c7dd048b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 1 Oct 2024 10:21:52 +0200 Subject: [PATCH 4/7] Debug: list available versions first --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 591ae4ca62..3ce84de51b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,9 +49,9 @@ parts: craftctl default craftctl set version="$(git describe | sed 's/v//')" override-build: | + qtchooser -list-versions qmake -version qmake -query - qtchooser -list-versions qbs setup-toolchains --detect 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 From a5219c49c114ea41f22552f2f315371df02fd4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 2 Oct 2024 18:43:09 +0200 Subject: [PATCH 5/7] Don't try to use qtchooser It actually appears to be deprecated and does not support Qt 6. --- snap/snapcraft.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3ce84de51b..55568eb7e7 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,7 +49,6 @@ parts: craftctl default craftctl set version="$(git describe | sed 's/v//')" override-build: | - qtchooser -list-versions qmake -version qmake -query qbs setup-toolchains --detect @@ -58,8 +57,6 @@ parts: parse-info: - usr/share/metainfo/org.mapeditor.Tiled.appdata.xml source: . - build-environment: - - QT_SELECT: qt6 build-packages: - build-essential - dpkg-dev @@ -70,7 +67,6 @@ parts: - qt6-declarative-dev - qt6-l10n-tools - qt6-svg-dev - - qtchooser - zlib1g-dev # FIXME: Python plugin compiles and loads, but can't find platform libraries # - python-dev From cd93c2541d6407a1219fd160958adaca4e48be65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 2 Oct 2024 18:50:58 +0200 Subject: [PATCH 6/7] Try to explicitly set up Qt --- snap/snapcraft.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 55568eb7e7..e7c89b4e39 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,9 +49,11 @@ parts: craftctl default craftctl set version="$(git describe | sed 's/v//')" override-build: | - qmake -version - qmake -query + 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 226e67f629dd3a9502a347d5c202e04f9f6af060 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 7/7] 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 e7c89b4e39..54c931faef 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