cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixing update to mlterm-3.5.1

Browse Source
This commit is contained in:
dcoppa 2015-09-01 07:45:47 +00:00
parent 5707b85b80
commit dfd79f3e97
6 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/mlterm/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.45 2015/06/29 08:37:57 dcoppa Exp $
# $OpenBSD: Makefile,v 1.46 2015/09/01 07:45:47 dcoppa Exp $
SHARED_ONLY= Yes
COMMENT= color terminal emulator with unicode support
DISTNAME= mlterm-3.5.0
REVISION= 0
DISTNAME= mlterm-3.5.1
SHARED_LIBS+= kik 12.0 # 16.0
SHARED_LIBS+= mkf 14.1 # 16.1

4
x11/mlterm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mlterm-3.5.0.tar.gz) = 3tshHFKozaqIkZINoKTwj0ty97NRSlrLA4s4QZsk5NM=
SIZE (mlterm-3.5.0.tar.gz) = 3707639
SHA256 (mlterm-3.5.1.tar.gz) = QOrwa5RqaEhVmkP/tiWiD3Z5xE8Z42uOFVpIIL4pkLs=
SIZE (mlterm-3.5.1.tar.gz) = 3714159

17
x11/mlterm/patches/patch-Makefile_in
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2015/06/09 12:55:33 dcoppa Exp $
Makefile.in: fix 'make install-fb' error
(HG changeset 8c4e38881486e6e2cc5033fc94060c2c1e38022e)
--- Makefile.in.orig Tue Jun 9 14:39:26 2015
+++ Makefile.in Tue Jun 9 14:39:44 2015
@@ -17,7 +17,8 @@ install: BUILD_SUCCESS
for dir in $(MAKE_DIRS) ; do (cd $${dir} ; $(MAKE) $@) || exit $? ; done
install-fb: BUILD_SUCCESS
- for dir in main inputmethod/* ; do (cd $${dir} ; $(MAKE) install) || exit $? ; done
+ for dir in main `find inputmethod -name Makefile|sed 's/\/Makefile//'` ; \
+ do (cd $${dir} ; $(MAKE) install) || exit $? ; done
distclean:
if [ -f kiklib/Makefile ]; then (cd kiklib ; $(MAKE) $@) ; fi

20
x11/mlterm/patches/patch-configure_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure_in,v 1.10 2015/05/18 06:06:49 dcoppa Exp $
$OpenBSD: patch-configure_in,v 1.11 2015/09/01 07:45:47 dcoppa Exp $
setuid root/setgid utmp are handled by PLIST
Do not enable VTE support if libvte is around
--- configure.in.orig Sat Mar 14 05:47:32 2015
+++ configure.in Mon May 18 07:35:37 2015
@@ -661,46 +661,14 @@ AC_ARG_ENABLE(pty_helper,
--- configure.in.orig Sun Aug 30 02:03:13 2015
+++ configure.in Tue Sep 1 09:37:52 2015
@@ -661,44 +661,14 @@ AC_ARG_ENABLE(pty_helper,
pty_helper=$enable_pty_helper)
if test "$utmp" = "yes" -a "$pty_helper" != "yes" ; then
UTMP_CFLAGS="-DUSE_UTMP"
@ -32,21 +32,19 @@ Do not enable VTE support if libvte is around
- if test "${gtk_version}" = "3.0" ; then
- PKG_CHECK_MODULES(VTE, vte-2.91, have_vte=yes, have_vte=no)
- if test "$have_vte" = "yes" ; then
- LIBVTE_SUFFIX=-2.91
- VTE_ABI=2.91
- else
- PKG_CHECK_MODULES(VTE, vte-2.90, have_vte=yes, have_vte=no)
- LIBVTE_SUFFIX=2_90
- if test "$have_vte" = "yes"; then
- VTE_ABI=2.90
- fi
- fi
- AC_SUBST(LIBVTE_SUFFIX)
- else
- PKG_CHECK_MODULES(VTE, vte, have_vte=yes, have_vte=no)
- fi
- if test "$have_vte" = "yes" ; then
- OUTPUT_FILES="gtk/Makefile ${OUTPUT_FILES}"
- # "tr ..." is hack for cygwin.
- # (removing \r which is output by win32 native pkg-config.)
- VTE_CFLAGS="`echo $VTE_CFLAGS | tr -d '\r'`"
- AC_SUBST(VTE_CFLAGS)
- AC_SUBST(VTE_ABI)
- fi
-else
- have_vte=no

8
x11/mlterm/patches/patch-xwindow_x_screen_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-xwindow_x_screen_c,v 1.11 2015/06/09 12:55:33 dcoppa Exp $
$OpenBSD: patch-xwindow_x_screen_c,v 1.12 2015/09/01 07:45:47 dcoppa Exp $
'XKeycodeToKeysym' is deprecated
--- xwindow/x_screen.c.orig Sun Jun 7 03:36:23 2015
+++ xwindow/x_screen.c Tue Jun 9 14:28:59 2015
@@ -6589,8 +6589,8 @@ compare_key_state_with_modmap(
--- xwindow/x_screen.c.orig Sun Aug 30 02:03:13 2015
+++ xwindow/x_screen.c Tue Sep 1 09:33:14 2015
@@ -6618,8 +6618,8 @@ compare_key_state_with_modmap(
{
KeySym sym ;

8
x11/mlterm/patches/patch-xwindow_xlib_x_window_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-xwindow_xlib_x_window_c,v 1.7 2015/06/09 12:55:33 dcoppa Exp $
$OpenBSD: patch-xwindow_xlib_x_window_c,v 1.8 2015/09/01 07:45:47 dcoppa Exp $
'XKeycodeToKeysym' is deprecated
--- xwindow/xlib/x_window.c.orig Sun Jun 7 03:36:22 2015
+++ xwindow/xlib/x_window.c Tue Jun 9 14:28:59 2015
@@ -4318,7 +4318,7 @@ x_window_get_mod_meta_mask(
--- xwindow/xlib/x_window.c.orig Sun Aug 30 02:03:13 2015
+++ xwindow/xlib/x_window.c Tue Sep 1 09:33:14 2015
@@ -4326,7 +4326,7 @@ x_window_get_mod_meta_mask(
break ;
}