Merge pull request #254 from vepadulano/6.32.02

6.32.02

recipe/meta.yaml

@@ -1,9 +1,9 @@
 {% set name = "root" %}
-{% set tag_name = "6-32-00" %}
+{% set tag_name = "6-32-02" %}
 {% set version = ".".join(tag_name.split("-")|map("int")|map("string")) %}
-{% set build_number = 2 %}
+{% set build_number = 0 %}
 {% set clang_version = "16.0.6" %}
-{% set clang_patches_version = "root_63200" %}
+{% set clang_patches_version = "root_63202" %}
 
 {% set builtin_pyroot = True %}
 {% set builtin_clang = False %}
@@ -26,7 +26,7 @@ source:
   git_rev: {{ os.environ["ROOT_CONDA_GIT_REV"] }}
 {%- else %}
   url: https://github.com/root-project/root/archive/refs/tags/v{{ tag_name }}.tar.gz
-  sha256: 3e497c8217b3ef629f339077f92d7ad377e5295611a2bf9faf0067566125c634
+  sha256: 332c763d2d5eb8a759893453637f24b3900476f73a1a4c7a205f8f7b3104f449
 {%- endif %}
   folder: root-source
   patches:
@@ -36,14 +36,12 @@ source:
     - patches/0001-Patch-for-apple-silicon.patch
     - patches/0001-Set-LLVM_REQUIRES_EH-for-Cling.patch
     - patches/disable-hsimple.root  # [build_platform != target_platform]
-    - patches/0001-core-Fallback-to-urandom-for-increased-compatibility.patch
-    - patches/0001-core-Link-clad-to-clang-only-if-target-available.patch
     - patches/0001-Reset-CMAKE-module-path-for-interpreter.patch
     - patches/0001-force-one-modulemap-for-darwin.patch  # [osx]
     - patches/0001-Remove-check-for-SDK-version-in-CIFactory.patch  # [osx]
     - patches/0001-avoid-linking-TPython-against-libPython.patch  # [osx]
 {% if not builtin_pyroot %}
-    - 0001-Support-standalone-pyroot.patch
+    - patches/0001-Support-standalone-pyroot.patch
 {% endif %}
 
 build:

recipe/patches/0001-Patch-for-apple-silicon.patch

@@ -1,14 +1,14 @@
-From d1e56d4a37eff018ddbb19df750f77ea1388ea13 Mon Sep 17 00:00:00 2001
+From b156b2c874bbcca3d160be87a0e1dced85034e62 Mon Sep 17 00:00:00 2001
 From: Vincenzo Eduardo Padulano <[email protected]>
-Date: Thu, 13 Jun 2024 16:23:27 +0200
+Date: Thu, 4 Jul 2024 11:43:29 +0200
 Subject: [PATCH] Patch for apple silicon
 
 ---
- cmake/modules/SearchInstalledSoftware.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ cmake/modules/SearchInstalledSoftware.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 109602f5e2..d4c4c7c66b 100644
+index 109602f5e2..9d75aa0f0a 100644
 --- a/cmake/modules/SearchInstalledSoftware.cmake
 +++ b/cmake/modules/SearchInstalledSoftware.cmake
 @@ -37,7 +37,7 @@ endif()
@@ -20,3 +20,12 @@ index 109602f5e2..d4c4c7c66b 100644
    else()
      message(STATUS "Cocoa option can only be enabled on MacOSX platform")
      set(cocoa OFF CACHE BOOL "Disabled because only available on MacOSX (${cocoa_description})" FORCE)
+@@ -114,7 +114,7 @@ if(NOT builtin_freetype)
+       set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR_freetype2})
+     else()
+       message(STATUS "FreeType not found. Switching on builtin_freetype option")
+-      set(builtin_freetype ON CACHE BOOL "Enabled because FreeType not found (${builtin_freetype_description})" FORCE)
++      set(builtin_freetype OFF CACHE BOOL "Enabled because FreeType not found (${builtin_freetype_description})" FORCE)
+     endif()
+   endif()
+ endif()