[neon/snap-packaging/kde-qt6-core-sdk] /: Fix path to file

Scarlett Moore null at kde.org
Fri May 31 15:39:37 BST 2024


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

Fix path to file

M  +3    -3    patches/force_libzstd_shared.patch
M  +2    -0    snapcraft.yaml

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

diff --git a/patches/force_libzstd_shared.patch b/patches/force_libzstd_shared.patch
index 7c1ac1f..2b48d81 100644
--- a/patches/force_libzstd_shared.patch
+++ b/patches/force_libzstd_shared.patch
@@ -7,11 +7,11 @@ Bug: https://bugreports.qt.io/browse/QTBUG-110978
 Forwarded: not-needed
 
 ---
- cmake/FindWrapZSTD.cmake |    7 ++-----
+ qtbase/cmake/FindWrapZSTD.cmake |    7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
---- a/cmake/FindWrapZSTD.cmake
-+++ b/cmake/FindWrapZSTD.cmake
+--- a/qtbase/cmake/FindWrapZSTD.cmake
++++ b/qtbase/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
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3f0aa1a..b61f6fd 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -236,6 +236,8 @@ parts:
       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


More information about the Neon-commits mailing list