guix_mirror_bot pushed a commit to branch kde-team
in repository guix.

commit ffb31ec0ccbf1aa85f0fcab383809694c17de7ca
Author: Sughosha <[email protected]>
AuthorDate: Fri May 8 06:08:15 2026 +0530

    gnu: akonadi: Update to 26.04.1.
    
    * gnu/packages/kde-pim.scm (akonadi): Update to 26.04.1.
    [source]<patches>: Remove "akonadi-not-relocatable.patch".
    [inputs]: Remove kwindowsystem.
    * gnu/packages/patches/akonadi-not-relocatable.patch: Remove file.
    * gnu/local.mk: Deregister it.
    
    Change-Id: I83368fb3dbe50ccaf411f20831f7c21de3471a47
---
 gnu/local.mk                                       |  1 -
 gnu/packages/kde-pim.scm                           |  8 ++--
 gnu/packages/patches/akonadi-not-relocatable.patch | 46 ----------------------
 3 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 3600d7bb2d..00382d453d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1001,7 +1001,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/agg-am_c_prototype.patch                        \
   %D%/packages/patches/agg-2.5-gcc8.patch                      \
   %D%/packages/patches/akonadi-paths.patch             \
-  %D%/packages/patches/akonadi-not-relocatable.patch           \
   %D%/packages/patches/akonadi-timestamps.patch                \
   %D%/packages/patches/alure-dumb-2.patch                      \
   %D%/packages/patches/amd-smi-newer-libdrm.patch              \
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 7a47f93185..5125d4afa8 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -176,17 +176,16 @@ multi-floor indoor maps.")
 (define-public akonadi
   (package
     (name "akonadi")
-    (version "25.12.3")
+    (version "26.04.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/"
                                   version "/src/akonadi-" version ".tar.xz"))
               (sha256
                (base32
-                "0ah6f0d9jm6ipbkwh753by90lp09gmw6pp56svs00zsl35icm138"))
+                "0fj5npjz20mm8b037j3a152ngm5prf6766ghlx59y87lzcdnfphk"))
               (patches (search-patches "akonadi-paths.patch"
-                                       "akonadi-timestamps.patch"
-                                       "akonadi-not-relocatable.patch"))))
+                                       "akonadi-timestamps.patch"))))
     (build-system qt-build-system)
     (native-inputs
      (list dbus
@@ -203,7 +202,6 @@ multi-floor indoor maps.")
            kio
            kitemviews
            kwidgetsaddons
-           kwindowsystem
            libxml2
            libxslt
            ;; Do NOT add mysql or postgresql to the inputs. Otherwise the 
binaries
diff --git a/gnu/packages/patches/akonadi-not-relocatable.patch 
b/gnu/packages/patches/akonadi-not-relocatable.patch
deleted file mode 100644
index 7e87cedd3c..0000000000
--- a/gnu/packages/patches/akonadi-not-relocatable.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c71418d39d5cc0af58548a8885b799efe032c9e3 Mon Sep 17 00:00:00 2001
-From: Sughosha <[email protected]>
-Date: Tue, 16 Dec 2025 08:39:32 +0530
-Subject: [PATCH] revert make relocatable
-
----
- CMakeLists.txt             | 4 ----
- KPimAkonadiConfig.cmake.in | 6 +++---
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c65b2671b..d93ba08f7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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
- )
- 
- install(
-diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
-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.52.0
-

Reply via email to