<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7390c3b1e6a65c5134ba31a3091b5d6a30bb8241">https://github.com/macports/macports-ports/commit/7390c3b1e6a65c5134ba31a3091b5d6a30bb8241</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7390c3b1e6a y
</span>7390c3b1e6a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7390c3b1e6a65c5134ba31a3091b5d6a30bb8241
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Feb 27 06:55:36 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> y
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> gdcm: update to 3.0.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60697
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60696
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64033
</span>---
science/gdcm/Portfile | 40 ++++++++++++++++-------------
science/gdcm/files/gdcm_charls.h.patch | 11 ++++++++
science/gdcm/files/patch-poppler.diff | 22 +++++++++++-----
science/gdcm/files/patch-poppler_const.diff | 40 -----------------------------
4 files changed, 48 insertions(+), 65 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 36bb17fe4c7..27d7b2c5ef0 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;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
name gdcm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science graphics
license BSD
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,21 +16,18 @@ long_description Grassroots DiCoM is a C++ library for DICOM medical file
</span> homepage https://sourceforge.net/projects/gdcm/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3150b9dc8219baedec372463992d380432ab7620 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f1f32ba553ed5df0d9251427a824e4646d7d47dbdfb3afef0c9c3b5b677a2c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3862334
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 300e08d5adbecbe2eaad8c2882532c8e0d84e590 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bc207c9d694009d5af5d29cfc3c102422d94cb7cd458127f134dd92a064d60f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3873112
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset applications]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # poppler requires C++14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix error with CharLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/60696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append gdcm_charls.h.patch
</span>
# fix error with newer Poppler
patchfiles-append patch-poppler.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix another error with newer Poppler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-poppler_const.diff
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +40,12 @@ depends_lib-append port:zlib \
</span> port:charls \
port:vtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DGDCM_BUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_CXX_STANDARD=14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_BUILD_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_BUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_BUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_DOCUMENTATION=OFF \
</span> -DGDCM_USE_SYSTEM_ZLIB=ON \
-DGDCM_USE_SYSTEM_OPENSSL=ON \
-DGDCM_USE_SYSTEM_UUID=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +56,11 @@ configure.args-append -DGDCM_BUILD_SHARED_LIBS=ON \
</span> -DGDCM_USE_SYSTEM_LJPEG=OFF \
-DGDCM_USE_SYSTEM_OPENJPEG=ON \
-DGDCM_USE_SYSTEM_CHARLS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGDCM_USE_VTK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_USE_VTK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_WRAP_CSHARP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_WRAP_JAVA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_WRAP_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPJ_USE_DSYMUTIL=OFF
</span>
variant applications description {build Application} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,8 +68,7 @@ variant applications description {build Application} {
</span> port:libxml2
configure.args-append -DGDCM_BUILD_APPLICATIONS=ON \
-DGDCM_USE_SYSTEM_POPPLER=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGDCM_USE_SYSTEM_LIBXML2=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_STANDARD=14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDCM_USE_SYSTEM_LIBXML2=ON
</span> }
# installation seems to hang
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3fdb2389acf
</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/gdcm_charls.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/gdcm_charls.h.orig 2020-02-18 07:11:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/gdcm_charls.h 2021-11-29 11:32:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</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;'>++# 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/patch-poppler.diff b/science/gdcm/files/patch-poppler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ffa180c462..1b3d88aaf4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gdcm/files/patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gdcm/files/patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,31 +9,39 @@
</span> LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
set(libpoppler_flags)
if(LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Applications/Cxx/gdcmpdf.cxx.orig 2019-07-22 07:36:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Applications/Cxx/gdcmpdf.cxx 2019-12-21 09:13:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,9 +337,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Applications/Cxx/gdcmpdf.cxx.orig 2021-10-06 14:38:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Applications/Cxx/gdcmpdf.cxx 2022-02-27 06:05:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -345,12 +345,12 @@
</span> ownerPW = NULL;
userPW = NULL;
#ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
- globalParams = new GlobalParams(0);
+ globalParams = std::make_unique<GlobalParams>(nullptr);
#else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LIBPOPPLER_GLOBALPARAMS_HAS_RESET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globalParams.reset(new GlobalParams());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span> - globalParams = new GlobalParams();
+ globalParams = std::make_unique<GlobalParams>();
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> #endif
uMap = globalParams->getTextEncoding();
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Applications/Cxx/gdcminfo.cxx.orig 2019-07-22 07:36:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Applications/Cxx/gdcminfo.cxx 2019-12-21 09:14:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -511,9 +511,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Applications/Cxx/gdcminfo.cxx.orig 2021-10-06 14:38:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Applications/Cxx/gdcminfo.cxx 2022-02-27 06:07:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -519,12 +519,12 @@
</span> UnicodeMap *uMap;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
- globalParams = new GlobalParams(0);
+ globalParams = std::make_unique<GlobalParams>(nullptr);
#else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LIBPOPPLER_GLOBALPARAMS_HAS_RESET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globalParams.reset(new GlobalParams());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span> - globalParams = new GlobalParams();
+ globalParams = std::make_unique<GlobalParams>();
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> #endif
uMap = globalParams->getTextEncoding();
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gdcm/files/patch-poppler_const.diff b/science/gdcm/files/patch-poppler_const.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd9699fa981..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gdcm/files/patch-poppler_const.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Applications/Cxx/gdcminfo.cxx.orig 2020-04-05 17:07:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Applications/Cxx/gdcminfo.cxx 2020-04-05 17:18:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +258,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return out;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static std::string getInfoString(Dict *infoDict, const char *key, const UnicodeMap *uMap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object obj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef LIBPOPPLER_GOOSTRING_HAS_CONSTGETCHAR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -509,7 +509,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string creationdate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string moddate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UnicodeMap *uMap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const UnicodeMap *uMap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- globalParams = std::make_unique<GlobalParams>(nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Applications/Cxx/gdcmpdf.cxx.orig 2020-04-05 17:07:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Applications/Cxx/gdcmpdf.cxx 2020-04-05 17:19:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,7 +106,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return out;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, bool & unicode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static std::string getInfoString(Dict *infoDict, const char *key, const UnicodeMap *uMap, bool & unicode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object obj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef LIBPOPPLER_GOOSTRING_HAS_CONSTGETCHAR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -333,7 +333,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooString *fileName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PDFDoc *doc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UnicodeMap *uMap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const UnicodeMap *uMap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ownerPW = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- userPW = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
</span></pre><pre style='margin:0'>
</pre>