Hello community, here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2014-07-13 14:05:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2014-04-13 13:13:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes 2014-07-13 14:06:24.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 9 12:10:11 CEST 2014 - [email protected] + +- Table sorting: always sort as strings, don't try interpreting + as numbers (bnc #885653) +- 2.46.5 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-2.46.4.tar.bz2 New: ---- libyui-ncurses-2.46.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-doc.spec ++++++ --- /var/tmp/diff_new_pack.ND0Sjt/_old 2014-07-13 14:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ND0Sjt/_new 2014-07-13 14:06:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-ncurses-doc -Version: 2.46.4 +Version: 2.46.5 Release: 0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.ND0Sjt/_old 2014-07-13 14:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ND0Sjt/_new 2014-07-13 14:06:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-ncurses -Version: 2.46.4 +Version: 2.46.5 Release: 0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses-2.46.4.tar.bz2 -> libyui-ncurses-2.46.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.4/ChangeLog new/libyui-ncurses-2.46.5/ChangeLog --- old/libyui-ncurses-2.46.4/ChangeLog 2014-04-08 14:05:46.000000000 +0200 +++ new/libyui-ncurses-2.46.5/ChangeLog 2014-07-09 14:26:30.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 9 12:10:11 CEST 2014 - [email protected] + +- Table sorting: always sort as strings, don't try interpreting + as numbers (bnc #885653) +- 2.46.5 + +------------------------------------------------------------------- Tue Apr 8 12:42:03 CEST 2014 - [email protected] - Display menu (function keys) correctly in non UTF-8 environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.4/VERSION.cmake new/libyui-ncurses-2.46.5/VERSION.cmake --- old/libyui-ncurses-2.46.4/VERSION.cmake 2014-04-08 14:05:46.000000000 +0200 +++ new/libyui-ncurses-2.46.5/VERSION.cmake 2014-07-09 14:26:30.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "46" ) -SET( VERSION_PATCH "4" ) +SET( VERSION_PATCH "5" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.4/src/NCTablePad.h new/libyui-ncurses-2.46.5/src/NCTablePad.h --- old/libyui-ncurses-2.46.4/src/NCTablePad.h 2014-02-21 11:37:26.000000000 +0100 +++ new/libyui-ncurses-2.46.5/src/NCTablePad.h 2014-07-09 14:26:30.000000000 +0200 @@ -82,26 +82,11 @@ { std::wstring w1 = first->GetCol( _uiCol )->Label().getText().begin()->str(); std::wstring w2 = second->GetCol( _uiCol )->Label().getText().begin()->str(); - wchar_t *endptr1 = 0; - wchar_t *endptr2 = 0; - long int number1 = std::wcstol( w1.data(), &endptr1, 10 ); - long int number2 = std::wcstol( w2.data(), &endptr2, 10 ); + // compare strings using collating information + int result = std::wcscoll ( w1.data(), w2.data() ); - // both are numbers - if ( w1.data() != endptr1 && w2.data() != endptr2 ) - { - return number1 < number2; - } - else // compare strings - { - int result = std::wcscoll ( w1.data(), w2.data() ); - - if ( result < 0 ) - return true; - else - return false; - } + return ( result < 0 ); } private: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
