Hello community,
here is the log from the commit of package yast2-ncurses for openSUSE:Factory
checked in at Tue Nov 30 15:55:48 CET 2010.
--------
--- yast2-ncurses/yast2-ncurses.changes 2010-11-11 13:49:28.000000000 +0100
+++ yast2-ncurses/yast2-ncurses.changes 2010-11-25 16:48:20.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 25 16:37:09 CET 2010 - gs@suse.de
+
+- Correct color for keyboard shortcut, visible cursor in multi line
+ text entry (bug-fix for bnc #652240)
+- V 2.20.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ncurses-2.20.0.tar.bz2
New:
----
yast2-ncurses-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.bR0d52/_old 2010-11-30 15:52:01.000000000 +0100
+++ /var/tmp/diff_new_pack.bR0d52/_new 2010-11-30 15:52:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.20.0)
+# spec file for package yast2-ncurses (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-ncurses
-Version: 2.20.0
+Version: 2.20.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.20.0.tar.bz2
+Source0: yast2-ncurses-2.20.1.tar.bz2
Prefix: /usr
@@ -56,7 +56,7 @@
component for YaST2.
%prep
-%setup -n yast2-ncurses-2.20.0
+%setup -n yast2-ncurses-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-ncurses-2.20.0.tar.bz2 -> yast2-ncurses-2.20.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/VERSION new/yast2-ncurses-2.20.1/VERSION
--- old/yast2-ncurses-2.20.0/VERSION 2010-11-11 13:42:56.000000000 +0100
+++ new/yast2-ncurses-2.20.1/VERSION 2010-11-25 16:36:55.000000000 +0100
@@ -1 +1 @@
-2.20.0
+2.20.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/src/NCApplication.cc new/yast2-ncurses-2.20.1/src/NCApplication.cc
--- old/yast2-ncurses-2.20.0/src/NCApplication.cc 2010-10-21 14:00:23.000000000 +0200
+++ new/yast2-ncurses-2.20.1/src/NCApplication.cc 2010-11-23 11:24:28.000000000 +0100
@@ -17,7 +17,7 @@
/-*/
-#include
+#include
#define YUILogComponent "ncurses"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/src/NCPadWidget.cc new/yast2-ncurses-2.20.1/src/NCPadWidget.cc
--- old/yast2-ncurses-2.20.0/src/NCPadWidget.cc 2010-10-21 14:00:23.000000000 +0200
+++ new/yast2-ncurses-2.20.1/src/NCPadWidget.cc 2010-11-25 16:10:09.000000000 +0100
@@ -403,6 +403,8 @@
if ( !win )
return;
+ yuiDebug() << "wRedraw called for: " << win << endl;
+
const NCstyle::StWidget & style( frameStyle() );
win->bkgdset( style.plain );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/src/NCTextPad.cc new/yast2-ncurses-2.20.1/src/NCTextPad.cc
--- old/yast2-ncurses-2.20.0/src/NCTextPad.cc 2010-11-11 13:43:55.000000000 +0100
+++ new/yast2-ncurses-2.20.1/src/NCTextPad.cc 2010-11-25 16:40:15.000000000 +0100
@@ -106,7 +106,9 @@
bkgdset( parw.widgetStyle().data );
}
else
+ {
add_attr_char( curs.L, curs.C );
+ }
}
}
@@ -349,8 +351,13 @@
wchar_t wch[2];
wch[0] = key;
wch[1] = L'\0';
-
+
setcchar( &cchar, wch, attr, color, NULL );
+// libncurses6 enables ext_color from struct cchar_t (see curses.h).
+// Set ext_color to 0 to respect the settings got from attr_get (bnc#652240).
+#if NCURSES_EXT_COLORS==20100109
+ cchar.ext_color = 0;
+#endif
ins_wch( curs.L, curs.C++, &cchar );
return true;
@@ -487,6 +494,11 @@
wch[1] = L'\0';
setcchar( &cchar, wch, attr, color, NULL );
+// libncurses6 enables ext_color from struct cchar_t (see curses.h).
+// Set ext_color to 0 to respect the settings got from attr_get (bcn#652240).
+#if NCURSES_EXT_COLORS==20100109
+ cchar.ext_color = 0;
+#endif
ins_wch( cl, cc++, &cchar );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/src/NCstyle.h new/yast2-ncurses-2.20.1/src/NCstyle.h
--- old/yast2-ncurses-2.20.0/src/NCstyle.h 2010-10-21 14:00:23.000000000 +0200
+++ new/yast2-ncurses-2.20.1/src/NCstyle.h 2010-11-17 11:40:35.000000000 +0100
@@ -19,7 +19,7 @@
#ifndef NCstyle_h
#define NCstyle_h
-#include
+#include
#include <iosfwd>
#include <string>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/src/NCurses.h new/yast2-ncurses-2.20.1/src/NCurses.h
--- old/yast2-ncurses-2.20.0/src/NCurses.h 2010-10-21 14:00:23.000000000 +0200
+++ new/yast2-ncurses-2.20.1/src/NCurses.h 2010-11-23 11:23:04.000000000 +0100
@@ -28,7 +28,7 @@
#include
#include
-#include /* curses.h: #define NCURSES_CH_T cchar_t */
+#include /* curses.h: #define NCURSES_CH_T cchar_t */
#include
#include "ncursesw.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.20.0/src/ncursesw.cc new/yast2-ncurses-2.20.1/src/ncursesw.cc
--- old/yast2-ncurses-2.20.0/src/ncursesw.cc 2010-10-21 14:00:23.000000000 +0200
+++ new/yast2-ncurses-2.20.1/src/ncursesw.cc 2010-11-25 16:24:19.000000000 +0100
@@ -137,6 +137,11 @@
int ret = mvwin_wch( w, y, x, combined );
combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET );
+// libncurses6 enables ext_color from struct cchar_t (see curses.h).
+// Set ext_color to 0 to respect the settings got from mvwin_wch (bnc#652240).
+#if NCURSES_EXT_COLORS==20100109
+ combined->ext_color = 0;
+#endif
return ret;
}
@@ -145,7 +150,11 @@
{
int ret = win_wch( w, combined );
combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET );
-
+// libncurses6 enables ext_color from struct cchar_t (see curses.h).
+// Set ext_color to 0 to respect the settings got from win_wch (bnc#652240).
+#if NCURSES_EXT_COLORS==20100109
+ combined->ext_color = 0;
+#endif
return ret;
}
@@ -162,7 +171,7 @@
{
cchar_t combined;
ret = in_wchar( y, x, &combined );
-
+
if ( ret == OK )
{
ret = add_wch( &combined );
@@ -191,7 +200,7 @@
ret = add_wch( &combined );
}
}
-
+
return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org