Hello community,
here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory
checked in at 2020-06-10 00:39:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg"
Wed Jun 10 00:39:14 2020 rev:54 rq:812661 version:2.48.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes
2020-03-27 21:56:49.978776543 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.3606/libyui-qt-pkg.changes
2020-06-10 00:39:31.885575337 +0200
@@ -1,0 +2,18 @@
+Thu Jun 4 12:36:18 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
+
+- Use new parent lib SO version libyui.so.12 (bsc#1172513)
+- 2.48.2
+
+-------------------------------------------------------------------
+Wed May 20 11:04:22 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
+
+- Fixed compatibility with older (pre-5.15) Qt versions (bsc#1165118)
+- 2.48.1
+
+-------------------------------------------------------------------
+Mon May 18 09:48:00 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
+
+- Allow vendor change also for distribution upgrade (bsc#1170521)
+- 2.48.0
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-pkg-2.47.5.tar.bz2
New:
----
libyui-qt-pkg-2.48.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.GwR7r0/_old 2020-06-10 00:39:33.081578474 +0200
+++ /var/tmp/diff_new_pack.GwR7r0/_new 2020-06-10 00:39:33.085578484 +0200
@@ -17,9 +17,9 @@
%define parent libyui-qt-pkg
-%define so_version 11
+%define so_version 12
Name: %{parent}-doc
-Version: 2.47.5
+Version: 2.48.2
Release: 0
Summary: Libyui-qt-pkg documentation
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.GwR7r0/_old 2020-06-10 00:39:33.125578589 +0200
+++ /var/tmp/diff_new_pack.GwR7r0/_new 2020-06-10 00:39:33.129578600 +0200
@@ -16,12 +16,12 @@
#
-%define so_version 11
+%define so_version 12
%define bin_name %{name}%{so_version}
%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1
%define libzypp_devel_version libzypp-devel >= 17.21.0
Name: libyui-qt-pkg
-Version: 2.47.5
+Version: 2.48.2
Release: 0
Summary: Libyui - Qt Package Selector
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ libyui-qt-pkg-2.47.5.tar.bz2 -> libyui-qt-pkg-2.48.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/VERSION.cmake
new/libyui-qt-pkg-2.48.2/VERSION.cmake
--- old/libyui-qt-pkg-2.47.5/VERSION.cmake 2020-03-26 11:53:10.000000000
+0100
+++ new/libyui-qt-pkg-2.48.2/VERSION.cmake 2020-06-08 17:08:06.000000000
+0200
@@ -1,9 +1,9 @@
SET( VERSION_MAJOR "2" )
-SET( VERSION_MINOR "47" )
-SET( VERSION_PATCH "5" )
+SET( VERSION_MINOR "48" )
+SET( VERSION_PATCH "2" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
-##### This is need for the libyui core, ONLY.
+##### This is need for the libyui core ONLY.
##### These will be overridden from exports in LibyuiConfig.cmake
SET( SONAME_MAJOR "0" )
SET( SONAME_MINOR "0" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/package/libyui-qt-pkg-doc.spec
new/libyui-qt-pkg-2.48.2/package/libyui-qt-pkg-doc.spec
--- old/libyui-qt-pkg-2.47.5/package/libyui-qt-pkg-doc.spec 2020-03-26
11:53:10.000000000 +0100
+++ new/libyui-qt-pkg-2.48.2/package/libyui-qt-pkg-doc.spec 2020-06-08
17:08:06.000000000 +0200
@@ -17,9 +17,9 @@
%define parent libyui-qt-pkg
-%define so_version 11
+%define so_version 12
Name: %{parent}-doc
-Version: 2.47.5
+Version: 2.48.2
Release: 0
Summary: Libyui-qt-pkg documentation
License: LGPL-2.1-only OR LGPL-3.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/package/libyui-qt-pkg.changes
new/libyui-qt-pkg-2.48.2/package/libyui-qt-pkg.changes
--- old/libyui-qt-pkg-2.47.5/package/libyui-qt-pkg.changes 2020-03-26
11:53:10.000000000 +0100
+++ new/libyui-qt-pkg-2.48.2/package/libyui-qt-pkg.changes 2020-06-08
17:08:06.000000000 +0200
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Thu Jun 4 12:36:18 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
+
+- Use new parent lib SO version libyui.so.12 (bsc#1172513)
+- 2.48.2
+
+-------------------------------------------------------------------
+Wed May 20 11:04:22 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
+
+- Fixed compatibility with older (pre-5.15) Qt versions (bsc#1165118)
+- 2.48.1
+
+-------------------------------------------------------------------
+Mon May 18 09:48:00 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
+
+- Allow vendor change also for distribution upgrade (bsc#1170521)
+- 2.48.0
+
+-------------------------------------------------------------------
Thu Mar 26 10:16:35 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
- Fixed Qt 5.15-Beta2 deprecated warnings (bsc#1165118)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/package/libyui-qt-pkg.spec
new/libyui-qt-pkg-2.48.2/package/libyui-qt-pkg.spec
--- old/libyui-qt-pkg-2.47.5/package/libyui-qt-pkg.spec 2020-03-26
11:53:10.000000000 +0100
+++ new/libyui-qt-pkg-2.48.2/package/libyui-qt-pkg.spec 2020-06-08
17:08:06.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define so_version 11
+%define so_version 12
%define bin_name %{name}%{so_version}
%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1
%define libzypp_devel_version libzypp-devel >= 17.21.0
Name: libyui-qt-pkg
-Version: 2.47.5
+Version: 2.48.2
Release: 0
Summary: Libyui - Qt Package Selector
License: LGPL-2.1-only OR LGPL-3.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/src/YQPackageSelector.cc
new/libyui-qt-pkg-2.48.2/src/YQPackageSelector.cc
--- old/libyui-qt-pkg-2.47.5/src/YQPackageSelector.cc 2020-03-26
11:53:10.000000000 +0100
+++ new/libyui-qt-pkg-2.48.2/src/YQPackageSelector.cc 2020-06-08
17:08:06.000000000 +0200
@@ -1518,6 +1518,7 @@
_repoUpgradingLabel->setVisible(!_repoUpgradingLabel->text().isEmpty());
}
+
void
YQPackageSelector::slotRepoUpgradeLabelLinkClicked(const QString &link)
{
@@ -1663,11 +1664,11 @@
YQPackageSelector::pkgAllowVendorChangeChanged( bool on )
{
zypp::getZYpp()->resolver()->setAllowVendorChange( on );
+ zypp::getZYpp()->resolver()->dupSetAllowVendorChange( on ); // bsc#1170521
resolveDependencies();
}
-
void
YQPackageSelector::installSubPkgs( const QString & suffix )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/src/YQPkgConflictList.cc
new/libyui-qt-pkg-2.48.2/src/YQPkgConflictList.cc
--- old/libyui-qt-pkg-2.47.5/src/YQPkgConflictList.cc 2020-03-26
11:53:10.000000000 +0100
+++ new/libyui-qt-pkg-2.48.2/src/YQPkgConflictList.cc 2020-06-08
17:08:06.000000000 +0200
@@ -333,9 +333,6 @@
connect( detailsLabel, SIGNAL( linkActivated ( const QString &
) ),
this, SLOT ( detailsExpanded()
) );
-
- connect( detailsLabel, SIGNAL( linkHovered ( const QString & )
),
- this, SLOT ( detailsTooltip()
) );
QHBoxLayout * hbox = new QHBoxLayout();
hbox->addSpacing( 15 );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.47.5/src/YQPkgDescriptionView.cc
new/libyui-qt-pkg-2.48.2/src/YQPkgDescriptionView.cc
--- old/libyui-qt-pkg-2.47.5/src/YQPkgDescriptionView.cc 2020-03-26
11:53:10.000000000 +0100
+++ new/libyui-qt-pkg-2.48.2/src/YQPkgDescriptionView.cc 2020-06-08
17:08:06.000000000 +0200
@@ -54,16 +54,23 @@
#include "YQUI.h"
#include <qbuffer.h>
+#if (QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ))
+# define QT_KEEP_EMPTY_PARTS QString::KeepEmptyParts
+#else
+# define QT_KEEP_EMPTY_PARTS Qt::KeepEmptyParts
+#endif
+
#define DESKTOP_TRANSLATIONS "desktop_translations"
#define DESKTOPFILEDIR "\\/share\\/applications\\/.*\\.desktop$"
// RegExp
-
using std::list;
using std::endl;
using std::string;
using namespace zypp;
+
+
YQPkgDescriptionView::YQPkgDescriptionView( QWidget * parent, bool
showSupportability )
: YQPkgGenericDetailsView( parent )
, _showSupportability ( showSupportability )
@@ -156,7 +163,7 @@
bool foundAuthorsList = false;
QString html_text = "<p>";
- QStringList lines = text.trimmed().split( '\n', Qt::KeepEmptyParts );
+ QStringList lines = text.trimmed().split( '\n', QT_KEEP_EMPTY_PARTS );
QStringList::const_iterator it = lines.begin();
while ( it != lines.end() )
