From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 From: gnidorah 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 089d570458874e5b5'>root/gnu/services/dns.scm
AgeCommit message (Expand)Author
2020-01-22services: knot-resolver: Manage a root TA at /var/cache/knot-resolver....* gnu/services/dns.scm (%kresd.conf): Add /var/cache/knot-resolver/root.keys as the root TA. 宋文武
2019-11-11services: Add knot-resolver-service-type....* gnu/services/dns.scm (<knot-resolver-configuration>): New record type. (knot-resolver-activation, knot-resolver-shpherd-services): New procedures. (%knot-resolver-accounts, %kresd.conf, knot-resolver-service-type): New variables. * doc/guix.texi (DNS Services): Document it. 宋文武
2019-04-27gnu: knot: Fix typos....* gnu/services/dns.scm: Fix typos. Julien Lepiller
2019-04-27gnu: knot: Add configuration fields....* gnu/services/dns.scm (knot-zone-configuration)[zonefile-load] [journal-content, max-journal-usage, max-journal-depth, max-zone-size]: New fields. (knot-zone-config): Serialize them. * doc/guix.texi (DNS Services): Document them. Julien Lepiller
2019-04-27services: knot: Fix configuration file generation....Fixes a regression introduced in 92eb600f8a94afa36142f8f145efaa485b632433. * gnu/services/dns.scm (knot-config-file): Add ungexp around call to 'knot-configuration-includes'. Ludovic Courtès
2019-04-26gnu: dns: Fix configuration formating....* gnu/services/dns.scm (format-string-list): Fix formating of lists with only one symbol. Julien Lepiller
2019-04-25gnu: knot-service: Add includes field in configuration....* gnu/services/dns.scm (knot-configuration): Add includes field. (verify-knot-configuration): Check includes content. (knot-config-file): Serialize includes. * doc/guix.texi (DNS Services): Document it. Julien Lepiller
2018-12-04services: ddclient: Fix unrecognized keywords....This patch fixes warnings about unrecognized keywords in logs. * gnu/services/dns.scm (serialize-field): Skip some field names. Oleg Pykhalov
2018-11-06gnu: services: dns: Fix 'ddclient-activation'....* gnu/services/dns.scm (ddclient-activation): Fix procedure. Oleg Pykhalov
2018-08-30services: Add ddclient service....* gnu/services/dns.scm (ddclient-configuration, ddclient-service-type): New variables. (uglify-field-name, serialize-field, serialize-boolean, serialize-integer, serialize-string, serialize-list, serialize-extra-options, ddclient-activation, ddclient-shepherd-service, generate-ddclient-documentation): New procedures. * doc/guix.texi (DNS Services): Document it. Oleg Pykhalov