[neon/snap-packaging/kde-qt6-core-sdk] patches: Refresh patch.

Scarlett Moore null at kde.org
Fri May 31 16:51:09 BST 2024


Git commit f377028ba4e9e36c8636c43eae9837fb8e729274 by Scarlett Moore.
Committed on 31/05/2024 at 15:50.
Pushed by scarlettmoore into branch 'master'.

Refresh patch.

M  +5    -5    patches/force_libzstd_shared.patch

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

diff --git a/patches/force_libzstd_shared.patch b/patches/force_libzstd_shared.patch
index 2b48d81..a120e09 100644
--- a/patches/force_libzstd_shared.patch
+++ b/patches/force_libzstd_shared.patch
@@ -12,17 +12,17 @@ Forwarded: not-needed
 
 --- a/qtbase/cmake/FindWrapZSTD.cmake
 +++ b/qtbase/cmake/FindWrapZSTD.cmake
-@@ -25,11 +25,8 @@ include(FindPackageHandleStandardArgs)
+@@ -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_static)
--        set(zstdtargetsuffix "_static")
--    else()
+-    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
+


More information about the Neon-commits mailing list