<pre style='margin:0'>
Nils Breunese (breun) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ba51b058322aee09e52b4680587314f06763e1ea">https://github.com/macports/macports-ports/commit/ba51b058322aee09e52b4680587314f06763e1ea</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 ba51b058322 openjdk21: update patches (#26268)
</span>ba51b058322 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ba51b058322aee09e52b4680587314f06763e1ea
</span>Author: Nils Breunese <breun@macports.org>
AuthorDate: Wed Oct 23 02:50:57 2024 +0200

<span style='display:block; white-space:pre;color:#404040;'>    openjdk21: update patches (#26268)
</span>---
 java/openjdk21/Portfile                                                 | 2 +-
 java/openjdk21/files/JDK-8340341-clang-16-workaround.patch              | 2 +-
 ...ound.patch => JDK-8342071-undecl-ident-nsbun-arm64-workaround.patch} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk21/Portfile b/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d212319a433..358fadab817 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ pre-patch {
</span> # Temporary workaround for clang 16: https://trac.macports.org/ticket/70819
 # Temporary workaround for undeclared enum in < 11.00: https://trac.macports.org/ticket/71049
 patchfiles          JDK-8340341-clang-16-workaround.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    JDK-8266242-undecl-ident-nsbun-arm64-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    JDK-8342071-undecl-ident-nsbun-arm64-workaround.patch
</span> 
 set tpath ${prefix}/Library/Java
 use_xcode           yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch b/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c471b151c5..46f8f6bf9fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21/files/JDK-8340341-clang-16-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@
</span>      # for the clang bug was still needed.
      BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    # See JDK-8340341
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    # See https://bugs.openjdk.org/browse/JDK-8340341
</span> +    ifeq ($(firstword $(subst ., ,$(CXX_VERSION_NUMBER))), 16)
 +      BUILD_LIBJVM_stackMapTable.cpp_CXXFLAGS := -O1
 +    endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk21/files/JDK-8266242-undecl-ident-nsbun-arm64-workaround.patch b/java/openjdk21/files/JDK-8342071-undecl-ident-nsbun-arm64-workaround.patch
</span>similarity index 92%
rename from java/openjdk21/files/JDK-8266242-undecl-ident-nsbun-arm64-workaround.patch
rename to java/openjdk21/files/JDK-8342071-undecl-ident-nsbun-arm64-workaround.patch
<span style='display:block; white-space:pre;color:#808080;'>index b3777f4c160..98b959a36cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk21/files/JDK-8266242-undecl-ident-nsbun-arm64-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21/files/JDK-8342071-undecl-ident-nsbun-arm64-workaround.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span>  
  static BOOL isValidDisplayMode(CGDisplayModeRef mode) {
 +    // https://trac.macports.org/ticket/71049: temporary additional guard for undef'd NSBun..ARM64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    // Should be reported/fixed upstream at openjdk.org.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    // https://bugs.java.com/bugdatabase/view_bug?bug_id=JDK-8342071
</span> +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
      // Workaround for apple bug FB13261205, since it only affects arm based macs
      // and arm support started with macOS 11 ignore the workaround for previous versions
</pre><pre style='margin:0'>

</pre>