[neon/extras/kdiff3/Neon/release] debian: update the patches
Pino Toscano
null at kde.org
Wed Sep 7 17:06:13 BST 2022
Git commit 6229b2a40794ade3a391a9071fd2d18d7da0fd77 by Pino Toscano.
Committed on 15/08/2021 at 14:45.
Pushed by jriddell into branch 'Neon/release'.
update the patches
- libatomic.diff: refresh/update
M +2 -0 debian/changelog
M +3 -3 debian/patches/libatomic.diff
https://invent.kde.org/neon/extras/kdiff3/commit/6229b2a40794ade3a391a9071fd2d18d7da0fd77
diff --git a/debian/changelog b/debian/changelog
index 04ded85..0681cad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kdiff3 (1.9.2-0r1) UNRELEASED; urgency=medium
- bump the KF packages to 5.37.0
- add libboost-dev
- drop libkf5iconthemes-dev
+ * Update the patches:
+ - libatomic.diff: refresh/update
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 15 Aug 2021 16:34:07 +0200
diff --git a/debian/patches/libatomic.diff b/debian/patches/libatomic.diff
index 5bb292c..9623f4a 100644
--- a/debian/patches/libatomic.diff
+++ b/debian/patches/libatomic.diff
@@ -2,12 +2,12 @@ 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(
+@@ -68,7 +68,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 )
++set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons atomic )
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
#Adjust clang specific warnings
More information about the Neon-commits
mailing list