diff --git a/gnuplot-qlist-message.patch b/gnuplot-qlist-message.patch deleted file mode 100644 index 2242ca4..0000000 --- a/gnuplot-qlist-message.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/qtterminal/QtGnuplotScene.cpp -+++ b/src/qtterminal/QtGnuplotScene.cpp -@@ -167,9 +167,7 @@ - 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 @@ - 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(); - } diff --git a/gnuplot.spec b/gnuplot.spec index 5651949..c0d1383 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -39,9 +39,6 @@ Patch6: gnuplot-5.4.2-no-lena.patch Patch7: gnuplot-5.2.2-doc.patch Patch8: gnuplot-5.2.8-cmd-opts.patch Patch9: gnuplot-config.patch -# Suppress error messages "QList index out of range" -# Patch from upstream https://sourceforge.net/p/gnuplot/support-requests/269/ -Patch20: gnuplot-qlist-message.patch Requires: %{name}-common = %{version}-%{release} Requires: dejavu-sans-fonts @@ -178,7 +175,6 @@ plotting tool. %patch7 -p1 -b .doc %patch8 -p1 -b .cmd-opts %patch9 -p1 -b .config -%patch20 -p1 -b .qlist-index sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c chmod 644 src/getcolor.h chmod 644 demo/html/webify.pl