Update to mlterm-3.7.0
This commit is contained in:
dcoppa
parent
a443635008
commit
20c3eaa827
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.49 2016/03/18 21:38:26 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.50 2016/04/21 11:42:29 dcoppa Exp $
|
||||
|
||||
COMMENT= color terminal emulator with unicode support
|
||||
DISTNAME= mlterm-3.6.1
|
||||
DISTNAME= mlterm-3.7.0
|
||||
|
||||
SHARED_LIBS+= kik 12.0 # 16.0
|
||||
SHARED_LIBS+= mkf 14.1 # 16.1
|
||||
SHARED_LIBS+= mkf 15.0 # 17.0
|
||||
SHARED_LIBS+= mlterm_core 1.0
|
||||
|
||||
CATEGORIES= x11
|
||||
@ -46,7 +46,7 @@ CONFIGURE_ARGS= --disable-canna \
|
||||
--with-gtk=2.0 \
|
||||
--with-gui=xlib,fb \
|
||||
--with-imagelib=gdk-pixbuf2 \
|
||||
--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader
|
||||
--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,mlfc
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2"
|
||||
MAKE_ENV= LIBkik_VERSION=${LIBkik_VERSION} \
|
||||
LIBmkf_VERSION=${LIBmkf_VERSION} \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (mlterm-3.6.1.tar.gz) = eY4Eiv30mcGk0Z3FtGyluZDryTtMbjEcD+M0BZZUoHg=
|
||||
SIZE (mlterm-3.6.1.tar.gz) = 3756686
|
||||
SHA256 (mlterm-3.7.0.tar.gz) = SoHZ4ZV+TwuPjgg43a0M9Hdvq8c0ZdiG8iEbuNmQwzk=
|
||||
SIZE (mlterm-3.7.0.tar.gz) = 3685301
|
||||
|
||||
@ -1,12 +1,28 @@
|
||||
$OpenBSD: patch-configure_in,v 1.13 2015/12/23 09:19:57 dcoppa Exp $
|
||||
$OpenBSD: patch-configure_in,v 1.14 2016/04/21 11:42:29 dcoppa Exp $
|
||||
|
||||
setuid root/setgid utmp are handled by PLIST
|
||||
|
||||
Do not enable VTE support if libvte is around
|
||||
|
||||
--- configure.in.orig Tue Dec 15 13:25:01 2015
|
||||
+++ configure.in Wed Dec 23 09:19:54 2015
|
||||
@@ -675,44 +675,14 @@ AC_ARG_ENABLE(pty_helper,
|
||||
--- configure.in.orig Sun Mar 13 11:57:40 2016
|
||||
+++ configure.in Thu Apr 21 13:06:02 2016
|
||||
@@ -612,15 +612,6 @@ else
|
||||
OT_LAYOUT_OBJ=hb.o
|
||||
fi
|
||||
fi
|
||||
-
|
||||
- if test "$have_hb" != "yes"; then
|
||||
- AC_CHECK_PROG(libotf_config,libotf-config,yes)
|
||||
- if test "$libotf_config" = "yes" ; then
|
||||
- OT_LAYOUT_CFLAGS="`libotf-config --cflags` -DUSE_OT_LAYOUT"
|
||||
- OT_LAYOUT_LIBS="`libotf-config --libs`"
|
||||
- OT_LAYOUT_OBJ=otf.o
|
||||
- fi
|
||||
- fi
|
||||
fi
|
||||
|
||||
if test "$have_hb" = "yes" -a "$gui" != "quartz" -a "$PKG_CONFIG" != ""; then
|
||||
@@ -741,44 +732,14 @@ AC_ARG_ENABLE(pty_helper,
|
||||
pty_helper=$enable_pty_helper)
|
||||
if test "$utmp" = "yes" -a "$pty_helper" != "yes" ; then
|
||||
UTMP_CFLAGS="-DUSE_UTMP"
|
||||
@ -51,5 +67,5 @@ Do not enable VTE support if libvte is around
|
||||
-fi
|
||||
+have_vte=no
|
||||
|
||||
tools="mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp"
|
||||
tools="mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
|
||||
AC_ARG_WITH(tools,
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-mkf_lib_Makefile_in,v 1.4 2015/06/09 12:55:33 dcoppa Exp $
|
||||
--- mkf/lib/Makefile.in.orig Sun Jun 7 03:36:14 2015
|
||||
+++ mkf/lib/Makefile.in Tue Jun 9 14:32:17 2015
|
||||
$OpenBSD: patch-mkf_lib_Makefile_in,v 1.5 2016/04/21 11:42:29 dcoppa Exp $
|
||||
--- mkf/lib/Makefile.in.orig Thu Apr 21 12:39:50 2016
|
||||
+++ mkf/lib/Makefile.in Thu Apr 21 12:41:34 2016
|
||||
@@ -49,8 +49,8 @@ INC = $(PARSER_OBJ:.o=.h) $(CONV_OBJ:.o=.h) $(MAP_OBJ:
|
||||
|
||||
LIBNAME = libmkf
|
||||
LIBNAME_DEB = libmkf_deb
|
||||
-MAJOR = 16
|
||||
-MINOR = 1
|
||||
-MAJOR = 17
|
||||
-MINOR = 0
|
||||
+MAJOR = ${LIBmkf_VERSION:R}
|
||||
+MINOR = ${LIBmkf_VERSION:E}
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-mlterm_Makefile_in,v 1.4 2015/11/04 13:49:34 dcoppa Exp $
|
||||
--- mlterm/Makefile.in.orig Sat Oct 24 18:18:14 2015
|
||||
+++ mlterm/Makefile.in Wed Nov 4 13:42:59 2015
|
||||
$OpenBSD: patch-mlterm_Makefile_in,v 1.5 2016/04/21 11:42:29 dcoppa Exp $
|
||||
--- mlterm/Makefile.in.orig Sun Mar 13 11:57:39 2016
|
||||
+++ mlterm/Makefile.in Thu Apr 21 12:37:13 2016
|
||||
@@ -30,6 +30,8 @@ OBJ = ml_char_encoding.o ml_color.o ml_edit.o ml_edit_
|
||||
ml_pty.o ml_termcap.o ml_line_shape.o @ML_PTY_OBJ@
|
||||
ml_pty.o ml_termcap.o ml_line_shape.o cygfile.o @ML_PTY_OBJ@
|
||||
|
||||
LIBNAME = libmlterm
|
||||
+MAJOR = ${LIBmlterm_core_VERSION:R}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-xwindow_x_screen_c,v 1.14 2015/12/23 09:19:57 dcoppa Exp $
|
||||
$OpenBSD: patch-xwindow_x_screen_c,v 1.15 2016/04/21 11:42:29 dcoppa Exp $
|
||||
|
||||
'XKeycodeToKeysym' is deprecated
|
||||
|
||||
--- xwindow/x_screen.c.orig Tue Dec 15 13:25:01 2015
|
||||
+++ xwindow/x_screen.c Wed Dec 23 09:19:52 2015
|
||||
@@ -6646,8 +6646,8 @@ compare_key_state_with_modmap(
|
||||
--- xwindow/x_screen.c.orig Sun Mar 13 11:57:40 2016
|
||||
+++ xwindow/x_screen.c Thu Apr 21 12:37:13 2016
|
||||
@@ -6663,8 +6663,8 @@ compare_key_state_with_modmap(
|
||||
{
|
||||
KeySym sym ;
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.11 2015/12/23 09:19:57 dcoppa Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.12 2016/04/21 11:42:29 dcoppa Exp $
|
||||
@bin bin/mlcc
|
||||
@bin bin/mlclient
|
||||
@bin bin/mlclientx
|
||||
@bin bin/mlfc
|
||||
@mode 2555
|
||||
@group utmp
|
||||
@bin bin/mlterm
|
||||
@ -54,6 +55,9 @@ lib/mlterm/libmozmodern.so
|
||||
@comment lib/mlterm/libnext.a
|
||||
@comment lib/mlterm/libnext.la
|
||||
lib/mlterm/libnext.so
|
||||
@comment lib/mlterm/libotl.a
|
||||
@comment lib/mlterm/libotl.la
|
||||
lib/mlterm/libotl.so
|
||||
@comment lib/mlterm/libpixmap_engine.a
|
||||
@comment lib/mlterm/libpixmap_engine.la
|
||||
lib/mlterm/libpixmap_engine.so
|
||||
@ -100,6 +104,8 @@ share/examples/mlterm/vfont
|
||||
@sample ${SYSCONFDIR}/mlterm/vfont
|
||||
share/examples/mlterm/xim
|
||||
@sample ${SYSCONFDIR}/mlterm/xim
|
||||
share/locale/ar/
|
||||
share/locale/ar/LC_MESSAGES/
|
||||
share/locale/ar/LC_MESSAGES/mlconfig.mo
|
||||
share/locale/de/LC_MESSAGES/mlconfig.mo
|
||||
share/locale/ja/LC_MESSAGES/mlconfig.mo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user