From eb74b87d0322d6bd68d06c08c48a370df8a771b3 Mon Sep 17 00:00:00 2001
From: thomashampson <thomas.hampson@stfc.ac.uk>
Date: Thu, 30 Oct 2025 14:35:00 +0000
Subject: [PATCH 1/2] Pin pillow to avoid allocator mismatch (#40248)

### Description of work

Pin pillow to avoid allocator mismatch

Closes #40244
---
 conda/recipes/conda_build_config.yaml      | 3 +++
 conda/recipes/mantid-developer/recipe.yaml | 1 +
 conda/recipes/mantid/recipe.yaml           | 1 +
 3 files changed, 5 insertions(+)

diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml
index 05da5ca46c29..f2c9eaae5b05 100644
--- a/conda/recipes/conda_build_config.yaml
+++ b/conda/recipes/conda_build_config.yaml
@@ -102,6 +102,9 @@ sphinx_bootstrap_theme:
 scipy:
   - '>=1.10.0'
 
+pillow:
+  - '<12.0.0'
+
 pip:
   - '>=21.0.1'
 
diff --git a/conda/recipes/mantid-developer/recipe.yaml b/conda/recipes/mantid-developer/recipe.yaml
index 69a998e85c4e..38aa45e98aef 100644
--- a/conda/recipes/mantid-developer/recipe.yaml
+++ b/conda/recipes/mantid-developer/recipe.yaml
@@ -32,6 +32,7 @@ requirements:
     - ninja ${{ ninja }}
     - numpy ${{ numpy }}
     - occt ${{ occt }}
+    - pillow ${{ pillow }}
     - pip ${{ pip }}
     - poco ${{ poco }}
     - psutil ${{ psutil }}
diff --git a/conda/recipes/mantid/recipe.yaml b/conda/recipes/mantid/recipe.yaml
index 3517f3e83c29..456359fc72a0 100644
--- a/conda/recipes/mantid/recipe.yaml
+++ b/conda/recipes/mantid/recipe.yaml
@@ -97,6 +97,7 @@ requirements:
     - ${{ pin_subpackage('mantid', upper_bound='x.x.x') }}
   run_constraints:
     - matplotlib-base ${{ matplotlib }}
+    - pillow ${{ pillow }}
     - pystog ${{ pystog }}
 
 tests:

From 87b1b2f2507be4e0a1d2874df18819570b638921 Mon Sep 17 00:00:00 2001
From: thomashampson <thomas.hampson@stfc.ac.uk>
Date: Thu, 16 Oct 2025 16:46:09 +0100
Subject: [PATCH 2/2] Fix the nightly docs publishing script (#40127)

### Description of work
I copied this line from the mantiddocs recipe and it seems to fix the
segfault.

### To test:
I ran this branch here and it succeeded:
https://builds.mantidproject.org/job/build_and_publish_docs/378/


*This does not require release notes* because it is a build script
---
 buildconfig/Jenkins/build_and_publish_docs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildconfig/Jenkins/build_and_publish_docs.sh b/buildconfig/Jenkins/build_and_publish_docs.sh
index f692319c0d5e..4fdfc9000563 100755
--- a/buildconfig/Jenkins/build_and_publish_docs.sh
+++ b/buildconfig/Jenkins/build_and_publish_docs.sh
@@ -18,6 +18,8 @@ mamba install -c ${CONDA_LABEL} -c neutrons --yes mantid-developer mantidqt rsyn
 rm -rf build
 mkdir build && cd build
 
+# unset LD_PRELOAD as this causes cmake to segfault
+LD_PRELOAD="" \
 # Generate build files
 cmake -G Ninja \
   -DMANTID_FRAMEWORK_LIB=SYSTEM \