<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c8ada3ffc55de3d2a1719dedd7a9ca6d259a55d6">https://github.com/macports/macports-ports/commit/c8ada3ffc55de3d2a1719dedd7a9ca6d259a55d6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c8ada3ffc55de3d2a1719dedd7a9ca6d259a55d6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 9 05:40:22 2022 -0600

<span style='display:block; white-space:pre;color:#404040;'>    gdcm: Fix build on case-sensitive filesystems
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/60696
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/64765
</span>---
 science/gdcm/Portfile                  |  5 ++--
 science/gdcm/files/CharLS-2.1.0.patch  | 44 ++++++++++++++++++++++++++++++++++
 science/gdcm/files/gdcm_charls.h.patch | 11 ---------
 3 files changed, 47 insertions(+), 13 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gdcm/Portfile b/science/gdcm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27d7b2c5ef0..0cde8707b49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gdcm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gdcm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,10 @@ checksums               rmd160  300e08d5adbecbe2eaad8c2882532c8e0d84e590 \
</span> 
 compiler.cxx_standard   2014
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix error with CharLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix case mismatch with CharLS 2.1.0 and later
</span> # See: https://trac.macports.org/ticket/60696
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       gdcm_charls.h.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/64765
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       CharLS-2.1.0.patch
</span> 
 # fix error with newer Poppler
 patchfiles-append       patch-poppler.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gdcm/files/CharLS-2.1.0.patch b/science/gdcm/files/CharLS-2.1.0.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..15ae2edf388
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gdcm/files/CharLS-2.1.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix finding CharLS 2.1.0 and later on case-sensitive filesystems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/gdcm/bugs/505/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMake/FindCharLS.cmake.orig    2021-10-06 14:38:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMake/FindCharLS.cmake 2022-03-09 05:31:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,13 +6,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_path(CHARLS_INCLUDE_DIR CharLS/charls.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_path(CHARLS_INCLUDE_DIR charls/charls.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(CHARLS_LIBRARY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  NAMES CharLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  NAMES charls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PATHS /usr/lib /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2021-10-06 14:38:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2022-03-09 06:09:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,7 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(GDCM_USE_SYSTEM_CHARLS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  find_package(CharLS 2.0.0 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  find_package(CharLS 2.1.0 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(GDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(GDCM_CHARLS_LIBRARIES gdcmcharls)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/gdcm_charls.h.orig   2021-10-06 14:38:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/gdcm_charls.h        2022-03-09 06:06:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,8 +17,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Use the charls library configured for gdcm.  */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdcmTypes.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GDCM_USE_SYSTEM_CHARLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// It is expected that version 2.0.0 is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <CharLS/charls.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// It is expected that version 2.1.0 or later is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <charls/charls.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdcmcharls/charls.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gdcm/files/gdcm_charls.h.patch b/science/gdcm/files/gdcm_charls.h.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3fdb2389acf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gdcm/files/gdcm_charls.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/gdcm_charls.h.orig   2020-02-18 07:11:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/gdcm_charls.h        2021-11-29 11:32:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gdcmTypes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GDCM_USE_SYSTEM_CHARLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // It is expected that version 2.0.0 is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <CharLS/charls.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <charls/charls.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gdcmcharls/charls.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>

</pre>