summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortsutsui <tsutsui@pkgsrc.org>2019-06-22 04:27:54 +0000
committertsutsui <tsutsui@pkgsrc.org>2019-06-22 04:27:54 +0000
commitcccdf082c71def1059b961298de49aaa7524e891 (patch)
tree9cc5a22eeb5e32b7ca5bd6d1349b752ab4ec94a5 /x11
parentbd9377bd0979a772dd5b9d05f49b6651c36b7791 (diff)
downloadpkgsrc-cccdf082c71def1059b961298de49aaa7524e891.tar.gz
mlterm: apply upstream patch for 3.8.8.
Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/mlterm/Makefile3
-rw-r--r--x11/mlterm/distinfo3
-rw-r--r--x11/mlterm/patches/patch-uitoolkit_ui__event__source.c39
3 files changed, 43 insertions, 2 deletions
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index fd2b4681cac..79c1cc9bdb6 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.147 2019/04/05 12:14:58 tsutsui Exp $
+# $NetBSD: Makefile,v 1.148 2019/06/22 04:27:54 tsutsui Exp $
DISTNAME= mlterm-3.8.8
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index f629899b7a2..e8fadd79597 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2019/04/05 12:14:58 tsutsui Exp $
+$NetBSD: distinfo,v 1.77 2019/06/22 04:27:54 tsutsui Exp $
SHA1 (mlterm-3.8.8.tar.gz) = 54f40fa50214656ab70f592d5d58805b1dfdc1c6
RMD160 (mlterm-3.8.8.tar.gz) = 9a7675a86999541b57742099a5e9eac8a539b580
@@ -6,3 +6,4 @@ SHA512 (mlterm-3.8.8.tar.gz) = 4db7de441300d30eadc85d1c780bb10c81d2555225fe16328
Size (mlterm-3.8.8.tar.gz) = 4035215 bytes
SHA1 (patch-configure) = e95b426f028c9bcb9895e69bb85ce8450f78a8c8
SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
+SHA1 (patch-uitoolkit_ui__event__source.c) = 4cf872768491bc8da5fc080cfd3a50969324a162
diff --git a/x11/mlterm/patches/patch-uitoolkit_ui__event__source.c b/x11/mlterm/patches/patch-uitoolkit_ui__event__source.c
new file mode 100644
index 00000000000..550dbd38c89
--- /dev/null
+++ b/x11/mlterm/patches/patch-uitoolkit_ui__event__source.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-uitoolkit_ui__event__source.c,v 1.1 2019/06/22 04:27:54 tsutsui Exp $
+
+- pull upstream fix for 3.8.8:
+ https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.8.8/mlterm-3.8.8-fixes.patch
+ https://bitbucket.org/arakiken/mlterm/commits/1a4368580a3a2a6239bfde5a7829645767ae0fa9
+ > Fix https://sourceforge.net/p/mlterm/mailman/message/36633222/
+ > [Mlterm-dev-en] mlterm 3.8.8 slow exit
+
+--- uitoolkit/ui_event_source.c.orig 2019-03-31 13:10:47.000000000 +0000
++++ uitoolkit/ui_event_source.c
+@@ -8,7 +8,6 @@
+ #include <string.h> /* memset/memcpy */
+ #include <sys/time.h> /* timeval */
+ #include <unistd.h> /* select */
+-#include <errno.h>
+ #include <pobl/bl_file.h> /* bl_file_set_cloexec */
+ #endif
+
+@@ -169,16 +168,14 @@ static void receive_next_event(void) {
+ #endif
+ if ((ret = select(maxfd + 1, &read_fds, NULL, NULL, &tval)) != 0) {
+ if (ret < 0) {
+- if (errno != EINTR) {
+ #ifdef DEBUG
+- bl_debug_printf(BL_DEBUG_TAG " error happened in select.\n");
++ bl_debug_printf(BL_DEBUG_TAG " error happened in select.\n");
+ #endif
+
+- return;
+- }
+- } else {
+- break;
++ return;
+ }
++
++ break;
+ }
+
+ #ifdef KEY_REPEAT_BY_MYSELF