Hello community, here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2017-05-17 10:46:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses" Wed May 17 10:46:28 2017 rev:33 rq:493697 version:2.48.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2016-11-23 13:35:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes 2017-05-17 10:46:29.533186478 +0200 @@ -1,0 +2,12 @@ +Tue May 9 14:11:59 CEST 2017 - [email protected] + +- adjustments needed to work with latest ncurses update (bsc#1034922) +- 2.48.2 + +------------------------------------------------------------------- +Wed Nov 30 08:43:16 UTC 2016 - [email protected] + +- Treat RichText non-pair tag cases (gh#libyui-ncurses/issues#33). +- 2.48.1 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-2.48.0.tar.bz2 New: ---- libyui-ncurses-2.48.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-doc.spec ++++++ --- /var/tmp/diff_new_pack.r07DA9/_old 2017-05-17 10:46:30.165097586 +0200 +++ /var/tmp/diff_new_pack.r07DA9/_new 2017-05-17 10:46:30.169097023 +0200 @@ -1,7 +1,7 @@ # # spec file for package libyui-ncurses-doc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.48.0 +Version: 2.48.2 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.r07DA9/_old 2017-05-17 10:46:30.209091397 +0200 +++ /var/tmp/diff_new_pack.r07DA9/_new 2017-05-17 10:46:30.213090835 +0200 @@ -1,7 +1,7 @@ # # spec file for package libyui-ncurses # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libyui-ncurses -Version: 2.48.0 +Version: 2.48.2 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-ncurses-2.48.0.tar.bz2 -> libyui-ncurses-2.48.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/.travis.yml new/libyui-ncurses-2.48.2/.travis.yml --- old/libyui-ncurses-2.48.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.48.2/.travis.yml 2017-05-09 15:10:43.616851239 +0200 @@ -0,0 +1,11 @@ +sudo: required +language: bash +services: + - docker + +before_install: + - docker build -t libyui-ncurses-image . +script: + # the "libyui-travis" script is included in the base libyui/devel image + # see https://github.com/libyui/docker-devel/blob/master/libyui-travis + - docker run -it libyui-ncurses-image libyui-travis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/Dockerfile new/libyui-ncurses-2.48.2/Dockerfile --- old/libyui-ncurses-2.48.0/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-2.48.2/Dockerfile 2017-05-09 15:10:43.616851239 +0200 @@ -0,0 +1,4 @@ +# Use the libyui/devel image as the base +FROM libyui/devel + +COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/README.md new/libyui-ncurses-2.48.2/README.md --- old/libyui-ncurses-2.48.0/README.md 2016-10-20 15:15:08.324983940 +0200 +++ new/libyui-ncurses-2.48.2/README.md 2017-05-09 15:10:43.616851239 +0200 @@ -1,22 +1,34 @@ - +# LibYUI - The Ncurses (Text Mode) Frontend -Libyui is a widget abstraction library providing Qt, GTK and ncurses -frontends. It was developed for [YaST](http://yast.github.io/). +[](https://travis-ci.org/libyui/libyui-ncurses) + + +[Libyui](https://github.com/libyui/libyui) is a widget abstraction library +providing Qt, GTK and ncurses frontends. Originally it was developed for +[YaST](https://yast.github.io/) but it can be used in any independent project. + +This part contains the text mode front end which displays the UI in a console +or a terminal emulator. ### Building Libyui uses CMake, driven by a slightly complex set of -[CMakefiles](https://github.com/libyui/libyui/tree/master/buildtools). +[CMakefiles](https://github.com/libyui/libyui/tree/master/buildtools). For +reproducible builds it is best to use the [libyui-rake]( +https://github.com/libyui/libyui-rake) Ruby gem like the [Jenkins CI]( +https://ci.opensuse.org/view/libyui/) jobs do. -For reproducible builds it is best to use -[rubygem-packaging_rake_tasks.rpm](https://github.com/openSUSE/packaging_tasks) -like the [Jenkins CI](https://ci.opensuse.org/view/libyui/) jobs do. +It can be installed from [rubygems.org](https://rubygems.org/gems/libyui-rake/) +using this command (Ruby needs to be installed in the system): -You need [the base libyui library](https://github.com/libyui/libyui) -checked out in `../libyui` (or point the environment variable `LIBYUI_BASE` -to it). +``` +gem install libyui-rake +``` + +Then to build the package run: -Then run: ``` -rake -f ../libyui/Rakefile osc:build +rake osc:build ``` + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/VERSION.cmake new/libyui-ncurses-2.48.2/VERSION.cmake --- old/libyui-ncurses-2.48.0/VERSION.cmake 2016-11-21 15:59:27.520253019 +0100 +++ new/libyui-ncurses-2.48.2/VERSION.cmake 2017-05-09 15:10:43.616851239 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "48" ) -SET( VERSION_PATCH "0" ) +SET( VERSION_PATCH "2" ) 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.48.0/package/libyui-ncurses-doc.spec new/libyui-ncurses-2.48.2/package/libyui-ncurses-doc.spec --- old/libyui-ncurses-2.48.0/package/libyui-ncurses-doc.spec 2016-11-21 15:59:27.520253019 +0100 +++ new/libyui-ncurses-2.48.2/package/libyui-ncurses-doc.spec 2017-05-09 15:10:43.616851239 +0200 @@ -19,7 +19,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.48.0 +Version: 2.48.2 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/package/libyui-ncurses.changes new/libyui-ncurses-2.48.2/package/libyui-ncurses.changes --- old/libyui-ncurses-2.48.0/package/libyui-ncurses.changes 2016-11-21 15:59:27.532253019 +0100 +++ new/libyui-ncurses-2.48.2/package/libyui-ncurses.changes 2017-05-09 15:10:43.628851239 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue May 9 14:11:59 CEST 2017 - [email protected] + +- adjustments needed to work with latest ncurses update (bsc#1034922) +- 2.48.2 + +------------------------------------------------------------------- +Wed Nov 30 08:43:16 UTC 2016 - [email protected] + +- Treat RichText non-pair tag cases (gh#libyui-ncurses/issues#33). +- 2.48.1 + +------------------------------------------------------------------- Wed Nov 16 12:47:36 UTC 2016 - [email protected] - Add hotkey for help about advanced hotkeys (bsc#1010039) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/package/libyui-ncurses.spec new/libyui-ncurses-2.48.2/package/libyui-ncurses.spec --- old/libyui-ncurses-2.48.0/package/libyui-ncurses.spec 2016-11-21 15:59:27.532253019 +0100 +++ new/libyui-ncurses-2.48.2/package/libyui-ncurses.spec 2017-05-09 15:10:43.628851239 +0200 @@ -17,7 +17,7 @@ Name: libyui-ncurses -Version: 2.48.0 +Version: 2.48.2 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/src/NCRichText.cc new/libyui-ncurses-2.48.2/src/NCRichText.cc --- old/libyui-ncurses-2.48.0/src/NCRichText.cc 2016-10-20 15:15:08.336983940 +0200 +++ new/libyui-ncurses-2.48.2/src/NCRichText.cc 2017-05-09 15:10:43.640851239 +0200 @@ -431,6 +431,7 @@ // replace <br> by \n to get appropriate lines in NCtext boost::replace_all( wtxt, L"<br>", L"\n" ); + boost::replace_all( wtxt, L"<br/>", L"\n" ); yuiDebug() << "Text: " << wtxt << " initial length: " << wch - osch << std::endl; @@ -887,6 +888,12 @@ if ( value == L"big" ) token = T_IGNORE; else if ( value == L"pre" ) token = T_PLAIN; + // <br> and <hr> are the only non-pair tags currently supported. + // We treat bellow these two special cases in order to work as + // users expect. This issue was described at + // https://github.com/libyui/libyui-ncurses/issues/33 + else if ( value == L"br/" ) token = T_BR; + else if ( value == L"hr/" ) token = T_IGNORE; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.48.0/src/NCTextPad.cc new/libyui-ncurses-2.48.2/src/NCTextPad.cc --- old/libyui-ncurses-2.48.0/src/NCTextPad.cc 2016-10-20 15:15:08.336983940 +0200 +++ new/libyui-ncurses-2.48.2/src/NCTextPad.cc 2017-05-09 15:10:43.640851239 +0200 @@ -370,23 +370,28 @@ assertWidth( ++( *cline ) ); cchar_t cchar; - attr_t attr; - short int color; - wattr_get( w, &attr, &color, NULL ); // NOTE: (w)attr_get is not probided by NCursesWindow + attr_t attr = 0; + short int color = 0; + int ret = wattr_get( w, &attr, &color, NULL ); // NOTE: (w)attr_get is not provided by NCursesWindow + if (ret != OK) + return false; wchar_t wch[2]; wch[0] = key; wch[1] = L'\0'; - setcchar( &cchar, wch, attr, color, NULL ); + ret = setcchar( &cchar, wch, attr, color, NULL ); + if (ret != OK) + return false; + // 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). #ifdef NCURSES_EXT_COLORS cchar.ext_color = 0; #endif - ins_wch( curs.L, curs.C++, &cchar ); + ret = ins_wch( curs.L, curs.C++, &cchar ); - return true; + return (ret == OK); } @@ -489,9 +494,9 @@ curs = 0; cchar_t cchar; - attr_t attr; - short int color; - wattr_get( w, &attr, &color, NULL ); // NOTE: (w)attr_get is not probided by NCursesWindow + attr_t attr = 0; + short int color = 0; + wattr_get( w, &attr, &color, NULL ); // NOTE: (w)attr_get is not provided by NCursesWindow wchar_t wch[2]; wch[1] = L'\0';
