From 0e722df91b89847b24d3e2fa39485a0bdfbfba12 Mon Sep 17 00:00:00 2001
From: Frederick Stein <frederick.stein@chem.uzh.ch>
Date: Wed, 11 Jan 2023 10:56:00 +0100
Subject: [PATCH] Bump LibXC to version 6.1.0

We drop the patch because it was fixed in the given release.
---
 tools/toolchain/scripts/stage3/install_libxc.sh     |  7 ++-----
 .../scripts/stage3/libxc-6.0.0_mgga_xc_b97mv.patch  | 13 -------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 tools/toolchain/scripts/stage3/libxc-6.0.0_mgga_xc_b97mv.patch

diff --git a/tools/toolchain/scripts/stage3/install_libxc.sh b/tools/toolchain/scripts/stage3/install_libxc.sh
index eff502198b..41a4cecc59 100755
--- a/tools/toolchain/scripts/stage3/install_libxc.sh
+++ b/tools/toolchain/scripts/stage3/install_libxc.sh
@@ -6,8 +6,8 @@
 [ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0
 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")/.." && pwd -P)"
 
-libxc_ver="6.0.0"
-libxc_sha256="c2ca205a762200dfba2e6c9e8ca2061aaddc6b7cf42048859fe717a7aa07de7c"
+libxc_ver="6.1.0"
+libxc_sha256="a3aa16915942543031a5d9c4a92c439ce54249bdcda8c91c4e69e65329dc9a54"
 source "${SCRIPT_DIR}"/common_vars.sh
 source "${SCRIPT_DIR}"/tool_kit.sh
 source "${SCRIPT_DIR}"/signal_trap.sh
@@ -40,9 +40,6 @@ case "$with_libxc" in
       tar -xzf libxc-${libxc_ver}.tar.gz
       cd libxc-${libxc_ver}
 
-      # Fix missing comma at end of line in src/mgga_xc_b97mv.c
-      patch -p1 < "${SCRIPT_DIR}/stage3/libxc-${libxc_ver}_mgga_xc_b97mv.patch"
-
       # CP2K does not make use of fourth derivatives, so skip their compilation with --disable-lxc
       ./configure --prefix="${pkg_install_dir}" --libdir="${pkg_install_dir}/lib" --disable-lxc \
         > configure.log 2>&1 || tail -n ${LOG_LINES} configure.log
diff --git a/tools/toolchain/scripts/stage3/libxc-6.0.0_mgga_xc_b97mv.patch b/tools/toolchain/scripts/stage3/libxc-6.0.0_mgga_xc_b97mv.patch
deleted file mode 100644
index 02446f697c..0000000000
--- a/tools/toolchain/scripts/stage3/libxc-6.0.0_mgga_xc_b97mv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/mgga_xc_b97mv.c b/src/mgga_xc_b97mv.c
-index 111319f57..b68dea598 100644
---- a/src/mgga_xc_b97mv.c
-+++ b/src/mgga_xc_b97mv.c
-@@ -17,7 +17,7 @@ typedef struct {
- 
- #define N_PAR 15
- static const char  *names[N_PAR]  = {
--  "_cx00",  "_cx01",  "_cx02", "_cx10", "_cx11"
-+  "_cx00",  "_cx01",  "_cx02", "_cx10", "_cx11",
-   "_css00", "_css02", "_css10", "_css32", "_css42",
-   "_cos00", "_cos01", "_cos03", "_cos10", "_cos32"};
- static const char  *desc[N_PAR]   = {