<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/9d930cf573cc25f4f71d216e0e1f85f5591906bd">https://github.com/macports/macports-ports/commit/9d930cf573cc25f4f71d216e0e1f85f5591906bd</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 9d930cf tea: Update to 46.1.0
</span>9d930cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d930cf573cc25f4f71d216e0e1f85f5591906bd
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Sep 20 10:37:54 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> tea: Update to 46.1.0
</span>---
editors/tea/Portfile | 11 +-
editors/tea/files/joystick.patch | 188 -----------------------------------
editors/tea/files/patch-src.pro.diff | 6 +-
3 files changed, 8 insertions(+), 197 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 bbb5232..fb9a2ba 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;'>@@ -4,7 +4,11 @@ PortSystem 1.0
</span> PortGroup qmake 1.0
name tea
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 45.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 46.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 475506f7168a7ed49a15d69b4de5cce95de0dfd4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c3f74dbb1b91a1e497093491ab67d1b6a13bf1a7c46f392d03e39ba8f8e298bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 437017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description TEA is the powerful text editor for GNU/Linux and *BSD.
long_description ${description}
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,16 +20,11 @@ homepage https://tea.ourproject.org
</span> master_sites ${homepage}/dloads/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b03d5c2dcd00cf595f4e4fab5da6f2a403392415 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4042c18024209b2e462b337833c9f1dc9b24544937639ab41930d02d075e7eeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 425975
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:aspell \
port:hunspell \
port:zlib
patchfiles-append patch-src.pro.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append joystick.patch
</span>
destroot {
copy ${worksrcpath}/bin/tea.app ${destroot}${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/tea/files/joystick.patch b/editors/tea/files/joystick.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7952659..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/tea/files/joystick.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,188 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/psemiletov/tea-qt/issues/19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/psemiletov/tea-qt/commit/0eb13ee013d2d0b7e58777202ac8a12985750650
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-s/Q_OS_MACOS/Q_OS_MAC/g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- document.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ document.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,8 +318,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qstring_save (recent_list_fname, recent_files.join ("\n"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete joystick;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1042,7 +1044,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timer->setInterval (100);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- joystick = new CJoystick (0, this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (joystick->initialized)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1054,7 +1056,7 @@
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2792,7 +2794,7 @@
</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;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool CDox::event (QEvent *ev)
</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;'>-@@ -2840,3 +2842,4 @@
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- document.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ document.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,8 +49,10 @@
</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;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "myjoystick.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- #include "logmemo.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tio.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,8 +328,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString recent_list_fname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CJoystick *joystick;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- QTimer *timer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,10 +340,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~CDox();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool event (QEvent *ev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void handle_joystick_event (CJoystickAxisEvent *ev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- void reload_recent_list();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- myjoystick.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ myjoystick.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "myjoystick.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QApplication>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,3 +92,4 @@
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- myjoystick.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ myjoystick.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,6 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QObject>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,5 +71,5 @@
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif //MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rvln.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rvln.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2314,7 +2314,7 @@
</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;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void rvln::cb_use_joystick_stateChanged (int state)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool b;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2332,7 +2332,7 @@
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</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;'>- void rvln::createOptions()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2587,12 +2587,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cb_wasd->setCheckState (Qt::CheckState (settings->value ("wasd", "0").toInt()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cb_use_joystick = new QCheckBox (tr ("Use joystick as cursor keys"), tab_options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cb_use_joystick->setCheckState (Qt::CheckState (settings->value ("use_joystick", "0").toInt()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect (cb_use_joystick, SIGNAL(stateChanged (int)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this, SLOT(cb_use_joystick_stateChanged (int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- #if QT_VERSION >= 0x050000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2694,9 +2695,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- page_common_layout->addWidget (cb_wasd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- page_common_layout->addWidget (cb_use_joystick);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8404,8 +8405,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- settings->setValue ("wasd", cb_wasd->checkState());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- settings->setValue ("use_joystick", cb_use_joystick->checkState());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- settings->setValue ("full_path_at_window_title", cb_full_path_at_window_title->checkState());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rvln.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rvln.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -696,8 +696,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefs window callbacks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void cb_use_joystick_stateChanged (int state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- // void cmb_ui_langs_currentIndexChanged (const QString &text);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/tea/files/patch-src.pro.diff b/editors/tea/files/patch-src.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 82cfa17..1f6ee37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/tea/files/patch-src.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/tea/files/patch-src.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src.pro.orig 2018-07-03 04:50:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src.pro 2018-07-03 14:20:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -297,7 +297,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src.pro.orig 2018-09-19 15:06:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src.pro 2018-09-20 10:36:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,7 +310,7 @@
</span>
contains(USE_ASPELL,true){
</pre><pre style='margin:0'>
</pre>