[neon/snap-packaging/kde-qt6-core-sdk] /: sdk: revamp and rearrange the build and stage packages

[Soumyadeep Ghosh]

Git commit b630eae09879cefc3198788a9525e41cf338ee47 by Soumyadeep Ghosh.
Committed on 26/05/2024 at 09:49.
Pushed by scarlettmoore into branch 'master'.

sdk: revamp and rearrange the build and stage packages

M  +28   -18   snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 020815f..d60443e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -118,11 +118,12 @@ parts:
       - bison
       - clang
       - default-libmysqlclient-dev
-      - dh-exec
       - firebird-dev
       - flex
+      - gettext
       - gperf
       - libasound2-dev
+      - libass-dev
       - libatspi2.0-dev
       - libb2-dev
       - libclang-dev
@@ -130,21 +131,22 @@ parts:
       - libdbus-1-dev
       - libdouble-conversion-dev
       - libdrm-dev
-      - libfreetype-dev
-      - libfreetype6-dev
       - libfontconfig-dev
       - libfontconfig1-dev
+      - libfreetype-dev
+      - libfreetype6-dev
       - libgbm-dev
       - libgl-dev
       - libgl1-mesa-dev
       - libgles-dev
       - libgles2-mesa-dev
       - libglib2.0-dev
-      - libglx-dev
       - libglu-dev
       - libglu1-mesa-dev
+      - libglx-dev
       - libgstreamer1.0-dev
       - libgstreamer-plugins-base1.0-dev
+      - libgtk-3-dev
       - libharfbuzz-dev
       - libhunspell-dev
       - libicu-dev
@@ -162,8 +164,8 @@ parts:
       - libpq-dev
       - libproxy-dev
       - libpulse-dev
-      - libsqlite3-dev
       - libsctp-dev
+      - libsqlite3-dev
       - libssl-dev
       - libsystemd-dev
       - libts-dev
@@ -172,7 +174,10 @@ parts:
       - libwayland-dev
       - libwayland-egl1-mesa
       - libwayland-server0
+      - libx11-dev
+      - libx11-xcb-dev
       - libxcb-composite0-dev
+      - libxcb-cursor-dev
       - libxcb-damage0-dev
       - libxcb-dpms0-dev
       - libxcb-dri2-0-dev
@@ -185,8 +190,8 @@ parts:
       - libxcb-present-dev
       - libxcb-randr0-dev
       - libxcb-record0-dev
-      - libxcb-render0-dev
       - libxcb-render-util0-dev
+      - libxcb-render0-dev
       - libxcb-res0-dev
       - libxcb-screensaver0-dev
       - libxcb-shape0-dev
@@ -200,10 +205,10 @@ parts:
       - libxcb-xinput-dev
       - libxcb-xkb-dev
       - libxcb-xrm-dev
+      - libxcb-xtest0-dev
       - libxcb-xv0-dev
       - libxcb-xvmc0-dev
-      - libx11-dev
-      - libx11-xcb-dev
+      - libxcb1-dev
       - libxcomposite-dev
       - libxcursor-dev
       - libxext-dev
@@ -215,6 +220,7 @@ parts:
       - libxrender-dev
       - libxshmfence-dev
       - libxtst-dev
+      - libzstd-dev
       - llvm-dev
       - ninja-build
       - nodejs
@@ -223,7 +229,7 @@ parts:
       - python2-minimal
       - python3-html5lib
       - python3-minimal
-      - unixodbc
+      - unixodbc-dev
       - zlib1g-dev
     override-build: |
       craftctl default
@@ -242,10 +248,8 @@ parts:
       - docbook-xsl
       - firebird-dev
       - flex
-      - gettext
       - gperf
       - libasound2-dev
-      - libass-dev
       - libatspi2.0-dev
       - libb2-dev
       - libclang-dev
@@ -253,21 +257,22 @@ parts:
       - libdbus-1-dev
       - libdouble-conversion-dev
       - libdrm-dev
-      - libfreetype-dev
-      - libfreetype6-dev
       - libfontconfig-dev
       - libfontconfig1-dev
+      - libfreetype-dev
+      - libfreetype6-dev
       - libgbm-dev
       - libgl-dev
       - libgl1-mesa-dev
       - libgles-dev
       - libgles2-mesa-dev
       - libglib2.0-dev
-      - libglx-dev
       - libglu-dev
       - libglu1-mesa-dev
+      - libglx-dev
       - libgstreamer1.0-dev
       - libgstreamer-plugins-base1.0-dev
+      - libgtk-3-dev
       - libharfbuzz-dev
       - libhunspell-dev
       - libicu-dev
@@ -285,8 +290,8 @@ parts:
       - libpq-dev
       - libproxy-dev
       - libpulse-dev
-      - libsqlite3-dev
       - libsctp-dev
+      - libsqlite3-dev
       - libssl-dev
       - libsystemd-dev
       - libts-dev
@@ -295,7 +300,10 @@ parts:
       - libwayland-dev
       - libwayland-egl1-mesa
       - libwayland-server0
+      - libx11-dev
+      - libx11-xcb-dev
       - libxcb-composite0-dev
+      - libxcb-cursor-dev
       - libxcb-damage0-dev
       - libxcb-dpms0-dev
       - libxcb-dri2-0-dev
@@ -308,8 +316,8 @@ parts:
       - libxcb-present-dev
       - libxcb-randr0-dev
       - libxcb-record0-dev
-      - libxcb-render0-dev
       - libxcb-render-util0-dev
+      - libxcb-render0-dev
       - libxcb-res0-dev
       - libxcb-screensaver0-dev
       - libxcb-shape0-dev
@@ -323,10 +331,10 @@ parts:
       - libxcb-xinput-dev
       - libxcb-xkb-dev
       - libxcb-xrm-dev
+      - libxcb-xtest0-dev
       - libxcb-xv0-dev
       - libxcb-xvmc0-dev
-      - libx11-dev
-      - libx11-xcb-dev
+      - libxcb1-dev
       - libxcomposite-dev
       - libxcursor-dev
       - libxext-dev
@@ -338,6 +346,7 @@ parts:
       - libxrender-dev
       - libxshmfence-dev
       - libxtst-dev
+      - libzstd-dev
       - llvm-dev
       - ninja-build
       - nodejs
@@ -346,6 +355,7 @@ parts:
       - python2-minimal
       - python3-html5lib
       - python3-minimal
+      - unixodbc-dev
       - zlib1g-dev
     organize:
       usr/share/pkgconfig: usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig