From 8398966c95de5f983264de3ec97909267eb4ff8e Mon Sep 17 00:00:00 2001
From: Charles Ballard <charles.ballard@stfc.ac.uk>
Date: Mon, 4 Nov 2024 19:07:43 +0000
Subject: [PATCH] [4048] cootapi, use CCP4 rather than COOT_PREFIX
---
ccp4.xml | 1 +
patches/cootapi-coot-utils.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 patches/cootapi-coot-utils.patch
diff --git a/ccp4.xml b/ccp4.xml
index d045b0b6..dea274fa 100644
--- a/ccp4.xml
+++ b/ccp4.xml
@@ -2352,6 +2352,7 @@ install intltool libfontconfig1-dev libxrender-dev
checkoutdir="cootapi"
version="1.1.10">
<patch file="cootapi-cmake.patch" strip="1" />
+ <patch file="cootapi-coot-utils.patch" strip="0" />
<patch file="cootapi-msvc.patch" strip="0" />
</branch>
<dependencies>
diff --git a/patches/cootapi-coot-utils.patch b/patches/cootapi-coot-utils.patch
new file mode 100644
index 00000000..aa5b0c2f
--- /dev/null
+++ b/patches/cootapi-coot-utils.patch
@@ -0,0 +1,11 @@
+--- utils/coot-utils.cc.orig 2024-08-19 11:45:27.389045900 +0100
++++ utils/coot-utils.cc 2024-10-02 13:18:00.498768200 +0100
+@@ -959,7 +963,7 @@
+ if (env) {
+ pkgdatadir = std::string(env);
+ } else {
+- char *env = getenv("COOT_PREFIX");
++ char *env = getenv("CCP4");
+ if (env)
+ pkgdatadir = std::string(env) + std::string("/share/coot");
+ }
--
GitLab