<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/98f013a6ce2152c0fff73181887a255d7fa4e123">https://github.com/macports/macports-ports/commit/98f013a6ce2152c0fff73181887a255d7fa4e123</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 98f013a6ce2 sigil: 2.4.0, fix python 3.13 variant
</span>98f013a6ce2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 98f013a6ce2152c0fff73181887a255d7fa4e123
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Fri Jan 17 14:01:35 2025 +0800
<span style='display:block; white-space:pre;color:#404040;'> sigil: 2.4.0, fix python 3.13 variant
</span>---
editors/sigil/Portfile | 19 +++---
...-49112b204f48155a83a2e2936570f2a50e91c9b8.patch | 73 ----------------------
2 files changed, 9 insertions(+), 83 deletions(-)
<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 2a978d0375e..7d8527f7bd7 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;'>@@ -6,7 +6,7 @@ PortGroup conflicts_build 1.0
</span> PortGroup github 1.0
PortGroup qt6 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Sigil-Ebook Sigil 2.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Sigil-Ebook Sigil 2.4.0
</span> revision 0
name sigil
conflicts sigil-qt4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ description Sigil, the ePub editor
</span> long_description Sigil is a multi-platform WYSIWYG ebook editor. \
It is designed to edit books in ePub format.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3d35e3b1b176373a0eb4c520620dd5be8c6aaafa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4702d00b20290357673275df3d179cd17956167f86d65e95ef09937185b26e8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17478839
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 da8a991fb3bf77e6dd2088181a09dc129c013e22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 adafc6e494096c97b0ec1959d7b58f0fe0928e6e0873bbacdfbdd8cc33b1cc57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19136504
</span>
qt6.depends_build qttools
qt6.depends_lib qt5compat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,7 @@ 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:#ffe0e0;'>-patchfiles-append pcre.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-49112b204f48155a83a2e2936570f2a50e91c9b8.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append pcre.patch
</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;background:#e0e0e0;'>@@ -68,9 +67,9 @@ cmake.module_path-append \
</span> proc python-depends {python_branch} {
global frameworks_dir env
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|Python3 3\\.8 COMPONENTS Interpreter Development|Python3 ${::python_branch} COMPONENTS Interpreter Development|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PythonInterp 3\\.8|PythonInterp ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PythonLibs 3\\.8|PythonLibs ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|Python3 3\\.9|Python3 ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PythonInterp 3\\.9|PythonInterp ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PythonLibs 3\\.9|PythonLibs ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span> }
set python_version [string map {. ""} ${python_branch}]
depends_lib-append port:python${python_version} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +86,7 @@ proc python-depends {python_branch} {
</span> }
variant python313 conflicts python39 python310 python311 python312 description {Build with Python 3.13} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ::python_branch 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ::python_branch 3.13
</span> python-depends ${::python_branch}
}
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 84c61b51614..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/sigil/files/patch-49112b204f48155a83a2e2936570f2a50e91c9b8.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9b2773e08ba68f3d35c9f58696d8d1b78dd42e26 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Echo J <tcg96nougat@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 19 Oct 2024 19:39:09 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] cmake: Don't set the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Qt 6.8 removed it: https://github.com/qt/qtbase/commit/54f2229714358e742fdc30fc1f1cec8acacb1f29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(which causes build errors on Arch Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/qt6sigil.cmake | 4 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/qt6sigil.cmake b/src/qt6sigil.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 763b0fff14..dada3378a9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/qt6sigil.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/qt6sigil.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,10 +2,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build Sigil against Qt6 - requires cmake 3.16+ and a C++17 compiler
</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;background:#ffe0e0;'>--# quiet Qt 6 deprecat4ed warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_definitions(-DQT_IMPLICIT_QCHAR_CONSTRUCTION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_VERSION VERSION_GREATER "3.27.9")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy(SET CMP0153 OLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 08ed327cf220eca9c814ea2a65adace24a4cf3d9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Echo J <tcg96nougat@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 19 Oct 2024 19:43:17 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Parsers: Make QChar conversions explicit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is required without the QT_IMPLICIT_QCHAR_CONSTRUCTION macro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Parsers/qCSSParser.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Parsers/qCSSUtils.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Parsers/qCSSParser.cpp b/src/Parsers/qCSSParser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e54c1b1e22..88b42bedb3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Parsers/qCSSParser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Parsers/qCSSParser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -250,7 +250,7 @@ QString CSSParser::unicode(QString& istring, int& i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (CSSUtils::hexdec(add) > 96 && CSSUtils::hexdec(add) < 123))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString msg = "Replaced unicode notation: Changed \\" + CSSUtils::rtrim(add) + " to ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add = static_cast<int>(CSSUtils::hexdec(add));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add = QChar(static_cast<int>(CSSUtils::hexdec(add)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg += add;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log(msg,Information);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Parsers/qCSSUtils.cpp b/src/Parsers/qCSSUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d982510e23..b6c6b49579 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Parsers/qCSSUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Parsers/qCSSUtils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@ QChar CSSUtils::s_at(const QString &istring, const int pos)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(pos > (istring.length()-1) || pos < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return QChar(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,7 +168,7 @@ QString CSSUtils::build_value(const QVector<QString> subvalues)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool CSSUtils::ctype_space(const QChar c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == QChar(11));
</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;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>