[neon/snap-packaging/kde-qt6-core-sdk] /: Add patch to force libzstd shared library.

[Scarlett Moore]

Git commit dd1c146657f7765b34c0569742696d066d4a8030 by Scarlett Moore.
Committed on 31/05/2024 at 13:39.
Pushed by scarlettmoore into branch 'master'.

Add patch to force libzstd shared library.

A  +28   -0    patches/force_libzstd_shared.patch
A  +1    -0    series
M  +5    -0    snapcraft.yaml

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

diff --git a/patches/force_libzstd_shared.patch b/patches/force_libzstd_shared.patch
new file mode 100644
index 0000000..7c1ac1f
--- /dev/null
+++ b/patches/force_libzstd_shared.patch
@@ -0,0 +1,28 @@
+Description: force the usage of the shared libzstd library.
+ The library provides both versions, and the original code prefers the static
+ version over the shared, while on Debian it should always use the shared
+ version.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Bug: https://bugreports.qt.io/browse/QTBUG-110978
+Forwarded: not-needed
+
+---
+ cmake/FindWrapZSTD.cmake |    7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- a/cmake/FindWrapZSTD.cmake
++++ b/cmake/FindWrapZSTD.cmake
+@@ -25,11 +25,8 @@ include(FindPackageHandleStandardArgs)
+ if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared)
+     find_package_handle_standard_args(WrapZSTD
+                                       REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION)
+-    if(TARGET zstd::libzstd_static)
+-        set(zstdtargetsuffix "_static")
+-    else()
+-        set(zstdtargetsuffix "_shared")
+-    endif()
++    set(zstdtargetsuffix "_shared")
++
+     if(NOT TARGET WrapZSTD::WrapZSTD)
+         add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
+         set_target_properties(WrapZSTD::WrapZSTD PROPERTIES
diff --git a/series b/series
new file mode 100644
index 0000000..d26775f
--- /dev/null
+++ b/series
@@ -0,0 +1 @@
+force_libzstd_shared.patch
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 34e8e55..eabcacd 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -232,6 +232,11 @@ parts:
       - python3-minimal
       - unixodbc-dev
       - zlib1g-dev
+    override-pull: |
+      craftctl default
+      while read -r PATCHFILE ; do
+        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