<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0a4259b2cbfe1c91bba03e3a20c47d4cc95508e">https://github.com/macports/macports-ports/commit/a0a4259b2cbfe1c91bba03e3a20c47d4cc95508e</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 a0a4259b2cb dcmtk: fix environ for macOS
</span>a0a4259b2cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a0a4259b2cbfe1c91bba03e3a20c47d4cc95508e
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Dec 13 17:19:18 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> dcmtk: fix environ for macOS
</span>---
graphics/dcmtk/Portfile | 7 ++++--
.../0001-ofstub.cc-fix-environ-for-Apple.patch | 25 +++++++++++++++++++
... 0002-Revert-Fixed-OFSemaphore-for-macOS.patch} | 0
graphics/dcmtk/files/patch-fix-powerpc.diff | 29 ----------------------
4 files changed, 30 insertions(+), 31 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 ded9c802ebd..787e15409b3 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;'>@@ -40,6 +40,9 @@ compiler.cxx_standard 2011
</span> # avoid self-conflict
patchfiles install_path_fix_part2.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/DCMTK/dcmtk/pull/112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-ofstub.cc-fix-environ-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
depends_lib path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +53,7 @@ depends_lib path:include/turbojpeg.h:libjpeg-turbo \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append -DDCMTK_WITH_TIFF=ON \
-DDCMTK_WITH_OPENJPEG=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +159,7 @@ if {${os.platform} eq "darwin" \
</span> # builds and works only on 10.6 for ppc builds. Make sure
# this patch cannot be applied elsewhere, and also not used
# if legacy_dispatch is chosen.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append 0001-Revert-Fixed-OFSemaphore-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 0002-Revert-Fixed-OFSemaphore-for-macOS.patch
</span> }
default_variants +ssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/0001-ofstub.cc-fix-environ-for-Apple.patch b/graphics/dcmtk/files/0001-ofstub.cc-fix-environ-for-Apple.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..354f20be6e6
</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/0001-ofstub.cc-fix-environ-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 881965da18dee93aa38570a0d2fe292c37365bd8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 13 Dec 2024 17:03:57 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] ofstub.cc: fix environ for Apple
</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;'>+ ofstd/libsrc/ofstub.cc | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ofstd/libsrc/ofstub.cc ofstd/libsrc/ofstub.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c1df7068e..bba147e26 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ofstd/libsrc/ofstub.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ofstd/libsrc/ofstub.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,6 +141,11 @@ static OFString getLastErrorString()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return OFString();
</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;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* _WIN32 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char** environ; // required to exist by the Single Unix Specification
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/0001-Revert-Fixed-OFSemaphore-for-macOS.patch b/graphics/dcmtk/files/0002-Revert-Fixed-OFSemaphore-for-macOS.patch
</span>similarity index 100%
rename from graphics/dcmtk/files/0001-Revert-Fixed-OFSemaphore-for-macOS.patch
rename to graphics/dcmtk/files/0002-Revert-Fixed-OFSemaphore-for-macOS.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/patch-fix-powerpc.diff b/graphics/dcmtk/files/patch-fix-powerpc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9d3cb656605..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/files/patch-fix-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/tests/arith.cc 2023-12-19 18:12:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/tests/arith.cc 2024-04-28 02:30:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ieeefp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // For controlling floating point exceptions on OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <xmmintrin.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,7 +336,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_WINDOWS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _clearfp();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _controlfp( _controlfp(0,0) & ~_EM_INVALID, _MCW_EM );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && !defined(__aarch64__) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- feenableexcept( FE_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +382,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _controlfp( _controlfp(0,0) | _EM_INVALID, _MCW_EM );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_FENV_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- feclearexcept( FE_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fedisableexcept( FE_INVALID );
</span></pre><pre style='margin:0'>
</pre>