CVS commit: pkgsrc/x11/mlterm

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Feb 17 16:57:59 UTC 2019

Modified Files:
        pkgsrc/x11/mlterm: Makefile distinfo
Added Files:
        pkgsrc/x11/mlterm/patches: patch-uitoolkit_xlib_ui__window.c

Log Message:
mlterm: pull upstream fix for "Segfault in showing an input method window."

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/mlterm/Makefile
diff -u pkgsrc/x11/mlterm/Makefile:1.145 pkgsrc/x11/mlterm/Makefile:1.146
--- pkgsrc/x11/mlterm/Makefile:1.145    Wed Nov 14 22:22:47 2018
+++ pkgsrc/x11/mlterm/Makefile  Sun Feb 17 16:57:59 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.145 2018/11/14 22:22:47 kleink Exp $
+# $NetBSD: Makefile,v 1.146 2019/02/17 16:57:59 tsutsui Exp $
 
 DISTNAME=      mlterm-3.8.7
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mlterm/}
 

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.74 pkgsrc/x11/mlterm/distinfo:1.75
--- pkgsrc/x11/mlterm/distinfo:1.74     Thu Nov  1 15:11:07 2018
+++ pkgsrc/x11/mlterm/distinfo  Sun Feb 17 16:57:59 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2018/11/01 15:11:07 tsutsui Exp $
+$NetBSD: distinfo,v 1.75 2019/02/17 16:57:59 tsutsui Exp $
 
 SHA1 (mlterm-3.8.7.tar.gz) = 040363ea4428fbdbeaa49cf402f71f41b8dbaea7
 RMD160 (mlterm-3.8.7.tar.gz) = 4a9a4a053a6ae4c431564c84051a7ed95acaa311
@@ -6,3 +6,4 @@ SHA512 (mlterm-3.8.7.tar.gz) = 6d2087d14
 Size (mlterm-3.8.7.tar.gz) = 3994292 bytes
 SHA1 (patch-configure) = b29ee553686061f8fd0f93b8c1d68954c060338d
 SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
+SHA1 (patch-uitoolkit_xlib_ui__window.c) = 6424d2cd55564bd2a3a5e61582d8bc156b0eb703

Added files:

Index: pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c
diff -u /dev/null pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c:1.1
--- /dev/null   Sun Feb 17 16:57:59 2019
+++ pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__window.c Sun Feb 17 16:57:59 2019
@@ -0,0 +1,37 @@
+$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;
+