tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: akonadi: Update to 25.12.0.

Browse Source 
* gnu/packages/kde-pim.scm (akonadi): Update to 25.12.0.
* gnu/packages/patches/akonadi-not-relocatable.patch: Fix patch to apply to the
latest code.

Change-Id: Icab5c1aac6053bb4650be11d37d2392bfdd75d30
This commit is contained in:
Sughosha
2025-12-14 19:26:39 +05:30
parent 2a3e99185f
commit 65287cef67
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/kde-pim.scm
View File

@@ -166,14 +166,14 @@ multi-floor indoor maps.")
(define-public akonadi
(package
(name "akonadi")
(version "25.08.3")
(version "25.12.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/akonadi-" version ".tar.xz"))
(sha256
(base32
"0yh1xqz9wlzcjhh3jrrkw65za80g2z24scxb5nlkgmnr2qggsrzq"))
"1p30cv8x75jn5y0xz78wygi8m69c6mghiyvgbmz8arghwv4zzl49"))
(patches (search-patches "akonadi-paths.patch"
"akonadi-timestamps.patch"
"akonadi-not-relocatable.patch"))))

46
gnu/packages/patches/akonadi-not-relocatable.patch
View File

@@ -1,44 +1,46 @@
From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 25 Apr 2021 08:01:21 -0500
Subject: [PATCH 3/3] akonadi revert make relocatable
From c71418d39d5cc0af58548a8885b799efe032c9e3 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@disroot.org>
Date: Tue, 16 Dec 2025 08:39:32 +0530
Subject: [PATCH] revert make relocatable
---
CMakeLists.txt | 3 ---
KF5AkonadiConfig.cmake.in | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
CMakeLists.txt | 4 ----
KPimAkonadiConfig.cmake.in | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e8cc81..63161b7 100644
index c65b2671b..d93ba08f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -368,9 +368,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
@@ -399,10 +399,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KPim6AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
- AKONADI_INCLUDE_DIR
- KF5Akonadi_DATA_DIR
- PATH_VARS
- AKONADI_DBUS_INTERFACES_INSTALL_DIR
- AKONADI_INCLUDE_DIR
- KF5Akonadi_DATA_DIR
)
install(FILES
install(
diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
index bcf7320..1574319 100644
index 3d1214a5a..2865d1fce 100644
--- a/KPimAkonadiConfig.cmake.in
+++ b/KPimAkonadiConfig.cmake.in
@@ -1,10 +1,10 @@
@PACKAGE_INIT@
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
# set the directories
if(NOT AKONADI_INSTALL_DIR)
--
2.31.1
--
2.52.0