<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0d8804c8c5cc225a629b1a41af039f51f1c9eb70">https://github.com/macports/macports-ports/commit/0d8804c8c5cc225a629b1a41af039f51f1c9eb70</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 0d8804c8c5c sigil: fix building with Qt 6.8
</span>0d8804c8c5c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0d8804c8c5cc225a629b1a41af039f51f1c9eb70
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Tue Dec 3 12:58:28 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> sigil: fix building with Qt 6.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71438
</span>---
editors/sigil/Portfile | 4 +-
...-49112b204f48155a83a2e2936570f2a50e91c9b8.patch | 73 ++++++++++++++++++++++
2 files changed, 76 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/Portfile b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d61fab83f07..4a62897ecd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,6 @@ depends_lib-append port:hunspell \
</span> port:pcre2 \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles pcre.patch
</span> conflicts_build libzip
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +42,9 @@ configure.args -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \
</span> -DUSE_QT6=1 \
-DCMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append pcre.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-49112b204f48155a83a2e2936570f2a50e91c9b8.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
system -W ${worksrcpath}/src/Resource_Files/mac "/usr/libexec/PlistBuddy -c \"Set :LSMinimumSystemVersion ${macosx_deployment_target}\" MacOSXBundleInfo.plist"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/files/patch-49112b204f48155a83a2e2936570f2a50e91c9b8.patch b/editors/sigil/files/patch-49112b204f48155a83a2e2936570f2a50e91c9b8.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..84c61b51614
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/sigil/files/patch-49112b204f48155a83a2e2936570f2a50e91c9b8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9b2773e08ba68f3d35c9f58696d8d1b78dd42e26 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Echo J <tcg96nougat@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 19 Oct 2024 19:39:09 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] cmake: Don't set the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Qt 6.8 removed it: https://github.com/qt/qtbase/commit/54f2229714358e742fdc30fc1f1cec8acacb1f29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(which causes build errors on Arch Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/qt6sigil.cmake | 4 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/qt6sigil.cmake b/src/qt6sigil.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 763b0fff14..dada3378a9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qt6sigil.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qt6sigil.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,10 +2,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build Sigil against Qt6 - requires cmake 3.16+ and a C++17 compiler
</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;'>+-# quiet Qt 6 deprecat4ed warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_definitions(-DQT_IMPLICIT_QCHAR_CONSTRUCTION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_VERSION VERSION_GREATER "3.27.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_policy(SET CMP0153 OLD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 08ed327cf220eca9c814ea2a65adace24a4cf3d9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Echo J <tcg96nougat@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 19 Oct 2024 19:43:17 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Parsers: Make QChar conversions explicit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is required without the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Parsers/qCSSParser.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Parsers/qCSSUtils.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Parsers/qCSSParser.cpp b/src/Parsers/qCSSParser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e54c1b1e22..88b42bedb3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Parsers/qCSSParser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Parsers/qCSSParser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istring, int& i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (CSSUtils::hexdec(add) > 96 && CSSUtils::hexdec(add) < 123))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString msg = "Replaced unicode notation: Changed \\" + CSSUtils::rtrim(add) + " to ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add = static_cast<int>(CSSUtils::hexdec(add));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add = QChar(static_cast<int>(CSSUtils::hexdec(add)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg += add;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log(msg,Information);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Parsers/qCSSUtils.cpp b/src/Parsers/qCSSUtils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d982510e23..b6c6b49579 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Parsers/qCSSUtils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Parsers/qCSSUtils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istring, const int pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(pos > (istring.length()-1) || pos < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return QChar(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVector<QString> subvalues)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool CSSUtils::ctype_space(const QChar c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == QChar(11));
</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;'>+
</span></pre><pre style='margin:0'>
</pre>