<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/0a0dc2af4d50cd6b786aa81f9170dad21968bd78">https://github.com/macports/macports-ports/commit/0a0dc2af4d50cd6b786aa81f9170dad21968bd78</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 0a0dc2af4d5 qt{513|5|6}-qtbase: ignore stderr for SDK version
</span>0a0dc2af4d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a0dc2af4d50cd6b786aa81f9170dad21968bd78
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Mar 31 05:41:53 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt{513|5|6}-qtbase: ignore stderr for SDK version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63805
</span>---
aqua/qt5/Portfile | 5 ++++-
aqua/qt5/files/patch-sdk-no-stderr.diff | 15 +++++++++++++++
aqua/qt513/Portfile | 5 ++++-
aqua/qt513/files/patch-sdk-no-stderr.diff | 15 +++++++++++++++
aqua/qt6/Portfile | 5 ++++-
aqua/qt6/files/patch-sdk-no-stderr.diff | 15 +++++++++++++++
6 files changed, 57 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e59c9efa9d..d1d0e950c36 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,7 +222,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1062,6 +1062,9 @@ foreach {module module_info} [array get modules] {
</span> # and also patch the mkspecs we are going to install as well
patchfiles-append patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake-installed.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/63805#comment:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-sdk-no-stderr.diff b/aqua/qt5/files/patch-sdk-no-stderr.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aa73688a716
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Intentionally ignore stderr (including any benign errors from xcodebuild)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+so that it is not treated as part of the SDK version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Accepted (https://bugreports.qt.io/browse/QTBUG-102066)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/sdk.mk.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/sdk.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want to complain about out of date SDK unless the target needs to be remade.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00485cdd0af..aab4c112bfc 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +164,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 6"
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -890,6 +890,9 @@ foreach {module module_info} [array get modules] {
</span> # See the files mkspecs/features/qt_module.prf and qmake/generators/makefile.cpp
patchfiles-append patch-pc_files.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/63805#comment:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-sdk-no-stderr.diff b/aqua/qt513/files/patch-sdk-no-stderr.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ef41c272d0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Intentionally ignore stderr (including any benign errors from xcodebuild)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+so that it is not treated as part of the SDK version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport (https://bugreports.qt.io/browse/QTBUG-102066)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/sdk.mk.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/sdk.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want to complain about out of date SDK unless the target needs to be remade.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be12c184486..399967b6b82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +152,7 @@ array set modules {
</span> "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -582,6 +582,9 @@ foreach {module module_info} [array get modules] {
</span>
minimum_developerversions 18 9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/63805#comment:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-sdk-no-stderr.diff b/aqua/qt6/files/patch-sdk-no-stderr.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aa73688a716
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/patch-sdk-no-stderr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Intentionally ignore stderr (including any benign errors from xcodebuild)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+so that it is not treated as part of the SDK version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Accepted (https://bugreports.qt.io/browse/QTBUG-102066)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/sdk.mk.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/sdk.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want to complain about out of date SDK unless the target needs to be remade.
</span></pre><pre style='margin:0'>
</pre>