[neon/snap-packaging/kde-qt6-core-sdk] /: looks like qtwayland was added now.

[Scarlett Moore]

Git commit 891c57f9b201269a5a651defcc0df2f3fb24d62a by Scarlett Moore.
Committed on 13/11/2024 at 13:03.
Pushed by scarlettmoore into branch 'master'.

looks like qtwayland was added now.

M  +11   -50   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/891c57f9b201269a5a651defcc0df2f3fb24d62a

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 066027a..a312f83 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -35,45 +35,7 @@ package-repositories:
     key-server: keyserver.ubuntu.com
 
 parts:
-  qtwayland:
-    plugin: cmake
-    source: https://invent.kde.org/qt/qtwayland.git
-    source-tag: $SNAPCRAFT_PROJECT_VERSION
-    source-depth: 1
-    cmake-generator: Ninja
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DINSTALL_BINDIR=/usr/bin/qt6
-      - -DINSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-      - -DINSTALL_LIBEXECDIR=lib/qt6/libexec
-      - -DINSTALL_ARCHDATADIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6
-      - -DINSTALL_EXAMPLESDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/examples
-      - -DINSTALL_DATADIR=share/qt6
-      - -DINSTALL_HOSTDATADIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6
-      - -DINSTALL_SYSCONFDIR=/share
-      - -DINSTALL_INCLUDEDIR=include/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6
-      - -DINSTALL_PLUGINDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
-      - -DINSTALL_TRANSLATIONDIR=share/qt6/translations
-      - -DINSTALL_MKSPECSDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/mkspecs
-      - -DINSTALL_PUBLICBINDIR=bin
-      - -DBUILD_EXAMPLES=OFF
-      - -DBUILD_DOCS=OFF
-    build-snaps:
-      - cmake
-    build-packages:
-      - bison
-      - clang
-      - libwayland-dev
-      - libwayland-egl1-mesa
-      - libwayland-server0
-      - flex
-      - flite1-dev
-      - gettext
-      - gperf
   qt6:
-    after:
-      - qtwayland
     plugin: cmake
     source: https://invent.kde.org/qt/qt/qt5.git
     source-tag: $SNAPCRAFT_PROJECT_VERSION
@@ -148,9 +110,6 @@ parts:
       - -DQT_FEATURE_alsa=ON
       - -DFEATURE_use_mold_linker=ON
       - -DBUILD_SHARED_LIBS=ON
-    build-environment:
-      - PKG_CONFIG_PATH: /snap/ffmpeg-2204-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-      - CMAKE_PREFIX_PATH: /snap/ffmpeg-2204-sdk/current/usr${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
     build-snaps:
       - cmake
     build-packages:
@@ -271,17 +230,19 @@ parts:
       - python3-minimal
       - unixodbc-dev
       - zlib1g-dev
+      - git
     stage-packages:
       - libpulse0
-    # override-pull: |
-    #   craftctl default
-    #   # while read -r PATCHFILE ; do
-    #   #   ls -l
-    #   #   ls -l cmake/
-    #   #   ls -l qtbase/cmake/
-    #   #   pwd
-    #   #   patch -p1 < "$CRAFT_PROJECT_DIR/patches/$PATCHFILE"
-    #   # done < $CRAFT_PROJECT_DIR/patches/series
+    override-pull: |
+      craftctl default
+      git clone https://invent.kde.org/qt/qtwayland.git $SNAPCRAFT_PART_SRC/qt5/
+      # while read -r PATCHFILE ; do
+      #   ls -l
+      #   ls -l cmake/
+      #   ls -l qtbase/cmake/
+      #   pwd
+      #   patch -p1 < "$CRAFT_PROJECT_DIR/patches/$PATCHFILE"
+      # done < $CRAFT_PROJECT_DIR/patches/series
     override-build: |
       craftctl default
       mkdir -p $CRAFT_PART_INSTALL/etc/$CRAFT_PART_NAME