Hello community,

here is the log from the commit of package mlterm for openSUSE:11.4
checked in at Thu Jun 30 18:28:15 CEST 2011.

Patchinfo file has no description


--------
--- old-versions/11.4/all/mlterm/mlterm.changes 2010-11-11 15:55:26.000000000 
+0100
+++ /d/11.4/mlterm/mlterm.changes       2011-06-28 09:28:52.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 28 06:51:20 UTC 2011 - [email protected]
+
+- key combinations with Ctrl, Shift or Alt doesn't work with
+  numlock switched on [bnc#702512]
+
+-------------------------------------------------------------------

Package does not exist at destination yet. Using Fallback 
old-versions/11.4/all/mlterm
Destination is old-versions/11.4/UPDATES/all/mlterm
calling whatdependson for 11.4-i586


New:
----
  mlterm-numlock.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mlterm.spec ++++++
--- /var/tmp/diff_new_pack.hRUDwA/_old  2011-06-30 18:27:07.000000000 +0200
+++ /var/tmp/diff_new_pack.hRUDwA/_new  2011-06-30 18:27:07.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package mlterm (Version 3.0.1)
+# spec file for package mlterm
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
 AutoReqProv:    on
 Provides:       locale(xorg-x11:ja;ko;zh;ar;he)
 Version:        3.0.1
-Release:        1
+Release:        14.<RELEASE15>
 Url:            http://mlterm.sourceforge.net/
 # Source0:      http://prdownloads.sourceforge.net/mlterm/mlterm-2.7.0.tar.bz2
 #    cvs -d :pserver:[email protected]:/cvsroot/mlterm login
@@ -51,6 +51,7 @@
 Patch11:        mlterm-pkgconfig.patch
 Patch15:        mlterm-configure.patch
 Patch18:        mlterm-fribidi-link-fix.diff
+Patch19:        mlterm-numlock.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Multilingual Terminal Emulator for X
 
@@ -154,6 +155,7 @@
 %patch11
 %patch15
 %patch18
+%patch19 -p1
 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

++++++ mlterm-numlock.diff ++++++
Description: x_window.c: XK_Num_Lock is added to default_keysyms in
 x_window_get_mod_ignore_mask() to fix SF Bug #3072833 which was caused by
 2010-06-03 fix.  (Thanks to Andreas Metzler)
Origin: http://mlterm.hg.sourceforge.net/hgweb/mlterm/mlterm/rev/b9156f7459b3
Bug: 
http://sourceforge.net/tracker/?func=detail&aid=3072833&group_id=40891&atid=429201
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597380
Author: Araki Ken  <[email protected]>

--- a/xwindow/x_screen.c
+++ b/xwindow/x_screen.c
@@ -2056,7 +2056,7 @@
                is_app_cursor_keys = ml_term_is_app_cursor_keys( screen->term) ;
                is_app_keypad = ml_term_is_app_keypad( screen->term) ;
 
-               if ( event->state)
+               if ( event->state)      /* Check unmasked (raw) state of event. 
*/
                {
                        int  is_shift ;
                        int  is_meta ;
@@ -2209,7 +2209,7 @@
                                }
                                else
                                {
-                                       return ;
+                                       goto  no_keypad ;
                                }
                                
                                goto  write_buf ;
@@ -2238,7 +2238,8 @@
                                                sizeof(table) / 
sizeof(table[0])) ;
                        }
                }
-               
+
+no_keypad:
                if( ( buf = x_shortcut_str( screen->shortcut , ksym , 
masked_state)))
                {
                        if( strncmp( buf , "proto:" , 6) == 0)
@@ -2583,6 +2584,7 @@
 
                        buf = buf_escseq ;
                }
+               /* Check unmasked (raw) state of event. */
                else if( screen->mod_meta_mask & event->state)
                {
                        if( screen->mod_meta_mode == MOD_META_OUTPUT_ESC)
--- a/xwindow/x_window.c
+++ b/xwindow/x_window.c
@@ -3347,8 +3347,8 @@
        int  count ;
        u_int  ignore ;
        u_int  masks[] = { Mod1Mask , Mod2Mask , Mod3Mask , Mod4Mask , Mod5Mask 
} ;
-       KeySym default_keysyms[] = { XK_Scroll_Lock, XK_ISO_Level3_Lock,
-                                    NoSymbol} ;
+       KeySym default_keysyms[] = { XK_Num_Lock , XK_Scroll_Lock , 
XK_ISO_Level3_Lock ,
+                                    NoSymbol } ;
 
        if( !keysyms)
        {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to