Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2023-10-13 23:13:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new.20540 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui" Fri Oct 13 23:13:39 2023 rev:90 rq:1116919 version:4.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2023-06-01 17:19:12.246047887 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new.20540/libyui.changes 2023-10-13 23:13:40.984865186 +0200 @@ -1,0 +2,12 @@ +Tue Oct 10 12:49:11 UTC 2023 - Stefan Hundhammer <shundham...@suse.com> + +- Qt Pkg: Show patterns order column if environment variable + Y2_SHOW_PATTERNS_ORDER is set +- Qt Pkg: Show invisible patterns if environment variable + SHOW_INVISIBLE_PATTERNS is set +- Qt Pkg: Fixed pattern categories order: + Use first, not last pattern (bsc#1216093) + https://github.com/libyui/libyui/pull/107 +- 4.6.1 + +------------------------------------------------------------------- Old: ---- libyui-4.6.0.tar.bz2 New: ---- libyui-4.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.g0uc76/_old 2023-10-13 23:13:41.880897686 +0200 +++ /var/tmp/diff_new_pack.g0uc76/_new 2023-10-13 23:13:41.884897831 +0200 @@ -20,7 +20,7 @@ Name: libyui-bindings # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 Summary: Bindings for libyui License: LGPL-2.1-only OR LGPL-3.0-only ++++++ libyui-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.g0uc76/_old 2023-10-13 23:13:41.904898557 +0200 +++ /var/tmp/diff_new_pack.g0uc76/_new 2023-10-13 23:13:41.904898557 +0200 @@ -19,7 +19,7 @@ Name: libyui-ncurses-pkg # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 libyui-ncurses-rest-api.spec: same change libyui-ncurses.spec: same change ++++++ libyui-qt-graph.spec ++++++ --- /var/tmp/diff_new_pack.g0uc76/_old 2023-10-13 23:13:41.972901023 +0200 +++ /var/tmp/diff_new_pack.g0uc76/_new 2023-10-13 23:13:41.976901169 +0200 @@ -19,7 +19,7 @@ Name: libyui-qt-graph # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 ++++++ libyui-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.g0uc76/_old 2023-10-13 23:13:41.996901894 +0200 +++ /var/tmp/diff_new_pack.g0uc76/_new 2023-10-13 23:13:41.996901894 +0200 @@ -19,7 +19,7 @@ Name: libyui-qt-pkg # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 libyui-qt-rest-api.spec: same change libyui-qt.spec: same change libyui-rest-api.spec: same change libyui.spec: same change ++++++ libyui-4.6.0.tar.bz2 -> libyui-4.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/VERSION.cmake new/libyui-4.6.1/VERSION.cmake --- old/libyui-4.6.0/VERSION.cmake 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/VERSION.cmake 2023-10-10 16:42:49.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "4") SET( VERSION_MINOR "6" ) -SET( VERSION_PATCH "0" ) +SET( VERSION_PATCH "1" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) SET( SONAME_MAJOR "16" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/libyui-qt-pkg/src/YQPkgObjList.h new/libyui-4.6.1/libyui-qt-pkg/src/YQPkgObjList.h --- old/libyui-4.6.0/libyui-qt-pkg/src/YQPkgObjList.h 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/libyui-qt-pkg/src/YQPkgObjList.h 2023-10-10 16:42:49.000000000 +0200 @@ -659,6 +659,7 @@ **/ void setText( int column, const QString & text ) { QTreeWidgetItem::setText( column, text ); } + protected: /** * Set a column text via Edition. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/libyui-qt-pkg/src/YQPkgPatternList.cc new/libyui-4.6.1/libyui-qt-pkg/src/YQPkgPatternList.cc --- old/libyui-4.6.0/libyui-qt-pkg/src/YQPkgPatternList.cc 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/libyui-qt-pkg/src/YQPkgPatternList.cc 2023-10-10 16:42:49.000000000 +0200 @@ -56,6 +56,8 @@ { yuiDebug() << "Creating pattern list" << std::endl; + _showInvisiblePatterns = false; + _orderCol = -1; int numCol = 0; QStringList headers; headers << ""; _statusCol = numCol++; @@ -70,10 +72,20 @@ headers << _( "Pattern" ); _summaryCol = numCol++; + // Set this environment variable to get an "Order" column in the patterns list + + if ( getenv( "Y2_SHOW_PATTERNS_ORDER" ) ) + { + headers << _( "Order" ); _orderCol = numCol++; + } + setColumnCount( numCol ); setHeaderLabels( headers ); setIndentation(0); + if ( getenv( "Y2_SHOW_INVISIBLE_PATTERNS" ) ) + _showInvisiblePatterns = true; + // Can use the same colum for "broken" and "satisfied": // Both states are mutually exclusive @@ -136,7 +148,7 @@ if ( zyppPattern ) { - if ( zyppPattern->userVisible() ) + if ( zyppPattern->userVisible() || _showInvisiblePatterns ) { addPatternItem( *it, zyppPattern ); } @@ -253,6 +265,9 @@ resizeColumnToContents( _statusCol ); resizeColumnToContents( _summaryCol ); + if ( showOrderCol() ) + resizeColumnToContents( _orderCol ); + addTopLevelItem(item); applyExcludeRules( item ); } @@ -361,6 +376,19 @@ setIcon( _patternList->iconCol(), YQUI::ui()->loadIcon( iconName ) ); + if ( _patternList->showInvisiblePatterns() && ! _zyppPattern->userVisible() ) + { + // The YQPkgObjListItem base class takes care of setting the name + // and summary columns, but here we want to add something to it. + // Notice that patterns use the summary column. + + QString name = text( _patternList->summaryCol() ); + name += QString( " [%1]" ).arg( _( "Invisible" ) ); + setText( _patternList->summaryCol(), name ); + } + + if ( _patternList->showOrderCol() ) + setText( _patternList->orderCol(), fromUTF8( _zyppPattern->order() ) ); } setStatusIcon(); @@ -455,6 +483,12 @@ if ( _zyppPattern && otherPatternListitem && otherPatternListitem->zyppPattern() ) { + if ( _zyppPattern->order().empty() ) + return false; + + if ( otherPatternListitem->zyppPattern()->order().empty() ) + return true; + if ( _zyppPattern->order() != otherPatternListitem->zyppPattern()->order() ) return _zyppPattern->order() < otherPatternListitem->zyppPattern()->order(); else @@ -474,6 +508,7 @@ const QString & category ) : QY2ListViewItem( patternList ) , _patternList( patternList ) + , _firstPattern( 0 ) { setText( _patternList->summaryCol(), category ); @@ -503,9 +538,19 @@ } else { - if ( _firstPattern->order().compare( pattern->order() ) < 0 ) + if ( _firstPattern->order().empty() ) + { _firstPattern = pattern; + } + else if ( ! pattern->order().empty() && + pattern->order() < _firstPattern->order() ) + { + _firstPattern = pattern; + } } + + if ( _firstPattern && _patternList->showOrderCol() ) + setText( _patternList->orderCol(), fromUTF8( _firstPattern->order() ) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/libyui-qt-pkg/src/YQPkgPatternList.h new/libyui-4.6.1/libyui-qt-pkg/src/YQPkgPatternList.h --- old/libyui-4.6.0/libyui-qt-pkg/src/YQPkgPatternList.h 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/libyui-qt-pkg/src/YQPkgPatternList.h 2023-10-10 16:42:49.000000000 +0200 @@ -59,6 +59,24 @@ **/ virtual ~YQPkgPatternList(); + /** + * Column number for the pattern order or -1 if disabled + **/ + int orderCol() const { return _orderCol; } + + /** + * Flag: Should the order column be shown? + * (set environment variable Y2_SHOW_PATTERNS_ORDER) + **/ + bool showOrderCol() const { return _orderCol >= 0; } + + /** + * Flag: Show invisible patterns, too? + * (set environment variable Y2_SHOW_INVISIBLE_PATTERNS) + **/ + bool showInvisiblePatterns() const { return _showInvisiblePatterns; } + + public slots: /** @@ -150,7 +168,9 @@ // QMap<QString, YQPkgPatternCategoryItem*> _categories; - int _howmanyCol; + + int _orderCol; + bool _showInvisiblePatterns; }; @@ -199,6 +219,7 @@ int statusCol() const { return _patternList->statusCol(); } int summaryCol() const { return _patternList->summaryCol(); } + int orderCol() const { return _patternList->orderCol(); } int totalPackages() const { return _total; } int installedPackages() const { return _installed; } @@ -232,7 +253,10 @@ YQPkgPatternList * _patternList; ZyppPattern _zyppPattern; - // cache for total and installed packages + + + // Cached values + int _total; int _installed; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-bindings.spec new/libyui-4.6.1/package/libyui-bindings.spec --- old/libyui-4.6.0/package/libyui-bindings.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-bindings.spec 2023-10-10 16:42:49.000000000 +0200 @@ -20,7 +20,7 @@ Name: libyui-bindings # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 Summary: Bindings for libyui License: LGPL-2.1-only OR LGPL-3.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-ncurses-pkg.spec new/libyui-4.6.1/package/libyui-ncurses-pkg.spec --- old/libyui-4.6.0/package/libyui-ncurses-pkg.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-ncurses-pkg.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-ncurses-pkg # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-ncurses-rest-api.spec new/libyui-4.6.1/package/libyui-ncurses-rest-api.spec --- old/libyui-4.6.0/package/libyui-ncurses-rest-api.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-ncurses-rest-api.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-ncurses-rest-api # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-ncurses.spec new/libyui-4.6.1/package/libyui-ncurses.spec --- old/libyui-4.6.0/package/libyui-ncurses.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-ncurses.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-ncurses # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-qt-graph.spec new/libyui-4.6.1/package/libyui-qt-graph.spec --- old/libyui-4.6.0/package/libyui-qt-graph.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-qt-graph.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-qt-graph # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-qt-pkg.spec new/libyui-4.6.1/package/libyui-qt-pkg.spec --- old/libyui-4.6.0/package/libyui-qt-pkg.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-qt-pkg.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-qt-pkg # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-qt-rest-api.spec new/libyui-4.6.1/package/libyui-qt-rest-api.spec --- old/libyui-4.6.0/package/libyui-qt-rest-api.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-qt-rest-api.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-qt-rest-api # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-qt.spec new/libyui-4.6.1/package/libyui-qt.spec --- old/libyui-4.6.0/package/libyui-qt.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-qt.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-qt # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui-rest-api.spec new/libyui-4.6.1/package/libyui-rest-api.spec --- old/libyui-4.6.0/package/libyui-rest-api.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui-rest-api.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui-rest-api # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui.changes new/libyui-4.6.1/package/libyui.changes --- old/libyui-4.6.0/package/libyui.changes 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui.changes 2023-10-10 16:42:49.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Oct 10 12:49:11 UTC 2023 - Stefan Hundhammer <shundham...@suse.com> + +- Qt Pkg: Show patterns order column if environment variable + Y2_SHOW_PATTERNS_ORDER is set +- Qt Pkg: Show invisible patterns if environment variable + SHOW_INVISIBLE_PATTERNS is set +- Qt Pkg: Fixed pattern categories order: + Use first, not last pattern (bsc#1216093) + https://github.com/libyui/libyui/pull/107 +- 4.6.1 + +------------------------------------------------------------------- Tue May 30 11:56:44 UTC 2023 - Stefan Hundhammer <shundham...@suse.com> - NCurses UI: Prevent buffer overflow when drawing very wide labels diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-4.6.0/package/libyui.spec new/libyui-4.6.1/package/libyui.spec --- old/libyui-4.6.0/package/libyui.spec 2023-05-30 15:00:39.000000000 +0200 +++ new/libyui-4.6.1/package/libyui.spec 2023-10-10 16:42:49.000000000 +0200 @@ -19,7 +19,7 @@ Name: libyui # DO NOT manually bump the version here; instead, use rake version:bump -Version: 4.6.0 +Version: 4.6.1 Release: 0 %define so_version 16
