[neon/neon-packaging/digikam/Neon/unstable] debian/patches: Revert "Merging Neon/stable into Neon/unstable."

Carlos De Maine null at kde.org
Sat Apr 22 10:36:20 BST 2023


Git commit 068200ec7c2d094d3868bb96b01f4507ce609d33 by Carlos De Maine.
Committed on 22/04/2023 at 09:36.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Merging Neon/stable into Neon/unstable."

This reverts commit a5405571aab936286401515d5249a3176ea3b897

D  +0    -11   debian/patches/akonadi.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/neon-packaging/digikam/commit/068200ec7c2d094d3868bb96b01f4507ce609d33

diff --git a/debian/patches/akonadi.diff b/debian/patches/akonadi.diff
deleted file mode 100644
index 1a1acd9..0000000
--- a/debian/patches/akonadi.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
-index 4cb33d2f9e60e1d8c36bffdaec1cb9924603b0aa..610033425cd912ea199d87bad41c34dbce44c535 100644
---- a/core/cmake/rules/RulesKDEFramework.cmake
-+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -39,6 +39,7 @@ if(ENABLE_AKONADICONTACTSUPPORT)
- 
-     find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
-                                             OPTIONAL_COMPONENTS
-+                                            Akonadi
-                                             AkonadiContact      # For KDE Mail Contacts support.
-                                             Contacts            # API for contacts/address book data.
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5770867..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-akonadi.diff
\ No newline at end of file


More information about the Neon-commits mailing list