<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d15ac2771eb20f0452d007e43e015c2c33ad175e">https://github.com/macports/macports-ports/commit/d15ac2771eb20f0452d007e43e015c2c33ad175e</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 d15ac2771eb tea: Update to 50.0.4
</span>d15ac2771eb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d15ac2771eb20f0452d007e43e015c2c33ad175e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jul 8 13:55:22 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> tea: Update to 50.0.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And fix compilation failure with Xcode 10 and later.
</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/60801
</span>---
editors/tea/Portfile | 27 +++++++++++++++------------
editors/tea/files/tea-qmake.pro.patch | 6 +++---
editors/tea/files/tio.cpp.patch | 13 +++++++++++++
3 files changed, 31 insertions(+), 15 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 7126c979e60..9ac3b38ea74 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;'>@@ -1,36 +1,39 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> PortGroup qmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name tea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 49.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup psemiletov tea-qt 50.0.4
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 90afbe5a2e8f04c63cfdd8c1da5f78ee6be25c63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fdbdad5f03cfa19dd2144919cf0b1e7cba46b88af18440513a4fc8e2a5c3a7cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 438018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 94f0834cb8ec6932a90153bc6ba02a5d3f5830cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 20d1ffc218f6d378a33afac4c4eb652036305a723c3b409ee2afbc4ee9bd1ece \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 504276
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name tea
</span> description TEA is the powerful text editor for GNU/Linux and *BSD.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span> maintainers {ryandesign @ryandesign} openmaintainer
categories editors
license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://tea.ourproject.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/dloads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
depends_lib-append port:aspell \
port:hunspell \
port:zlib
patchfiles-append tea-qmake.pro.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append tio.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/psemiletov/tea-qt/issues/35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span>
destroot {
copy ${worksrcpath}/bin/tea.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/tea/files/tea-qmake.pro.patch b/editors/tea/files/tea-qmake.pro.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3dce85bfa7a..9a8daf650b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/tea/files/tea-qmake.pro.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/tea/files/tea-qmake.pro.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tea-qmake.pro.orig 2019-09-22 07:55:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tea-qmake.pro 2019-09-28 14:01:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,7 +314,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tea-qmake.pro.orig 2019-12-10 07:07:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tea-qmake.pro 2020-07-08 13:05:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +315,7 @@
</span>
contains(USE_ASPELL,true){
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/tea/files/tio.cpp.patch b/editors/tea/files/tio.cpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..89f45667800
</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/tio.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix ordered comparison between pointer and zero
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/psemiletov/tea-qt/pull/33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tio.cpp.orig 2019-12-10 07:07:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tio.cpp 2020-07-08 13:09:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -550,7 +550,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (vector <size_t>::size_type i = 0; i < signatures.size(); i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int x = 0; x < signatures[i]->words.count(); x++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (bafile.contains (signatures[i]->words[x]) > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bafile.contains (signatures[i]->words[x]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enc = signatures[i]->encname;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return enc;
</span></pre><pre style='margin:0'>
</pre>