[neon/extras/kdiff3/Neon/unstable] debian/patches: update patch

Jonathan Riddell null at kde.org
Mon Feb 1 17:18:15 GMT 2021


Git commit 113fa38406f115a3ee49fb9569d1ab3daf7b25aa by Jonathan Riddell.
Committed on 01/02/2021 at 17:18.
Pushed by jriddell into branch 'Neon/unstable'.

update patch

M  +7    -5    debian/patches/libatomic.diff

https://invent.kde.org/neon/extras/kdiff3/commit/113fa38406f115a3ee49fb9569d1ab3daf7b25aa

diff --git a/debian/patches/libatomic.diff b/debian/patches/libatomic.diff
index 5bb292c..f317bf7 100644
--- a/debian/patches/libatomic.diff
+++ b/debian/patches/libatomic.diff
@@ -1,13 +1,15 @@
 Description: Adding libatomic for some 32 bit targets
 Author: eike at debian.org
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,7 @@ find_package(
+Index: kdiff3/CMakeLists.txt
+===================================================================
+--- kdiff3.orig/CMakeLists.txt
++++ kdiff3/CMakeLists.txt
+@@ -69,7 +69,7 @@ set_package_properties(KF5DocTools PROPE
  option(ENABLE_AUTO "Enable kdiff3's '--auto' flag" ON)
  option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF)
  
--set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes )
-+set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes atomic )
+-set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::IconThemes )
++set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::IconThemes atomic)
  
  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
      #Adjust clang specific  warnings


More information about the Neon-commits mailing list