From b034ec9409189f28ca14b31d9dfcd6a7d61ffda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Thu, 19 Sep 2024 18:28:02 +0200
Subject: [PATCH] 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