Mailinglist Archive: opensuse-commit (857 mails)
| < Previous | Next > |
commit mlterm
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 12 Nov 2007 21:55:55 +0100
- Message-id: <20071112205556.13081678337@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mlterm
checked in at Mon Nov 12 21:55:55 CET 2007.
--------
--- mlterm/mlterm.changes 2007-01-24 21:18:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/mlterm/mlterm.changes 2007-11-12
17:19:33.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Nov 12 17:04:06 CET 2007 - mfabian@xxxxxxx
+
+- update to 2.9.3.20071112 (= 2.9.4 pre):
+ • mlterm/x_screen.c: added config key string "title" to allow
+ change pty title by "mlcc title foobar".
+ • mlter/ml_term.h: updated for ml_vt100_parser_set_logging_vt_seq.
+ • xwindow/x_dnd.h: handle zero-length property properly.
+ • xwindow/x_screen.c: selection can be expanded on middle-click.
+ (Thanks to ssakane)
+- remove bugzilla-238194-array-subscript-out-of-bounds.patch
+ (included upstream).
+- fix the build with gcc 4.3.
+
+-------------------------------------------------------------------
Old:
----
bugzilla-238194-array-subscript-out-of-bounds.patch
mlterm-2.9.3.20070123.tar.bz2
New:
----
missing-includes.patch
mlterm-2.9.3.20071112.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mlterm.spec ++++++
--- /var/tmp/diff_new_pack.w11730/_old 2007-11-12 21:55:33.000000000 +0100
+++ /var/tmp/diff_new_pack.w11730/_new 2007-11-12 21:55:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mlterm (Version 2.9.3.20070123)
+# spec file for package mlterm (Version 2.9.3.20071112)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,18 +12,18 @@
Name: mlterm
BuildRequires: coreutils fribidi-devel gcc-c++ giflib-devel gtk2-devel
imlib-devel libotf-devel libtiff-devel m17n-lib-devel scim-devel uim-devel
update-desktop-files utempter wordcut-devel
-License: BSD License and BSD-like
+License: BSD 3-Clause
Group: System/X11/Terminals
-Autoreqprov: on
+AutoReqProv: on
Provides: locale(xorg-x11:ja;ko;zh;ar;he)
-Version: 2.9.3.20070123
+Version: 2.9.3.20071112
Release: 1
Url: http://mlterm.sourceforge.net/
# Source0: http://prdownloads.sourceforge.net/mlterm/mlterm-2.7.0.tar.bz2
-# cvs -d :pserver:anonymous@xxxxxxxxxxxxxxxxxxx:/cvsroot/mlterm login
+# cvs -d :pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/mlterm login
# (hit Enter)
-# cvs -d :pserver:anonymous@xxxxxxxxxxxxxxxxxxx:/cvsroot/mlterm checkout
mlterm
-# cvs -z3 -d:ext:mfabian@xxxxxxxxxxxxxxxxxxx:/cvsroot/mlterm co mlterm
+# cvs -d :pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/mlterm
checkout mlterm
+# cvs -z3 -d:ext:mfabian@xxxxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/mlterm co
mlterm
# tar jcvf mlterm-2.7.0.tar.bz2 mlterm
Source0:
http://prdownloads.sourceforge.net/mlterm/mlterm-%{version}.tar.bz2
Source10: %name.desktop
@@ -40,7 +40,7 @@
Patch11: mlterm-pkgconfig.patch
Patch12: mlterm-scim.patch
Patch15: mlterm-configure.patch
-Patch16: bugzilla-238194-array-subscript-out-of-bounds.patch
+Patch16: missing-includes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Multilingual Terminal Emulator for X
@@ -142,7 +142,7 @@
%patch11
%patch12 -p1
%patch15 -p1
-%patch16 -p1
+%patch16 -p0
GETTEXT_VERSION=$(gettext --version | head -n 1 | awk '{print $NF}')
perl -pi'*.orig' -e
"s/AM_GNU_GETTEXT_VERSION\\([0-9.]+\\)/AM_GNU_GETTEXT_VERSION(${GETTEXT_VERSION})/g"
configure.in
rm -rf doc/{en,ja}/CVS
@@ -192,7 +192,6 @@
# PERL=/usr/bin/perl
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf
$RPM_BUILD_ROOT;
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{pixmapdir}
install -m 644 doc/icon/mlterm*xpm $RPM_BUILD_ROOT%{pixmapdir}
@@ -211,7 +210,6 @@
# install terminfo entry-description
#mkdir -p $RPM_BUILD_ROOT/usr/share/terminfo/m
#tic -o $RPM_BUILD_ROOT/usr/share/terminfo/ doc/term/mlterm.ti
-
%find_lang mlconfig
%suse_update_desktop_file -i %name TerminalEmulator
@@ -222,7 +220,6 @@
%run_ldconfig
%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf
$RPM_BUILD_ROOT;
%files -f mlconfig.lang
%defattr(-, root, root)
@@ -266,8 +263,18 @@
%files -n mlterm-m17n
%defattr(-, root, root)
%{_libdir}/mlterm/libim-m17nlib.so
-
-%changelog -n mlterm
+%changelog
+* Mon Nov 12 2007 - mfabian@xxxxxxx
+- update to 2.9.3.20071112 (= 2.9.4 pre):
+ • mlterm/x_screen.c: added config key string "title" to allow
+ change pty title by "mlcc title foobar".
+ • mlter/ml_term.h: updated for ml_vt100_parser_set_logging_vt_seq.
+ • xwindow/x_dnd.h: handle zero-length property properly.
+ • xwindow/x_screen.c: selection can be expanded on middle-click.
+ (Thanks to ssakane)
+- remove bugzilla-238194-array-subscript-out-of-bounds.patch
+ (included upstream).
+- fix the build with gcc 4.3.
* Wed Jan 24 2007 - mfabian@xxxxxxx
- update to 2.9.3.20070123 (= 2.9.4 pre).
- fix Bugzilla #238194.
++++++ missing-includes.patch ++++++
Index: inputmethod/scim/im_scim_1.4.cpp
===================================================================
RCS file: /cvsroot/mlterm/mlterm/inputmethod/scim/im_scim_1.4.cpp,v
retrieving revision 1.2
diff -u -r1.2 im_scim_1.4.cpp
--- inputmethod/scim/im_scim_1.4.cpp 12 Nov 2005 06:48:28 -0000 1.2
+++ inputmethod/scim/im_scim_1.4.cpp 12 Nov 2007 16:35:59 -0000
@@ -30,6 +30,7 @@
#include <iostream>
#include <stdio.h>
#include <X11/Xlib.h> // KeySym, XKeyEvent
+#include <string.h>
#include "im_scim.h"
++++++ mlterm-2.9.3.20070123.tar.bz2 -> mlterm-2.9.3.20071112.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/ChangeLog
new/mlterm-2.9.3.20071112/ChangeLog
--- old/mlterm-2.9.3.20070123/ChangeLog 2007-01-24 20:50:20.000000000 +0100
+++ new/mlterm-2.9.3.20071112/ChangeLog 2007-11-12 16:59:48.000000000 +0100
@@ -1,3 +1,24 @@
+2007-09-28 MINAMI Hirokazu <minami@xxxxxxxxxxxx>
+
+ * mlterm/x_screen.c: added config key string "title" to allow
+ change pty title by "mlcc title foobar".
+
+2007-04-27 MINAMI Hirokazu <minami@xxxxxxxxxxxx>
+
+ * mlter/ml_term.h: updated for ml_vt100_parser_set_logging_vt_seq.
+ * xwindow/x_dnd.h: handle zero-length property properly.
+
+2007-04-13 MINAMI Hirokazu <minami@xxxxxxxxxxxx>
+
+ * xwindow/x_screen.c: selection can be expanded on middle-click.
+ (Thanks to ssakane)
+
+2007-01-24 Mike FABIAN <mfabian@xxxxxxx>
+
+ * kiklib/src/kik_time.c: add missing day of week to avoid
+ that the array subscript gets above the array bounds.
+ Fix by Dominique Leuenberger <dominique.leuenberger@xxxxxxxxxxxxx>.
+
2006-11-20 Seiichi SATO <me@xxxxxxxxxxxxxx>
* xwindow/x_window.c, xwindow/x_window.h xwindow/x_screen.c: specify
@@ -4591,4 +4612,4 @@
* Please read doc/en/ChangeLog.old for previous changelog information.
(This term was written by Tomohiro KUBOTA in 2002-04-24.)
-$Id: ChangeLog,v 1.944 2006/11/20 11:26:33 seiichi Exp $
+$Id: ChangeLog,v 1.949 2007/09/28 05:58:48 h_minami Exp $
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/doc/en/PROTOCOL
new/mlterm-2.9.3.20071112/doc/en/PROTOCOL
--- old/mlterm-2.9.3.20070123/doc/en/PROTOCOL 2006-09-08 15:22:54.000000000
+0200
+++ new/mlterm-2.9.3.20071112/doc/en/PROTOCOL 2007-11-12 16:59:54.000000000
+0100
@@ -1,5 +1,5 @@
comment -*- mode: text -*-
-comment $Id: PROTOCOL,v 1.37 2006/01/08 11:46:42 kzys Exp $
+comment $Id: PROTOCOL,v 1.38 2007/09/28 05:58:48 h_minami Exp $
mlterm configuration protocol
version 20030301
@@ -22,7 +22,8 @@
scrollbar_view_name | sb_fg_color | sb_bg_color |
iscii_lang | use_dynamic_comb | cursor_fg_color |
cursor_bg_color | open_pty | open_screen | select_pty |
- snapshot | gen_proto_challenge | icon_path |
logging_vt_seq
+ snapshot | gen_proto_challenge | icon_path |
logging_vt_seq |
+ title
get key = encoding | is_auto_encoding | fg_color | bg_color |
tabsize | logsize | fontsize | fade_ratio | mod_meta_key |
mod_meta_mode | bel_mode | use_anti_alias |
@@ -83,6 +84,7 @@
select_pty = <pty dev name>
snapshot = <encoding name>:<file name> | <none>
tabsize = <any ASCII decimal digit>
+ title = <pty title>
use_anti_alias = true | false
use_bidi = true | false
use_combining = true | false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/kiklib/src/kik_time.c
new/mlterm-2.9.3.20071112/kiklib/src/kik_time.c
--- old/mlterm-2.9.3.20070123/kiklib/src/kik_time.c 2002-05-14
14:05:26.000000000 +0200
+++ new/mlterm-2.9.3.20071112/kiklib/src/kik_time.c 2007-11-12
17:00:01.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * $Id: kik_time.c,v 1.5 2002/05/14 12:05:26 arakiken Exp $
+ * $Id: kik_time.c,v 1.6 2007/01/24 20:47:09 mfabian Exp $
*/
#include "kik_time.h"
@@ -21,7 +21,7 @@
static char * abbrev_wdays[] = { "Sun" , "Mon" , "Tue" , "Wed" , "Thu" ,
"Fri" , "Sat" } ;
-static char * wdays[] = { "Sunday" , "Monday" , "Tuesday" , "Wednesday" ,
"Thursday" , "Saturday" } ;
+static char * wdays[] = { "Sunday" , "Monday" , "Tuesday" , "Wednesday" ,
"Thursday" , "Friday", "Saturday" } ;
static char * abbrev_months[] = { "Jan" , "Feb" , "Mar" , "Apr" , "May" ,
"Jun" , "Jul" , "Aug" ,
"Sep" , "Oct" , "Nov" , "Dec" } ;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/mlterm/ml_config_menu.c
new/mlterm-2.9.3.20071112/mlterm/ml_config_menu.c
--- old/mlterm-2.9.3.20070123/mlterm/ml_config_menu.c 2007-01-24
20:50:33.000000000 +0100
+++ new/mlterm-2.9.3.20071112/mlterm/ml_config_menu.c 2007-11-12
17:00:06.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * $Id: ml_config_menu.c,v 1.7 2006/10/19 14:41:51 h_minami Exp $
+ * $Id: ml_config_menu.c,v 1.8 2007/04/28 03:39:25 h_minami Exp $
*/
#include "ml_config_menu.h"
@@ -11,7 +11,7 @@
#include <kiklib/kik_debug.h>
#include <kiklib/kik_util.h> /* DIGIT_STR_LEN */
#include <kiklib/kik_mem.h> /* malloc */
-
+#include <kiklib/kik_file.h> /* kik_file_set_cloexec,
kik_file_unset_cloexec */
#ifndef LIBEXECDIR
#define LIBEXECDIR /usr/local/libexec
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/mlterm/ml_term.h
new/mlterm-2.9.3.20071112/mlterm/ml_term.h
--- old/mlterm-2.9.3.20070123/mlterm/ml_term.h 2005-02-17 02:59:57.000000000
+0100
+++ new/mlterm-2.9.3.20071112/mlterm/ml_term.h 2007-11-12 17:00:07.000000000
+0100
@@ -1,5 +1,5 @@
/*
- * $Id: ml_term.h,v 1.26 2005/02/17 01:59:57 h_minami Exp $
+ * $Id: ml_term.h,v 1.27 2007/04/26 15:14:13 h_minami Exp $
*/
/*
@@ -101,7 +101,7 @@
int ml_term_init_encoding_conv( ml_term_t * term) ;
-int ml_term_enable_logging_vt_seq( ml_term_t * term) ;
+int ml_term_set_logging_vt_seq( ml_term_t * term , int flag) ;
int ml_term_get_pty_fd( ml_term_t * term) ;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/xwindow/x_dnd.c
new/mlterm-2.9.3.20071112/xwindow/x_dnd.c
--- old/mlterm-2.9.3.20070123/xwindow/x_dnd.c 2006-09-08 15:23:02.000000000
+0200
+++ new/mlterm-2.9.3.20071112/xwindow/x_dnd.c 2007-11-12 17:00:32.000000000
+0100
@@ -1,7 +1,7 @@
/** @file
* @brief X Drag and Drop protocol support
*
- * $Id: x_dnd.c,v 1.46 2005/10/19 04:09:37 h_minami Exp $
+ * $Id: x_dnd.c,v 1.48 2007/04/29 17:41:52 h_minami Exp $
*/
#include "x_window.h"
@@ -151,6 +151,8 @@
int pos ;
unsigned char * delim ;
+ if( len <= 0)
+ return FAILURE ;
if( !(win->utf8_selection_notified))
return FAILURE ;
pos = 0 ;
@@ -238,10 +240,11 @@
{
char * value ;
- src[len-1] = '\0'; /* force termination for malicious peers */
-
+ if( len <= 0)
+ return FAILURE ;
if( !(win->set_xdnd_config))
return FAILURE ;
+ src[len-1] = '\0'; /* force termination for malicious peers */
value = strchr( (char *)src, '=') ;
if( !value)
return FAILURE ;
@@ -276,7 +279,7 @@
#ifdef DEBUG
kik_debug_printf( "bgcolor: %s\n" , buffer) ;
#endif
- parse_mlterm_config( win, buffer, 0) ;
+ parse_mlterm_config( win, buffer, strlen(buffer)+1) ;
return SUCCESS ;
}
@@ -290,11 +293,13 @@
char * head ;
char tail;
+ if( len <= 0 )
+ return FAILURE ;
if( !(win->set_xdnd_config))
return FAILURE ;
tail = src[len -1] ;
- src[len -1] = 0 ;
+ src[len-1] = 0 ;
if( (head = strstr( (char *)src, "file://")))
{
@@ -338,7 +343,7 @@
int i;
kik_debug_printf( ">%s<\n", (char *)src) ;
- for( i = 0 ; i < 100 && i < len ; i++)
+ for( i = 0 ; (i < 100) && (i < len) ; i++)
kik_debug_printf( "\n%d %x" ,i, src[i]) ;
return SUCCESS ;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mlterm-2.9.3.20070123/xwindow/x_screen.c
new/mlterm-2.9.3.20071112/xwindow/x_screen.c
--- old/mlterm-2.9.3.20070123/xwindow/x_screen.c 2007-01-24
20:50:34.000000000 +0100
+++ new/mlterm-2.9.3.20071112/xwindow/x_screen.c 2007-11-12
17:00:32.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * $Id: x_screen.c,v 1.139 2006/11/20 10:12:35 seiichi Exp $
+ * $Id: x_screen.c,v 1.141 2007/09/28 05:58:48 h_minami Exp $
*/
#include "x_screen.h"
@@ -3438,6 +3438,17 @@
config_menu( screen , event->x , event->y ,
MLCONFIG_PATH) ;
}
}
+ else if( event->button == 3)
+ {
+ /* expand if current selection exists. */
+ /* FIXME: move sel.* stuff should be in x_selection.c */
+ if(screen->sel.is_reversed)
+ {
+ screen->sel.is_selecting = 1 ;
+ selecting_with_motion( screen, event->x, event->y,
event->time);
+ /* keep sel as selected to handle succeeding
MotionNotify */
+ }
+ }
else if ( event->button == 4)
{
/* wheel mouse */
@@ -4945,6 +4956,12 @@
{
change_icon( screen, value) ;
}
+ else if( strcmp( key , "title") == 0)
+ {
+ if(screen->xterm_listener.set_window_name){
+ screen->xterm_listener.set_window_name( screen, value) ;
+ }
+ }
else if( strcmp( key , "logging_vt_seq") == 0)
{
int flag ;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |