<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce6c64e2568cbaa84e3860830edeb991291817dc">https://github.com/macports/macports-ports/commit/ce6c64e2568cbaa84e3860830edeb991291817dc</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 ce6c64e dcmtk: Update to latest version + upstream patch.
</span>ce6c64e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce6c64e2568cbaa84e3860830edeb991291817dc
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Tue Nov 15 14:34:02 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> dcmtk: Update to latest version + upstream patch.
</span>---
graphics/dcmtk/Portfile | 15 +++---
graphics/dcmtk/files/ofvriant.patch | 62 ++++++++++++++++++++++++
graphics/dcmtk/files/patch-config-configure.diff | 20 --------
3 files changed, 69 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/Portfile b/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f0982f..e461b34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup cmake 1.0
</span> # 3.6.0 is almost 4 years old, with no 3.6.1 "release" in sight. Moving to
# snapshot for support of Yosemite as well as numerous bug fixes / updates.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.1_20160630
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.1_20161102
</span> revision 0
#set unpatched_version [lindex [split ${version} _] 0]
#set stripped_version [string map {. ""} ${unpatched_version}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +45,14 @@ master_sites http://dicom.offis.de/download/dcmtk/snapshot/ \
</span> distname ${name}-${version}
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 52736eaf670709c5f3f520ffdd1bba91fb506883 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7dacf0e704f9b5a3a92bd40f1391be3e4473c06c0adb4dbf5855b5c5ddc5f12a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e34c5e271959fbc8391777cfb901655f4e132dbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 657adb3811e0c5c08d8f143a6d878afcd92fac7dcf0d3c89860eecffd5a1a873
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles ofvriant.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.blacklist *gcc* {clang < 137}
# There have been issues with build grabbing old headers from installed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,14 +76,10 @@ configure.args-append -DDCMTK_WITH_TIFF=OFF \
</span> -DDCMTK_USE_CXX11_STL=OFF
variant doc description "Install documentation" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:graphviz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:doxygen
</span> build.target-append DOXYGEN
configure.args-delete -DDCMTK_WITH_DOXYGEN=OFF
configure.args-append -DDCMTK_WITH_DOXYGEN=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s/^(HAVE_DOT.*)NO/\\1YES/" doxygen/htmldocs.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant private description "Install private tags dictionary" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/ofvriant.patch b/graphics/dcmtk/files/ofvriant.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4f1abbf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/dcmtk/files/ofvriant.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b7b5503b8e7845b36945af7e4d444268edb5561a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jan Schlamelcher <dicom@offis.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 10 Nov 2016 12:24:05 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Enhanced C++11 compliance of OFvariant.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Moved a type definition from the inside of a constexpr function to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+enclosing class, since this is only allowed by C++14 and later but not C++11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixed potentially too weak alignment specifier used while determining the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+common alignment of all variant alternatives.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ofstd/include/dcmtk/ofstd/ofvriant.h | 12 ++++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ofstd/include/dcmtk/ofstd/ofvriant.h b/ofstd/include/dcmtk/ofstd/ofvriant.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f617b4e..d7eb225 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ofstd/include/dcmtk/ofstd/ofvriant.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ofstd/include/dcmtk/ofstd/ofvriant.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,8 +40,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<std::size_t,typename... Alternatives>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct OFvariant_traits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class OFvariant_traits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using is_constructible = std::false_type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static constexpr inline std::size_t alignment() { return 1; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static constexpr inline std::size_t size() { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,17 +50,17 @@ struct OFvariant_traits
</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;'>+ template<std::size_t Index,typename Alternative0,typename... Alternatives>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct OFvariant_traits<Index,Alternative0,Alternatives...>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class OFvariant_traits<Index,Alternative0,Alternatives...>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : OFvariant_traits<Index+1,Alternatives...>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using OFvariant_traits<Index+1,Alternatives...>::index_of;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using first_alternative = Alternative0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static constexpr inline std::size_t alignment()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct test { alignas(OFvariant_traits<Index+1,Alternatives...>::alignment()) first_alternative a; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return alignof(test);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return alignof(aligned);
</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;'>+ static constexpr inline std::size_t size()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +74,9 @@ struct OFvariant_traits<Index,Alternative0,Alternatives...>
</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;'>+ static std::integral_constant<std::size_t,Index> index_of( first_alternative );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct aligned { alignas(OFvariant_traits<Index+1,Alternatives...>::alignment()) char c; first_alternative a; };
</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;'>+ template<std::size_t AlternativeCount,typename... IndexAlternatives>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/patch-config-configure.diff b/graphics/dcmtk/files/patch-config-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 323a5e9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/files/patch-config-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/configure.orig 2011-07-23 23:12:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/configure 2011-07-23 23:13:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21338,7 +21338,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-netbsdelf2*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-*-darwin[8-9].*|*-*-darwin10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-*-darwin[8-9].*|*-*-darwin1[0-9].*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_DARWIN_C_SOURCE $CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_DARWIN_C_SOURCE $CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21410,7 +21410,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-netbsdelf2*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-*-darwin[8-9].*|*-*-darwin10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-*-darwin[8-9].*|*-*-darwin1[0-9].*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_DARWIN_C_SOURCE $CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_DARWIN_C_SOURCE $CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span></pre><pre style='margin:0'>
</pre>