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
'get' action='/guix/log/gnu/installer/keymap.scm'>
<input type='hidden' name='id' value='8bc31f951b438d569756af6c432ee6100d0ffa05'/><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=8bc31f951b438d569756af6c432ee6100d0ffa05'>root</a>/<a href='/guix/log/gnu?id=8bc31f951b438d569756af6c432ee6100d0ffa05'>gnu</a>/<a href='/guix/log/gnu/installer?id=8bc31f951b438d569756af6c432ee6100d0ffa05'>installer</a>/<a href='/guix/log/gnu/installer/keymap.scm?id=8bc31f951b438d569756af6c432ee6100d0ffa05'>keymap.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/installer/keymap.scm?id=8bc31f951b438d569756af6c432ee6100d0ffa05&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-09-21 20:35:49 +0000'>2021-09-21</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=d58e52b0713648dd30d41b41277854a935d8d15a'>installer: keymap: Fix optional fields handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes: &lt;https://issues.guix.gnu.org/50723&gt;.

The keymap xml contains optional shortDescription and description fields. The
assoc-ref call on those fields can return false, handle it correctly.

* gnu/installer/keymap.scm (xkb-rules-&gt;models+layouts): Introduce a new
"maybe-empty" helper to deal with optional fields. Use it for shortDescription
and description fields.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-04-09 02:42:54 +0000'>2020-04-09</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=91c231a2223440081426929828a23c7baa0214fd'>installer: Allow Alt+Shift toggle from non-Latin keyboard layouts.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/40493&gt;.

* gnu/installer/newt/keymap.scm (%non-latin-layouts): New variable.
(%non-latin-variants): New variable.
(%latin-layout+variants): New variable.
(toggleable-latin-layout): New procedure to compute combined layouts.
(run-keymap-page): Use it.
(keyboard-layout-&gt;configuration): Apply it in config.scm.
(run-layout-page): Mention Alt+Shift.
* gnu/installer/keymap.scm (kmscon-update-keymap): Pass on XKB options.
* gnu/installer/record.scm (&lt;installer&gt;): Adjust code comments.
* gnu/installer.scm (apply-keymap): Pass on XKB options.
(installer-steps): Adjust code comments.
* gnu/packages/patches/kmscon-runtime-keymap-switch.patch: Apply XKB options.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2019-04-17 15:13:31 +0200'>2019-04-17</span></td><td><a href='/guix/commit/gnu/installer/keymap.scm?id=818595a974a3fc9caa7edd8a4f19d5485c91caba'>installer: Parse the 'shortDescription' field from xkeyboard-config.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/keymap.scm (&lt;x11-keymap-layout&gt;)[synopsis]: New field.
(xkb-rules-&gt;models+layouts): Fill out the 'synopsis' field.
</span></span></td><td>Ludovic Courtès</td></tr>