<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/659e8d9aa616088f593e0d34fc5ffee4fa6c2848">https://github.com/macports/macports-ports/commit/659e8d9aa616088f593e0d34fc5ffee4fa6c2848</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 659e8d9aa61 tea: update to 63.1.0
</span>659e8d9aa61 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 659e8d9aa616088f593e0d34fc5ffee4fa6c2848
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Aug 16 12:26:07 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> tea: update to 63.1.0
</span>---
editors/tea/Portfile | 22 ++++++--
.../7126a9aef1f8313a2e97b7e3b1b8280f8f088935.patch | 62 ++++++++++++++++++++++
2 files changed, 80 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/tea/Portfile b/editors/tea/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71abe4c615c..4a54d56ce53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/tea/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/tea/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup psemiletov tea-qt 62.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup psemiletov tea-qt 63.1.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 76b783e22cfa22a1666f1505ac0e60e7e27cd6ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c1bf26c179bf80d1992e59bfdf17bfe7e7d2063197fdf1259e964a6676630eba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 676295
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 87acec8cf51a3a78b4cb8fd03a268ae61fdf782e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15eba879907e31c1d2d061fae38fb5e43e1084689cbc057b5421cc3fb0a6a38d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 715890
</span>
name tea
description TEA is the powerful text editor for GNU/Linux and *BSD.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +28,23 @@ depends_lib-append port:aspell \
</span>
patchfiles-append tea-qmake.pro.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Backport from upstream, drop on next update:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 7126a9aef1f8313a2e97b7e3b1b8280f8f088935.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append \
-stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/psemiletov/tea-qt/issues/68
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</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;'>+# atypes.hxx: error: ‘nullptr’ was not declared in this scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
copy ${worksrcpath}/bin/tea.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +73,10 @@ variant qt5 conflicts qt4 description {Use Qt 5} {}
</span>
if {[variant_isset qt4]} {
PortGroup qmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
if {[variant_isset qt5]} {
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/tea/files/7126a9aef1f8313a2e97b7e3b1b8280f8f088935.patch b/editors/tea/files/7126a9aef1f8313a2e97b7e3b1b8280f8f088935.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f1848a50bff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/tea/files/7126a9aef1f8313a2e97b7e3b1b8280f8f088935.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7126a9aef1f8313a2e97b7e3b1b8280f8f088935 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Petr Semiletov <peter.semiletov@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 16 Aug 2024 19:17:11 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] possible MACOS 12 fix
</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;'>+ CMakeLists.txt | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/spellchecker.h | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 13 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7ae72b1..5a2a0e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,10 @@ set(CMAKE_AUTOMOC ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_AUTOUIC ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_AUTORCC ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(PROJECT "tea-qt")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++project ($PROJECT VERSION 63.1.0 LANGUAGES CXX C)
</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;'>+ enable_language(CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_language(C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,8 +36,6 @@ set(CMAKE_AUTORCC ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_AUTOUIC ON)
</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;'>+-set(PROJECT "tea-qt")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-project ($PROJECT VERSION 63.1.0 LANGUAGES CXX C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt_add_resources(QT_RESOURCES resources.qrc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/spellchecker.h b/src/spellchecker.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index feb4a47..81c9d9f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/spellchecker.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/spellchecker.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define UTF16TEXT char16_t
</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;'>+ #if QT_VERSION >= 0x050000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <uchar.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UTF16TEXT char16_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +46,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UTF16TEXT ushort
</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;'>++#endif
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HUNSPELL_ENABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <hunspell/hunspell.hxx>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>