Hello community, here is the log from the commit of package libyui-qt-graph for openSUSE:Leap:15.2 checked in at 2020-01-17 11:58:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libyui-qt-graph (Old) and /work/SRC/openSUSE:Leap:15.2/.libyui-qt-graph.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-graph" Fri Jan 17 11:58:41 2020 rev:14 rq:761867 version:2.46.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libyui-qt-graph/libyui-qt-graph-doc.changes 2020-01-15 15:25:53.986592591 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libyui-qt-graph.new.26092/libyui-qt-graph-doc.changes 2020-01-17 11:58:42.272431782 +0100 @@ -1,0 +2,6 @@ +Wed Dec 11 10:28:02 UTC 2019 - Rodion Iafarov <[email protected]> + +- Increase SO version to 11 (bsc#1132247) +- 2.46.0 + +------------------------------------------------------------------- @@ -10 +15,0 @@ - --- /work/SRC/openSUSE:Leap:15.2/libyui-qt-graph/libyui-qt-graph.changes 2020-01-15 15:25:54.114592663 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libyui-qt-graph.new.26092/libyui-qt-graph.changes 2020-01-17 11:58:42.316431802 +0100 @@ -1,0 +2,18 @@ +Tue Dec 10 16:36:38 UTC 2019 - Rodion Iafarov <[email protected]> + +- Increase SO version to 11 (bsc#1132247) +- 2.46.0 + +------------------------------------------------------------------- +Mon Dec 2 12:46:46 UTC 2019 - Martin Vidner <[email protected]> + +- Do not require graphviz-devel for the doc package (bsc#1157916) +- 2.45.5 + +------------------------------------------------------------------- +Thu Nov 28 12:51:31 CET 2019 - [email protected] + +- Respect backslashes (graphviz escString) in texts (bsc#1157916) +- 2.45.4 + +------------------------------------------------------------------- Old: ---- libyui-qt-graph-2.45.3.tar.bz2 New: ---- libyui-qt-graph-2.46.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-graph-doc.spec ++++++ --- /var/tmp/diff_new_pack.OThh8G/_old 2020-01-17 11:58:42.744431990 +0100 +++ /var/tmp/diff_new_pack.OThh8G/_new 2020-01-17 11:58:42.744431990 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-graph-doc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,10 +17,10 @@ %define parent libyui-qt-graph -%define so_version 10 +%define so_version 11 Name: %{parent}-doc -Version: 2.45.3 +Version: 2.46.0 Release: 0 Source: %{parent}-%{version}.tar.bz2 @@ -31,12 +31,12 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz-gnome -BuildRequires: libyui-devel >= 3.5.0 +BuildRequires: libyui-devel >= 3.9.0 BuildRequires: texlive-latex Url: http://github.com/libyui/ Summary: Libyui-qt-graph documentation -License: LGPL-2.1 or LGPL-3.0 +License: LGPL-2.1-only OR LGPL-3.0-only Group: Documentation/HTML %description ++++++ libyui-qt-graph.spec ++++++ --- /var/tmp/diff_new_pack.OThh8G/_old 2020-01-17 11:58:42.764432000 +0100 +++ /var/tmp/diff_new_pack.OThh8G/_new 2020-01-17 11:58:42.764432000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-graph # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,11 +17,11 @@ Name: libyui-qt-graph -Version: 2.45.3 +Version: 2.46.0 Release: 0 Source: %{name}-%{version}.tar.bz2 -%define so_version 10 +%define so_version 11 %define bin_name %{name}%{so_version} BuildRequires: cmake >= 2.8 @@ -30,14 +30,14 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-qtx11extras-devel -BuildRequires: libyui-devel >= 3.5.0 +BuildRequires: libyui-devel >= 3.9.0 -%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1 +%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0 BuildRequires: %{libyui_qt_devel_version} Url: http://github.com/libyui/ Summary: Libyui - Qt Graph Widget -License: LGPL-2.1 or LGPL-3.0 +License: LGPL-2.1-only OR LGPL-3.0-only Group: System/Libraries %description @@ -51,8 +51,8 @@ Supplements: libyui-qt%{so_version} Provides: %{name} = %{version} -Provides: yast2-qt-graph = 2.42.0 -Obsoletes: yast2-qt-graph < 2.42.0 +Provides: yast2-qt-graph = 2.46.0 +Obsoletes: yast2-qt-graph < 2.46.0 Url: http://github.com/libyui/ Summary: Libyui - Qt Graph Widget @@ -66,8 +66,8 @@ %package devel -Requires: %{libyui_qt_devel_version} Requires: %{bin_name} = %{version} +Requires: %{libyui_qt_devel_version} Url: http://github.com/libyui/ Summary: Libyui-qt-graph header files ++++++ libyui-qt-graph-2.45.3.tar.bz2 -> libyui-qt-graph-2.46.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/Libyui-qt-graphLibgvc.cmake new/libyui-qt-graph-2.46.0/Libyui-qt-graphLibgvc.cmake --- old/libyui-qt-graph-2.45.3/Libyui-qt-graphLibgvc.cmake 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/Libyui-qt-graphLibgvc.cmake 2019-12-11 11:52:41.000000000 +0100 @@ -1,8 +1,14 @@ # find the correct libraries depending on libgvc's version MACRO( SET_LIBGVS_LIBS ) - EXEC_PROGRAM(/usr/bin/pkg-config ARGS \"libgvc\" \"--libs\" OUTPUT_VARIABLE _tmp) - STRING(REPLACE " \n" "" _tmp "${_tmp}") + EXECUTE_PROCESS(COMMAND /usr/bin/pkg-config --libs libgvc + RESULT_VARIABLE _exit + OUTPUT_VARIABLE _tmp + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + IF(${_exit} GREATER 0 AND NOT ${DOCS_ONLY}) + MESSAGE(FATAL_ERROR "Install graphviz-devel") + ENDIF() STRING(REPLACE "-l" "" _tmp "${_tmp}") SEPARATE_ARGUMENTS(_tmp) SET( LIB_LINKER ${_tmp} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/VERSION.cmake new/libyui-qt-graph-2.46.0/VERSION.cmake --- old/libyui-qt-graph-2.45.3/VERSION.cmake 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/VERSION.cmake 2019-12-11 11:52:41.000000000 +0100 @@ -1,11 +1,11 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "45") -SET(VERSION_PATCH "3") +SET(VERSION_MINOR "46") +SET(VERSION_PATCH "0") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. ##### These will be overridden from exports in LibyuiConfig.cmake -SET( SONAME_MAJOR "5" ) +SET( SONAME_MAJOR "0" ) SET( SONAME_MINOR "0" ) SET( SONAME_PATCH "0" ) SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/package/libyui-qt-graph-doc.changes new/libyui-qt-graph-2.46.0/package/libyui-qt-graph-doc.changes --- old/libyui-qt-graph-2.45.3/package/libyui-qt-graph-doc.changes 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/package/libyui-qt-graph-doc.changes 2019-12-11 11:52:41.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 11 10:28:02 UTC 2019 - Rodion Iafarov <[email protected]> + +- Increase SO version to 11 (bsc#1132247) +- 2.46.0 + +------------------------------------------------------------------- Tue Sep 4 14:37:45 CEST 2012 - [email protected] - Fixed requirements in doc spec file @@ -7,4 +13,3 @@ Tue Jul 03 14:46:11 UTC 2012 - [email protected] - New package - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/package/libyui-qt-graph-doc.spec new/libyui-qt-graph-2.46.0/package/libyui-qt-graph-doc.spec --- old/libyui-qt-graph-2.45.3/package/libyui-qt-graph-doc.spec 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/package/libyui-qt-graph-doc.spec 2019-12-11 11:52:41.000000000 +0100 @@ -17,10 +17,10 @@ %define parent libyui-qt-graph -%define so_version 10 +%define so_version 11 Name: %{parent}-doc -Version: 2.45.3 +Version: 2.46.0 Release: 0 Source: %{parent}-%{version}.tar.bz2 @@ -31,7 +31,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz-gnome -BuildRequires: libyui-devel >= 3.5.0 +BuildRequires: libyui-devel >= 3.9.0 BuildRequires: texlive-latex Url: http://github.com/libyui/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/package/libyui-qt-graph.changes new/libyui-qt-graph-2.46.0/package/libyui-qt-graph.changes --- old/libyui-qt-graph-2.45.3/package/libyui-qt-graph.changes 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/package/libyui-qt-graph.changes 2019-12-11 11:52:41.000000000 +0100 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Tue Dec 10 16:36:38 UTC 2019 - Rodion Iafarov <[email protected]> + +- Increase SO version to 11 (bsc#1132247) +- 2.46.0 + +------------------------------------------------------------------- +Mon Dec 2 12:46:46 UTC 2019 - Martin Vidner <[email protected]> + +- Do not require graphviz-devel for the doc package (bsc#1157916) +- 2.45.5 + +------------------------------------------------------------------- +Thu Nov 28 12:51:31 CET 2019 - [email protected] + +- Respect backslashes (graphviz escString) in texts (bsc#1157916) +- 2.45.4 + +------------------------------------------------------------------- Thu Sep 12 14:29:09 UTC 2019 - Martin Vidner <[email protected]> - Make scroll-up mean zoom-in (bsc#1149158) @@ -21,7 +39,7 @@ Fri Apr 12 08:15:46 UTC 2019 - Rodion Iafarov <[email protected]> - Bump the .so version to 10 to be compatible with the other libyui -packages (bsc#1132247) + packages (bsc#1132247) - 2.45.0 ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/package/libyui-qt-graph.spec new/libyui-qt-graph-2.46.0/package/libyui-qt-graph.spec --- old/libyui-qt-graph-2.45.3/package/libyui-qt-graph.spec 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/package/libyui-qt-graph.spec 2019-12-11 11:52:41.000000000 +0100 @@ -17,11 +17,11 @@ Name: libyui-qt-graph -Version: 2.45.3 +Version: 2.46.0 Release: 0 Source: %{name}-%{version}.tar.bz2 -%define so_version 10 +%define so_version 11 %define bin_name %{name}%{so_version} BuildRequires: cmake >= 2.8 @@ -30,9 +30,9 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-qtx11extras-devel -BuildRequires: libyui-devel >= 3.5.0 +BuildRequires: libyui-devel >= 3.9.0 -%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1 +%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0 BuildRequires: %{libyui_qt_devel_version} Url: http://github.com/libyui/ @@ -51,8 +51,8 @@ Supplements: libyui-qt%{so_version} Provides: %{name} = %{version} -Provides: yast2-qt-graph = 2.42.0 -Obsoletes: yast2-qt-graph < 2.42.0 +Provides: yast2-qt-graph = 2.46.0 +Obsoletes: yast2-qt-graph < 2.46.0 Url: http://github.com/libyui/ Summary: Libyui - Qt Graph Widget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/src/QY2Graph.cc new/libyui-qt-graph-2.46.0/src/QY2Graph.cc --- old/libyui-qt-graph-2.45.3/src/QY2Graph.cc 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/src/QY2Graph.cc 2019-12-11 11:52:41.000000000 +0100 @@ -154,7 +154,7 @@ const char* tmp = agget(obj, const_cast<char*>(name)); if (tmp == NULL || strlen(tmp) == 0) return fallback; - return QString::fromUtf8(tmp); + return unescape(tmp); } @@ -336,7 +336,7 @@ painter->setFont(font); - QString text(QString::fromUtf8(textlabel->text)); + QString text(unescape(textlabel->text)); QFontMetricsF fm(painter->fontMetrics()); QRectF rect(fm.boundingRect(text)); rect.moveCenter(gToQ(textlabel->pos, false)); @@ -395,10 +395,7 @@ QString tooltip = aggetToQString(node, "tooltip", ""); if (!tooltip.isEmpty()) - { - tooltip.replace("\\n", "\n"); item->setToolTip(tooltip); - } scene->addItem(item); @@ -442,6 +439,52 @@ } +QString +QY2Graph::unescape(const std::string& s) const +{ + std::string r; + + bool backslashed = false; + + for (const char c : s) + { + if (!backslashed) + { + switch (c) + { + case '\\': + backslashed = true; + break; + + default: + r += c; + break; + } + } + else + { + switch (c) + { + // treat \n, \l and \r as newline (without alignment information) + case 'n': + case 'l': + case 'r': + r += '\n'; + break; + + default: + r += c; + break; + } + + backslashed = false; + } + } + + return QString::fromUtf8(r.c_str()); +} + + QY2Node::QY2Node(const QPainterPath& path, const QPicture& picture, const QString& name) : QGraphicsPathItem(path), picture(picture), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.45.3/src/QY2Graph.h new/libyui-qt-graph-2.46.0/src/QY2Graph.h --- old/libyui-qt-graph-2.45.3/src/QY2Graph.h 2019-09-17 13:26:22.000000000 +0200 +++ new/libyui-qt-graph-2.46.0/src/QY2Graph.h 2019-12-11 11:52:41.000000000 +0100 @@ -92,6 +92,15 @@ void drawArrow(const QLineF& line, const QColor& color, QPainter* painter) const; + /** + * Unescape a graphviz escString and transform to QString (assuming UTF-8). + * + * Only a few special substrings are supported, mainly \n and \\. + * + * See https://graphviz.gitlab.io/_pages/doc/info/attrs.html#k:escString. + */ + QString unescape(const std::string&) const; + };
