Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2019-03-04 09:14:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt" Mon Mar 4 09:14:57 2019 rev:55 rq:680158 version:2.49.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2019-01-21 10:08:01.814820103 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new.28833/libyui-qt.changes 2019-03-04 09:15:02.540658560 +0100 @@ -1,0 +2,7 @@ +Wed Feb 27 17:01:39 UTC 2019 - Stefan Hundhammer <[email protected]> + +- Use YQUI icon loader in YQImage whenever possible + (bsc#1119688, bsc#1122174) +- 2.49.15 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.49.14.tar.bz2 New: ---- libyui-qt-2.49.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.PntyA3/_old 2019-03-04 09:15:03.524658382 +0100 +++ /var/tmp/diff_new_pack.PntyA3/_new 2019-03-04 09:15:03.524658382 +0100 @@ -20,7 +20,8 @@ %define so_version 9 Name: %{parent}-doc -Version: 2.49.14 +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 2.49.15 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.PntyA3/_old 2019-03-04 09:15:03.544658379 +0100 +++ /var/tmp/diff_new_pack.PntyA3/_new 2019-03-04 09:15:03.548658378 +0100 @@ -17,7 +17,8 @@ Name: libyui-qt -Version: 2.49.14 +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 2.49.15 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-qt-2.49.14.tar.bz2 -> libyui-qt-2.49.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/VERSION.cmake new/libyui-qt-2.49.15/VERSION.cmake --- old/libyui-qt-2.49.14/VERSION.cmake 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/VERSION.cmake 2019-02-28 16:29:04.000000000 +0100 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "49") -SET(VERSION_PATCH "14") +SET(VERSION_PATCH "15") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is needed for the libyui-qt core ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/bootstrap.sh new/libyui-qt-2.49.15/bootstrap.sh --- old/libyui-qt-2.49.14/bootstrap.sh 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/bootstrap.sh 2019-02-28 16:29:04.000000000 +0100 @@ -18,7 +18,7 @@ ln -fs "$cmake_common" "$cmake_target" echo "OK: linked to `pwd`/$cmake_target." else - echo " Use must have libyui(-devel) >= 3.0.4 installed" + echo " You must have libyui(-devel) >= 3.0.4 installed" echo " in \"$prefix\" first !!!" exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/package/libyui-qt-doc.spec new/libyui-qt-2.49.15/package/libyui-qt-doc.spec --- old/libyui-qt-2.49.14/package/libyui-qt-doc.spec 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/package/libyui-qt-doc.spec 2019-02-28 16:29:04.000000000 +0100 @@ -20,7 +20,8 @@ %define so_version 9 Name: %{parent}-doc -Version: 2.49.14 +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 2.49.15 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/package/libyui-qt.changes new/libyui-qt-2.49.15/package/libyui-qt.changes --- old/libyui-qt-2.49.14/package/libyui-qt.changes 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/package/libyui-qt.changes 2019-02-28 16:29:04.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 27 17:01:39 UTC 2019 - Stefan Hundhammer <[email protected]> + +- Use YQUI icon loader in YQImage whenever possible + (bsc#1119688, bsc#1122174) +- 2.49.15 + +------------------------------------------------------------------- Thu Jan 10 11:30:28 UTC 2019 - Stefan Hundhammer <[email protected]> - Fixed segfault in YQTableItem icon (bsc#1121083) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/package/libyui-qt.spec new/libyui-qt-2.49.15/package/libyui-qt.spec --- old/libyui-qt-2.49.14/package/libyui-qt.spec 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/package/libyui-qt.spec 2019-02-28 16:29:04.000000000 +0100 @@ -17,7 +17,8 @@ Name: libyui-qt -Version: 2.49.14 +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 2.49.15 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/src/YQImage.cc new/libyui-qt-2.49.15/src/YQImage.cc --- old/libyui-qt-2.49.14/src/YQImage.cc 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/src/YQImage.cc 2019-02-28 16:29:04.000000000 +0100 @@ -32,8 +32,10 @@ #include <yui/YUILog.h> #include "utf8.h" +#include "YQUI.h" #include "YQImage.h" + using std::endl; @@ -83,27 +85,27 @@ { QPixmap pixmap; - if ( QIcon::hasThemeIcon( imageFileName().c_str() ) ) // try the desktop theme first - { - yuiDebug() << "Trying theme icon from " << imageFileName() << endl; - QIcon icon = QIcon::fromTheme( imageFileName().c_str() ); - pixmap = icon.pixmap( 22 ); - } - else // try loading from a plain file + if ( fromUTF8( imageFileName() ).startsWith( "/" ) ) { + // Absolute path specified - bypass the icon loader which might try + // to use a theme icon or the compiled-in Qt resources + + yuiDebug() << "Loading pixmap from absolute path: \"" + << imageFileName() << "\"" << endl; + pixmap = QPixmap( fromUTF8 ( imageFileName() ) ); } - if ( pixmap.isNull() ) // if that failed, try loading from the compiled-in Qt resource files + else { - QString name = QString( ":/%1.svg" ).arg( fromUTF8 ( imageFileName() ) ); - yuiDebug() << "Trying built-in Qt resource icon " << name << endl; - QIcon icon( name ); - pixmap = icon.pixmap( 22 ); + yuiDebug() << "Using icon loader for \"" << imageFileName() << "\"" << endl; + + pixmap = YQUI::ui()->loadIcon( imageFileName() ).pixmap( 22 ); } if ( pixmap.isNull() ) { - yuiError() << "Couldn't load pixmap from " << imageFileName() << endl; + yuiError() << "Couldn't load pixmap from \"" + << imageFileName() << "\"" << endl; } else { @@ -113,13 +115,10 @@ scaledImg = scaledImg.scaled( this->width(), this->height(), Qt::KeepAspectRatio ); pixmap = pixmap.fromImage( scaledImg ); } + _pixmapWidth = pixmap.size().width(); _pixmapHeight = pixmap.size().height(); - yuiDebug() << "Loading image from " << imageFileName() - << " (" << pixmap.size().width() << " x " << pixmap.size().height() << ")" - << endl; - QLabel::setPixmap ( pixmap ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.14/src/YQTree.cc new/libyui-qt-2.49.15/src/YQTree.cc --- old/libyui-qt-2.49.14/src/YQTree.cc 2019-01-10 12:46:43.000000000 +0100 +++ new/libyui-qt-2.49.15/src/YQTree.cc 2019-02-28 16:29:04.000000000 +0100 @@ -493,8 +493,8 @@ if ( _origItem->hasIconName() ) { - //YQTree is annoying with how it loads icons, this is an ugly workaround QIcon icon = QIcon( _tree->iconFullPath( _origItem ).c_str() ); + if ( icon.isNull() ) icon = YQUI::ui()->loadIcon( _origItem->iconName() );
