(#23960) gdcm: add 3.0.24 and update util-linux-libuuid

* gdcm: add 3.0.24 and update util-linux-libuuid * Add 3.0.24 to config.yml
conan-io · Jun 5, 2024 · 1e04a04 · 1e04a04
1 parent f689f80
commit 1e04a04
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/recipes/gdcm/all/conandata.yml b/recipes/gdcm/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.0.24":
+    url: "https://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%203.0.24/gdcm-3.0.24.tar.bz2"
+    sha256: "c672bb6caa83ac937e5e1595e0f809bc65cbc1d516ab6363156a49548f1e51f1"
   "3.0.23":
     url: "https://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%203.0.23/gdcm-3.0.23.tar.bz2"
     sha256: "711d155ae4ad84a99a38f3b705b5243da346360232c85fe3e2ca575e57e372a1"
@@ -15,6 +18,25 @@ sources:
     url: "https://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%203.0.9/gdcm-3.0.9.tar.bz2"
     sha256: "1d518b0e4709cecfb7330c9bd9b3a73cfd01ffe70d1c178f36a4c847283c4672"
 patches:
+  "3.0.24":
+    - patch_file: "patches/0002-3.0.23-openjpeg.patch"
+      patch_description: "fix variable names for openjpeg"
+      patch_type: "conan"
+    - patch_file: "patches/0004-3.0.23-find-expat.patch"
+      patch_description: "enforce usage of FindEXPAT.cmake"
+      patch_type: "conan"
+    - patch_file: "patches/0005-3.0.20-openssl.patch"
+      patch_description: "skip check_cxx_source_compiles usage for openssl"
+      patch_type: "conan"
+    - patch_file: "patches/0006-3.0.24-json.patch"
+      patch_description: "skip check_cxx_source_compiles usage for json-c"
+      patch_type: "conan"
+    - patch_file: "patches/0007-3.0.23-find-json.patch"
+      patch_description: "fix find_package for json-c"
+      patch_type: "conan"
+    - patch_file: "patches/0008-3.0.23-find-libuuid.patch"
+      patch_description: "fix find_package for libuuid"
+      patch_type: "conan"
   "3.0.23":
     - patch_file: "patches/0002-3.0.23-openjpeg.patch"
       patch_description: "fix variable names for openjpeg"

diff --git a/recipes/gdcm/all/conanfile.py b/recipes/gdcm/all/conanfile.py
@@ -64,7 +64,7 @@ def requirements(self):
         else:
             self.requires("zlib/[>=1.2.11 <2]")
         if self.settings.os != "Windows":
-            self.requires("util-linux-libuuid/2.39")
+            self.requires("util-linux-libuuid/2.39.2")
             if Version(self.version) >= Version("3.0.20"):
                 self.requires("libiconv/1.17")
         if self.options.with_json:

diff --git a/recipes/gdcm/all/patches/0006-3.0.24-json.patch b/recipes/gdcm/all/patches/0006-3.0.24-json.patch
@@ -0,0 +1,13 @@
+--- a/Source/Common/CMakeLists.txt
++++ b/Source/Common/CMakeLists.txt
+@@ -52,9 +52,7 @@ unset(CMAKE_REQUIRED_LIBRARIES)
+ CHECK_SYMBOL_EXISTS(gettimeofday "sys/time.h" GDCM_HAVE_GETTIMEOFDAY)
+ # json-c API changed:
+ if(GDCM_USE_SYSTEM_JSON)
+-  set(CMAKE_REQUIRED_INCLUDES ${JSON_INCLUDE_DIRS})
+-  set(CMAKE_REQUIRED_LIBRARIES ${JSON_LIBRARIES})
+-  CHECK_SYMBOL_EXISTS(json_object_object_get_ex "json.h" GDCM_HAVE_JSON_OBJECT_OBJECT_GET_EX)
++  set(GDCM_HAVE_JSON_OBJECT_OBJECT_GET_EX ON CACHE INTERNAL "")
+ endif()
+
+ include(CheckCXXSourceCompiles)
diff --git a/recipes/gdcm/config.yml b/recipes/gdcm/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.0.24":
+    folder: "all"
   "3.0.23":
     folder: "all"
   "3.0.22":