[neon/snap-packaging/kde-qt6-core-sdk/work.core24] /: drop old patch and renable patching

[Carlos De Maine]

Git commit efe58fedc2b7ee6ff86930543d14789c465e0164 by Carlos De Maine.
Committed on 28/08/2025 at 11:10.
Pushed by carlosdem into branch 'work.core24'.

drop old patch and renable patching

D  +0    -28   patches/force_libzstd_shared.patch
M  +0    -1    patches/series
M  +9    -9    snapcraft.yaml

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

diff --git a/patches/force_libzstd_shared.patch b/patches/force_libzstd_shared.patch
deleted file mode 100644
index a120e09..0000000
--- a/patches/force_libzstd_shared.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
----
- qtbase/cmake/FindWrapZSTD.cmake |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/qtbase/cmake/FindWrapZSTD.cmake
-+++ b/qtbase/cmake/FindWrapZSTD.cmake
-@@ -28,11 +28,7 @@ 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_shared)
--        set(zstdtargetsuffix "_shared")
--    else()
--        set(zstdtargetsuffix "_static")
--    endif()
-+    set(zstdtargetsuffix "_shared")
-     if(NOT TARGET WrapZSTD::WrapZSTD)
-         add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
-         set_target_properties(WrapZSTD::WrapZSTD PROPERTIES
-
diff --git a/patches/series b/patches/series
index 6b87908..508a971 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
-force_libzstd_shared.patch
 0001_disable_webengine_docs.diff
 0002_disable_webengine_docs.diff
 0003_disable_webengine_docs.diff
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9b827ef..296fc36 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -357,15 +357,15 @@ parts:
     prime:
       - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libcurl*
       - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libvulkan*
-    # 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
+        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