<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/744507df0cb671c9f6f4a10b2583165a2bbb362d">https://github.com/macports/macports-ports/commit/744507df0cb671c9f6f4a10b2583165a2bbb362d</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 744507df0cb qt5-qtwebkit: simplify patch
</span>744507df0cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 744507df0cb671c9f6f4a10b2583165a2bbb362d
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Dec 17 18:09:23 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebkit: simplify patch
</span>---
aqua/qt5/Portfile | 1 -
aqua/qt5/files/patch-icu.diff | 2 +-
2 files changed, 1 insertion(+), 2 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 c141bf92b9a..2b62151dfff 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;'>@@ -1669,7 +1669,6 @@ foreach {module module_info} [array get modules] {
</span> foreach test { glx libXcomposite libXrender } {
reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/Tools/qmake/config.tests/${test}/${test}.cpp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|icu-i18n|icu-i18n icu-uc|g" ${worksrcpath}/Source/WTF/WTF.pri
</span> }
# ICU requires C++17
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-icu.diff b/aqua/qt5/files/patch-icu.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5aeb3ab1ba4..5becf28d896 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> - INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
- LIBS += -licucore
+ CONFIG += link_pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKGCONFIG *= icu-i18n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKGCONFIG *= icu-i18n icu-uc
</span> } else:!use?(wchar_unicode): {
win32 {
CONFIG(static, static|shared) {
</pre><pre style='margin:0'>
</pre>