Sun Feb 17 16:57:59 2019 UTC ()
mlterm: pull upstream fix for "Segfault in showing an input method window."

Bump PKGREVISION.


(tsutsui)
diff -r1.145 -r1.146 pkgsrc/x11/mlterm/Makefile
diff -r1.74 -r1.75 pkgsrc/x11/mlterm/distinfo
diff -r0 -r1.1 pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c
cvs diff -r1.145 -r1.146 pkgsrc/x11/mlterm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/mlterm/Makefile 2018/11/14 22:22:47 1.145
+++ pkgsrc/x11/mlterm/Makefile 2019/02/17 16:57:59 1.146
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.145 2018/11/14 22:22:47 kleink Exp $ 1# $NetBSD: Makefile,v 1.146 2019/02/17 16:57:59 tsutsui Exp $
2 2
3DISTNAME= mlterm-3.8.7 3DISTNAME= mlterm-3.8.7
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
7 7
8MAINTAINER= tsutsui@NetBSD.org 8MAINTAINER= tsutsui@NetBSD.org
9HOMEPAGE= http://mlterm.sourceforge.net/ 9HOMEPAGE= http://mlterm.sourceforge.net/
10COMMENT= Multilingual terminal emulator 10COMMENT= Multilingual terminal emulator
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13# CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> 13# CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h>
14NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* 14NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-*
15 15
16USE_TOOLS+= pkg-config msgfmt 16USE_TOOLS+= pkg-config msgfmt
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.74 -r1.75 pkgsrc/x11/mlterm/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/mlterm/distinfo 2018/11/01 15:11:07 1.74
+++ pkgsrc/x11/mlterm/distinfo 2019/02/17 16:57:59 1.75
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.74 2018/11/01 15:11:07 tsutsui Exp $ 1$NetBSD: distinfo,v 1.75 2019/02/17 16:57:59 tsutsui Exp $
2 2
3SHA1 (mlterm-3.8.7.tar.gz) = 040363ea4428fbdbeaa49cf402f71f41b8dbaea7 3SHA1 (mlterm-3.8.7.tar.gz) = 040363ea4428fbdbeaa49cf402f71f41b8dbaea7
4RMD160 (mlterm-3.8.7.tar.gz) = 4a9a4a053a6ae4c431564c84051a7ed95acaa311 4RMD160 (mlterm-3.8.7.tar.gz) = 4a9a4a053a6ae4c431564c84051a7ed95acaa311
5SHA512 (mlterm-3.8.7.tar.gz) = 6d2087d1433918f476e35dbde8d79940170fa6f133b9122e1db19006afc5081dbad7ed487bfa939b3d92ea29f3843a2b7c5540dc05e54b3c568bbe76ceb66ad2 5SHA512 (mlterm-3.8.7.tar.gz) = 6d2087d1433918f476e35dbde8d79940170fa6f133b9122e1db19006afc5081dbad7ed487bfa939b3d92ea29f3843a2b7c5540dc05e54b3c568bbe76ceb66ad2
6Size (mlterm-3.8.7.tar.gz) = 3994292 bytes 6Size (mlterm-3.8.7.tar.gz) = 3994292 bytes
7SHA1 (patch-configure) = b29ee553686061f8fd0f93b8c1d68954c060338d 7SHA1 (patch-configure) = b29ee553686061f8fd0f93b8c1d68954c060338d
8SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00 8SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
 9SHA1 (patch-uitoolkit_xlib_ui__window.c) = 6424d2cd55564bd2a3a5e61582d8bc156b0eb703
File Added: pkgsrc/x11/mlterm/patches/Attic/patch-uitoolkit_xlib_ui__window.c
$NetBSD: patch-uitoolkit_xlib_ui__window.c,v 1.1 2019/02/17 16:57:59 tsutsui Exp $

- pull upstream fix:
 http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.8.7/mlterm-3.8.7-fixes.patch/download
 https://bitbucket.org/arakiken/mlterm/commits/f41d3a433fcfc573fe7d09fb67a54cfae7d247c5

--- uitoolkit/xlib/ui_window.c.orig	2018-10-27 14:29:17.000000000 +0000
+++ uitoolkit/xlib/ui_window.c
@@ -1337,9 +1337,11 @@ int ui_window_show(ui_window_t *win, int
     size_hints.height_inc = total_height_inc(win);
     size_hints.min_width = total_min_width(win);
     size_hints.min_height = total_min_height(win);
-    size_hints.base_width = size_hints.min_width > size_hints.width_inc ?
+    size_hints.base_width = (size_hints.width_inc > 0 &&
+                             size_hints.min_width > size_hints.width_inc) ?
                             size_hints.min_width % size_hints.width_inc : 0;
-    size_hints.base_height = size_hints.min_height > size_hints.height_inc ?
+    size_hints.base_height = (size_hints.height_inc > 0 &&
+                              size_hints.min_height > size_hints.height_inc) ?
                              size_hints.min_height % size_hints.height_inc : 0;
 
 #ifdef DEBUG
@@ -1586,9 +1588,11 @@ void ui_window_set_normal_hints(ui_windo
   size_hints.height_inc = total_height_inc(root);
   size_hints.min_width = total_min_width(root);
   size_hints.min_height = total_min_height(root);
-  size_hints.base_width =
-      size_hints.min_width > size_hints.width_inc ? size_hints.min_width % size_hints.width_inc : 0;
-  size_hints.base_height = size_hints.min_height > size_hints.height_inc ?
+  size_hints.base_width = (size_hints.width_inc > 0 &&
+                           size_hints.min_width > size_hints.width_inc) ?
+                          size_hints.min_width % size_hints.width_inc : 0;
+  size_hints.base_height = (size_hints.height_inc > 0 &&
+                            size_hints.min_height > size_hints.height_inc) ?
                            size_hints.min_height % size_hints.height_inc : 0;
   size_hints.flags = PMinSize | PResizeInc | PBaseSize;