Hello community, here is the log from the commit of package gnuplot for openSUSE:Factory checked in at 2020-06-25 16:47:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuplot (Old) and /work/SRC/openSUSE:Factory/.gnuplot.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuplot" Thu Jun 25 16:47:27 2020 rev:76 rq:816758 version:5.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2019-12-07 15:17:58.195773905 +0100 +++ /work/SRC/openSUSE:Factory/.gnuplot.new.3060/gnuplot.changes 2020-06-25 16:47:46.232977204 +0200 @@ -1,0 +2,11 @@ +Mon Jun 22 07:49:19 UTC 2020 - Werner Fink <[email protected]> + +- Add patch gnuplot-QtIndexedList.dif to avoid warnings reported + with boo#1172565 + +------------------------------------------------------------------- +Tue Jun 16 09:13:13 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Disable warning messages from Qt5(.15 and up) (boo#1172565) + +------------------------------------------------------------------- New: ---- gnuplot-QtIndexedList.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuplot.spec ++++++ --- /var/tmp/diff_new_pack.ADbL1N/_old 2020-06-25 16:47:47.200978973 +0200 +++ /var/tmp/diff_new_pack.ADbL1N/_new 2020-06-25 16:47:47.200978973 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnuplot # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -96,6 +96,7 @@ Patch5: gnuplot-wx3.diff Patch6: gnuplot-QtCore-PIC.dif Patch7: gnuplot-gd.patch +Patch8: gnuplot-QtIndexedList.dif %define _x11lib %{_libdir} %define _x11data %{_datadir}/X11 %define _libx11 %{_exec_prefix}/lib/X11 @@ -130,6 +131,7 @@ %patch5 -p1 -b .w3x %patch6 -p0 -b .pic %patch7 -p1 -b .gd +%patch8 -p0 -b .qtlist %build autoreconf -fi ++++++ gnuplot-QtIndexedList.dif ++++++ >From a0f2b0f820c9eb734029984887e7bab5fb0b9aea Mon Sep 17 00:00:00 2001 From: Werner Fink <[email protected]> Date: Sat, 20 Jun 2020 10:02:40 -0700 Subject: [PATCH] qt: Suppress error messages "QList index out of range" In three places gnuplot_qt was appending an element to an existing list by insertiong using an index greater than the current list size. This works but starting with Qt 5.15 an error message is given. Replace with append() or insert(list_size, ...) Bug #2280 --- src/qtterminal/QtGnuplotScene.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git src/qtterminal/QtGnuplotScene.cpp src/qtterminal/QtGnuplotScene.cpp index f98151b63..a72e6aa8f 100644 --- src/qtterminal/QtGnuplotScene.cpp +++ src/qtterminal/QtGnuplotScene.cpp @@ -167,9 +167,7 @@ void QtGnuplotScene::flushCurrentPointsItem() void QtGnuplotScene::update_key_box(const QRectF rect) { if (m_currentPlotNumber > m_key_boxes.count()) { - // DEBUG Feb 2018 should no longer trigger - // because m_key_box insertion is done in layer code for GEAfterPlot - m_key_boxes.insert(m_currentPlotNumber, QtGnuplotKeybox(rect)); + m_key_boxes.insert(m_currentPlotNumber-1, QtGnuplotKeybox(rect)); } else if (m_key_boxes[m_currentPlotNumber-1].isEmpty()) { // Retain the visible/hidden flag when re-initializing the Keybox bool tmp = m_key_boxes[m_currentPlotNumber-1].ishidden(); @@ -515,12 +513,12 @@ void QtGnuplotScene::processEvent(QtGnuplotEventType type, QDataStream& in) if (0 < m_currentPlotNumber && m_currentPlotNumber <= m_key_boxes.count()) newgroup->setVisible( !(m_key_boxes[m_currentPlotNumber-1].ishidden()) ); // Store it in an ordered list so we can toggle it by index - m_plot_group.insert(m_currentPlotNumber, newgroup); + m_plot_group.insert(m_currentPlotNumber-1, newgroup); } if (m_currentPlotNumber >= m_key_boxes.count()) { QRectF empty( QPointF(0,0), QPointF(0,0)); - m_key_boxes.insert(m_currentPlotNumber, empty); + m_key_boxes.append(empty); m_key_boxes[m_currentPlotNumber-1].resetStatus(); } -- 2.26.2
