<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/59633a233bf6fbe3157248ae66fd45e14a178ffc">https://github.com/macports/macports-ports/commit/59633a233bf6fbe3157248ae66fd45e14a178ffc</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 59633a233bf qt6: qtdeclarative: add dependency to qtshadertools & other fixes
</span>59633a233bf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 59633a233bf6fbe3157248ae66fd45e14a178ffc
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Mon Nov 28 08:58:27 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> qt6: qtdeclarative: add dependency to qtshadertools & other fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * qtdeclarative: add dependency to qtshadertools
</span><span style='display:block; white-space:pre;color:#404040;'> - Before that change, configure reported:
</span><span style='display:block; white-space:pre;color:#404040;'> `Note: Qt Quick modules not built due to not finding the qtshadertools 'qsb' tool.`
</span><span style='display:block; white-space:pre;color:#404040;'> - That led to the non-availability of Qt::QuickControls2 module for other projects
</span><span style='display:block; white-space:pre;color:#404040;'> * Increment revision on dependants of qtdeclarative
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix `Unknown CMake command "qt_internal_add_qml_module"` issue
</span><span style='display:block; white-space:pre;color:#404040;'> - by removing the reinplace of ${CMAKE_CURRENT_LIST_DIR}
</span><span style='display:block; white-space:pre;color:#404040;'> which was responsible for the non installation of some cmake files
</span><span style='display:block; white-space:pre;color:#404040;'> See also: https://bugreports.qt.io/browse/QTBUG-109003
</span><span style='display:block; white-space:pre;color:#404040;'> * Increment revision of qtbase and remaining modules
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove patches that are not referenced anymore
</span><span style='display:block; white-space:pre;color:#404040;'> - patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;color:#404040;'> - patch-qmake_flags.diff
</span>---
aqua/qt6/Portfile | 51 +++++++++-------------
.../files/patch-qiosurfacegraphicsbuffer.h.diff | 17 --------
aqua/qt6/files/patch-qmake_flags.diff | 13 ------
3 files changed, 20 insertions(+), 61 deletions(-)
<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 43a91e3e484..a6e5aff4e83 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;'>@@ -113,7 +113,7 @@ array set modules {
</span> {"Qt 3D"}
""
"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: "
}
qt5compat {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@ array set modules {
</span> {"Qt5 Compatibility"}
""
"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: "
}
qtbase {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +164,7 @@ array set modules {
</span> {"Qt Charts"}
"GPLv3 license only"
"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: GPL-3"
}
qtconnectivity {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ array set modules {
</span> {"Qt Bluetooth" "Qt NFC"}
""
"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: "
}
qtdeclarative {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,11 +190,11 @@ array set modules {
</span> }
"port:python310"
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "qtbase qtsvg qtimageformats"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qtbase qtsvg qtimageformats qtshadertools"
</span> {"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
""
"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: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,7 +209,7 @@ array set modules {
</span> {"Qt Image Formats"}
""
"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: "
}
qtmultimedia {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,7 +224,7 @@ array set modules {
</span> {"Qt Multimedia" "Qt Multimedia Widgets"}
""
"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: "
}
qtnetworkauth {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +239,7 @@ array set modules {
</span> {"Qt Network Authorization"}
""
"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: "
}
qtpositioning {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,7 +254,7 @@ array set modules {
</span> {"Provides the ability to determine a position by using a variety of possible sources"}
""
"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: {GPL-3}"
}
qtremoteobjects {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +269,7 @@ array set modules {
</span> {"Qt Remote Objects"}
""
"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: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,7 +284,7 @@ array set modules {
</span> {"Qt Sensors"}
""
"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: "
}
qtserialbus {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -299,7 +299,7 @@ array set modules {
</span> {"Qt Serial Bus"}
""
"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: "
}
qtserialport {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,7 +314,7 @@ array set modules {
</span> {"Qt Serial Port"}
""
"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: "
}
qtshadertools {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,7 +329,7 @@ array set modules {
</span> {"Qt ShaderTools"}
""
"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: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,7 +344,7 @@ array set modules {
</span> {"Qt SVG"}
""
"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: "
}
qttools {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@ array set modules {
</span> {"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"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: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,7 +374,7 @@ array set modules {
</span> {"translation files"}
""
"variant overrides: ~examples ~tests noarch ~docs"
<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: "
}
qtwebchannel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -389,7 +389,7 @@ array set modules {
</span> {"Qt WebChannel"}
""
"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: "
}
qtwebsockets {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -404,7 +404,7 @@ array set modules {
</span> {"Qt WebSockets"}
""
"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: "
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1313,17 +1313,6 @@ post-destroot {
</span> ln -s ${qt_bins_dir}/${cmakefile} ${destroot}${mp_prefix}/lib/cmake/${cmakefile}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if cmake finds configuration files in ${mp_prefix}/lib/cmake, CMAKE_CURRENT_LIST_DIR expands to ${mp_prefix}/lib/cmake/xxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cmake configuration files actually installed in ${qt_cmake_module_dir}/xxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmakepath ${destroot}${qt_libs_dir}/cmake/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cmakefile [ rglob ${cmakepath} *.cmake ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file isdirectory ${cmakefile} ] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmakedir [file dirname ${cmakefile}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmakedir [string replace $cmakedir 0 [string length $cmakepath]-1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|\\\${CMAKE_CURRENT_LIST_DIR}|${qt_cmake_module_dir}/${cmakedir}|g" ${cmakefile}
</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;color:#808080;'>diff --git a/aqua/qt6/files/patch-qiosurfacegraphicsbuffer.h.diff b/aqua/qt6/files/patch-qiosurfacegraphicsbuffer.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fa2ad91d008..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/files/patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e070ba977d55..cc7193d8b71b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qpa/qplatformgraphicsbuffer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <private/qcore_mac_p.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreGraphics/CGColorSpace.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <IOSurface/IOSurface.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.33.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qmake_flags.diff b/aqua/qt6/files/patch-qmake_flags.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 27317392a4c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/files/patch-qmake_flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmake/Makefile.unix.macos.orig 2017-06-28 02:54:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmake/Makefile.unix.macos 2017-08-27 13:44:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,8 +2,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARBON_LFLAGS = -framework ApplicationServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARBON_CFLAGS = -fconstant-cfstrings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EXTRA_CXXFLAGS = $(CARBON_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EXTRA_LFLAGS = $(COCOA_LFLAGS) $(CARBON_LFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EXTRA_CXXFLAGS = __MACPORTS_CXX_ARCH_FLAGS__ $(CARBON_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EXTRA_LFLAGS = __MACPORTS_LD_ARCH_FLAGS__ $(COCOA_LFLAGS) $(CARBON_LFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTOBJS2 = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qsettings_mac.o \
</span></pre><pre style='margin:0'>
</pre>