From 79b0816e173b973ce03f46bfd91a0859b5e301e8 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 10 Apr 2020 14:55:31 +0200
Subject: gnu: akonadi: Shorten file name of patch.
This ensures we stay below the POSIX tar file name length limit.
* gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch:
Rename to...
* gnu/packages/patches/akonadi-not-relocatable.patch: ... this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/kde-pim.scm (akonadi): Likewise.
---
gnu/packages/kde-pim.scm | 2 +-
...di-Revert-Make-installation-properly-relo.patch | 49 ----------------------
gnu/packages/patches/akonadi-not-relocatable.patch | 49 ++++++++++++++++++++++
3 files changed, 50 insertions(+), 50 deletions(-)
delete mode 100644 gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch
create mode 100644 gnu/packages/patches/akonadi-not-relocatable.patch
(limited to 'gnu/packages')
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 1b99ae1de4..fea6dd3068 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -53,7 +53,7 @@ (define-public akonadi
(patches (search-patches
"akonadi-paths.patch"
"akonadi-timestamps.patch"
- "akonadi-Revert-Make-installation-properly-relo.patch"))))
+ "akonadi-not-relocatable.patch"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
diff --git a/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch b/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch
deleted file mode 100644
index c3964c5c05..0000000000
--- a/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/gnu/packages/patches/akonadi-not-relocatable.patch b/gnu/packages/patches/akonadi-not-relocatable.patch
new file mode 100644
index 0000000000..c3964c5c05
--- /dev/null
+++ b/gnu/packages/patches/akonadi-not-relocatable.patch
@@ -0,0 +1,49 @@
+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
--
cgit v1.2.3