From 527915a2ca695a8dd25380e7cbf7a300d9197089 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 28 Mar 2025 11:37:11 +0100 Subject: [PATCH 1/3] fixed conda build --- conda-recipe/conda_build_config.yaml | 6 ++++++ conda-recipe/meta.yaml | 30 +++++++--------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index 0f51da017..6e37cf5c5 100644 --- a/conda-recipe/conda_build_config.yaml +++ b/conda-recipe/conda_build_config.yaml @@ -6,3 +6,9 @@ python: - 3.12 - 3.13 + +c_stdlib: + - sysroot # [linux] + +c_stdlib_version: # [linux] + - 2.17 # [linux] diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 076e37ebc..61ed55e94 100755 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -15,36 +15,19 @@ build: requirements: build: - {{ compiler('c') }} + - {{stdlib('c')}} - {{compiler('cxx')}} - cmake + - ninja - qt 5.* - - xorg-libx11 - - xorg-libice - - xorg-libxext - - xorg-libsm - - xorg-libxau - - xorg-libxrender - - xorg-libxfixes - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-libegl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - - expat host: - libstdcxx-ng - libgcc-ng - - xorg-libx11 - - xorg-libice - - xorg-libxext - - xorg-libsm - - xorg-libxau - - xorg-libxrender - - xorg-libxfixes - - expat - + - libgl-devel + - libtiff + - zlib + run: - libstdcxx-ng - libgcc-ng @@ -123,3 +106,4 @@ outputs: run: - {{ pin_subpackage('slsdetlib', exact=True) }} - expat + From 6839315a7c67d2c13b84b92aaf4a0511a0fcc824 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 28 Mar 2025 11:38:50 +0100 Subject: [PATCH 2/3] release date --- RELEASE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.txt b/RELEASE.txt index ff6aa51fb..aec864ed6 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,4 +1,4 @@ -SLS Detector Package Minor Release 9.1.0 released on 26.03.2025 +SLS Detector Package Minor Release 9.1.0 released on 28.03.2025 =============================================================== This document describes the differences between v9.1.0 and v9.0.0 From 7ac18fbad9319cd13f467f6290a840346d825a7c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 28 Mar 2025 14:21:56 +0100 Subject: [PATCH 3/3] update cmake<=3.28 in conda build requirements --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 61ed55e94..b6523a7e6 100755 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -17,7 +17,7 @@ requirements: - {{ compiler('c') }} - {{stdlib('c')}} - {{compiler('cxx')}} - - cmake + - cmake<=3.28 - ninja - qt 5.*