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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e8cc81..63161b7 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"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
-              AKONADI_INCLUDE_DIR
-              KF5Akonadi_DATA_DIR
 )

 install(FILES
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
index bcf7320..1574319 100644
--- a/KF5AkonadiConfig.cmake.in
+++ b/KF5AkonadiConfig.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
/td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/examples/desktop.tmpl'>
<input type='hidden' name='id' value='8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0'>root</a>/<a href='/guix/log/gnu?id=8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0'>gnu</a>/<a href='/guix/log/gnu/system?id=8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0'>system</a>/<a href='/guix/log/gnu/system/examples?id=8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0'>examples</a>/<a href='/guix/log/gnu/system/examples/desktop.tmpl?id=8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0'>desktop.tmpl</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/system/examples/desktop.tmpl?id=8af9a2aa5fa2fa5b00234c1cbe12e9aff60888a0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-16 23:42:17 -0500'>2022-12-16</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=491bddfa276cc9775adf325c07e5f82638f330e7'>system: examples: Add mode prop line.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/asus-c201.tmpl: Add a mode prop line.
* gnu/system/examples/bare-bones.tmpl: Likewise.
* gnu/system/examples/beaglebone-black.tmpl: Likewise.
* gnu/system/examples/desktop.tmpl: Likewise.
* gnu/system/examples/docker-image.tmpl: Likewise.
* gnu/system/examples/lightweight-desktop.tmpl: Likewise.
* gnu/system/examples/raspberry-pi-64-nfs-root.tmpl: Likewise.
* gnu/system/examples/raspberry-pi-64.tmpl: Likewise.
* gnu/system/examples/vm-image.tmpl: Likewise.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-01-05 21:46:41 +0100'>2022-01-05</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=0fea9aec59f8f328c269d585d849a8f954e39aae'>doc: Only use GDM and GNOME on x86_64.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/desktop.tmpl: Only use gnome-desktop-service-type and
the default login manager in set-xorg-configuration when the target system is
x86_64.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2021-12-19 23:39:55 +0100'>2021-12-19</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=9c42d1fa0023849f4cc62cea73469a08c1ab1fdd'>doc: Add group configuration example</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/desktop.tmpl: Add group configuration example.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Denis 'GNUtoo' Carikli</td></tr>
<tr><td><span title='2021-11-23 10:24:28 +0100'>2021-11-23</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=9685c0637decec77880cec65547a2e57c300761a'>doc: Add new Swap Space section.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi (operating-system Reference): Update swap-devices.
* doc/guix.texi (Swap Space): Add it.
* gnu/system/examples/desktop.tmpl: Add swap-devices example.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=da4e40948326387d5bcda58783914d5f9ce8b095'>Migrate to the new 'targets' field of bootloader-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>The old 'target' field is deprecated; adjust the sources to use the new
'targets' one instead.

* doc/guix-cookbook.texi&lt;target&gt;: Replace by 'targets'.
* gnu/bootloader/grub.scm: Likewise.
* gnu/installer/parted.scm: Likewise.
* gnu/machine/digital-ocean.scm: Likewise.
* gnu/system/examples/asus-c201.tmpl: Likewise
* gnu/system/examples/bare-bones.tmpl: Likewise
* gnu/system/examples/bare-hurd.tmpl: Likewise
* gnu/system/examples/beaglebone-black.tmpl: Likewise
* gnu/system/examples/desktop.tmpl: Likewise
* gnu/system/examples/docker-image.tmpl: Likewise
* gnu/system/examples/lightweight-desktop.tmpl: Likewise
* gnu/system/examples/vm-image.tmpl: Likewise
* gnu/system/examples/yggdrasil.tmpl: Likewise
* gnu/system/hurd.scm: Likewise
* gnu/system/images/hurd.scm: Likewise
* gnu/system/images/novena.scm: Likewise
* gnu/system/images/pine64.scm: Likewise
* gnu/system/images/pinebook-pro.scm: Likewise
* gnu/system/images/rock64.scm: Likewise
* gnu/system/install.scm: Likewise
* gnu/system/vm.scm: Likewise
* gnu/tests.scm: Likewise
* gnu/tests/ganeti.scm: Likewise
* gnu/tests/install.scm: Likewise
* gnu/tests/nfs.scm: Likewise
* gnu/tests/telephony.scm: Likewise
* tests/boot-parameters.scm: Likewise
* tests/system.scm: Likewise
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-07-29 07:50:23 +0300'>2020-07-29</span></td><td><a href='/guix/commit/gnu/system/examples/desktop.tmpl?id=03914b9d8cc5918f495d1abeb97d783c8fc25fd7'>examples: Add password for Alice's brother.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/examples/desktop.tmpl (users)[bob]: Add password.
</span></span></td><td>Oleg Pykhalov</td></tr>