From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 22 Dec 2017 17:36:03 +0300
Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"

This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
---
 CMakeLists.txt            | 3 ---
 KF5AkonadiConfig.cmake.in | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: akonadi-19.08.0/CMakeLists.txt
===================================================================
--- akonadi-19.08.0.orig/CMakeLists.txt
+++ akonadi-19.08.0/CMakeLists.txt
@@ -306,9 +306,6 @@ configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
-              AKONADI_INCLUDE_DIR
-              KF5Akonadi_DATA_DIR
 )
 
 install(FILES
Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
===================================================================
--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in
+++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in
@@ -26,8 +26,8 @@ if(BUILD_TESTING)
     find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
 endif()
 
-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@")
 
 find_dependency(Boost "@Boost_MINIMUM_VERSION@")
 
@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako
 include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
 
 # 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@")
 
 ####################################################################################
 # CMAKE_AUTOMOC
c05dc1dd5674d60cd3b55d77b35c9d9'>root</a>/<a href='/guix/log/gnu?id=642769707c05dc1dd5674d60cd3b55d77b35c9d9'>gnu</a>/<a href='/guix/log/gnu/services?id=642769707c05dc1dd5674d60cd3b55d77b35c9d9'>services</a>/<a href='/guix/log/gnu/services/avahi.scm?id=642769707c05dc1dd5674d60cd3b55d77b35c9d9'>avahi.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/avahi.scm?id=642769707c05dc1dd5674d60cd3b55d77b35c9d9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-11-18 15:44:39 +0100'>2022-11-18</span></td><td><a href='/guix/commit/gnu/services/avahi.scm?id=8d9647d8a77a67013c48166561134d92b5224264'>services: Add Shepherd 'configuration' action to various services.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/avahi.scm (avahi-shepherd-service): Add 'actions' field.
* gnu/services/base.scm (nscd-actions): Add call to
'shepherd-configuration-action'.
* gnu/services/desktop.scm (upower-shepherd-service): Add 'actions'
field.
(elogind-shepherd-service): Likewise.
* gnu/services/dict.scm (dicod-shepherd-service): Likewise.
* gnu/services/networking.scm (openntpd-shepherd-service): Likewise.
(tor-shepherd-service): Likewise.
* gnu/services/ssh.scm (openssh-shepherd-service): Likewise.
* gnu/services/web.scm (nginx-shepherd-service): Likewise.
* gnu/services/xorg.scm (gdm-shepherd-service): Likewise.
* gnu/tests/base.scm (run-basic-test)["nscd configuration action"]: New
test.
* doc/guix.texi (Services): Document it.
</span></span></td><td>Ludovic Courtès</td></tr>