[packages/gnuplot] - updated to 6.0.0

Sun May 12 19:18:52 CEST 2024

commit 659c901c28224a5912b693a29c97e5960bece69c
Author: Bartek Szady <bszx at bszx.eu>
Date:   Sun May 12 12:32:05 2024 +0200

    - updated to 6.0.0

 configure.patch | 21 ++++++++++++++
 gnuplot.spec    | 72 +++++++++++++++++++++++++++-------------------
 qt.patch        | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 152 insertions(+), 29 deletions(-)
---

diff --git a/gnuplot.spec b/gnuplot.spec
index be0a20b..d131ca7 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -5,9 +5,16 @@
 %bcond_with	ggi	# GGI driver
 %bcond_with	ggixmi	# GGI XMI support for pm3d
 %bcond_with	qt	# Qt terminal
-%bcond_with	qt4	# use Qt 4 instead of Qt 5
+%bcond_with	qt6	# use Qt 6 instead of Qt 5
 %bcond_with	svga	# Linux SVGA console driver
 %bcond_without	wxwidgets	# wxWidgets terminal
+%bcond_with	tests		# run tests
+
+%if %{without qt}
+%undefine	with_tests
+%endif
+
+
 #
 Summary:	A program for plotting mathematical expressions and data
 Summary(de.UTF-8):	GNU-Plotter-Paket
@@ -20,24 +27,28 @@ Summary(ru.UTF-8):	Программа для построения графико
 Summary(tr.UTF-8):	Matematiksel görselleştirme paketi
 Summary(uk.UTF-8):	Програма для побудови графіків математичних виразів та даних
 Name:		gnuplot
-Version:	5.2.8
-Release:	3
+Version:	6.0.0
+Release:	1
 License:	distributable (with modifications properly marked if any)
 Group:		Applications/Math
 Source0:	http://downloads.sourceforge.net/gnuplot/%{name}-%{version}.tar.gz
-# Source0-md5:	2df8767c7399bee57a96296d46b4d5fb
+# Source0-md5:	10246eb96bbf3a151d6eb9bbcc223e4e
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-info.patch
+Patch1:		configure.patch
+Patch2:		qt.patch
 URL:		http://gnuplot.sourceforge.net/
 %if %{with qt}
-%if %{with qt4}
-BuildRequires:	QtCore-devel >= 4.5
-BuildRequires:	QtGui-devel >= 4.5
-BuildRequires:	QtNetwork-devel >= 4.5
-BuildRequires:	QtSvg-devel >= 4.5
-BuildRequires:	qt4-build >= 4.5
-BuildRequires:	qt4-linguist >= 4.5
+%if %{with qt6}
+BuildRequires:	Qt6Core-devel >= 6.0
+BuildRequires:	Qt6Gui-devel >= 6.0
+BuildRequires:	Qt6Network-devel >= 6.0
+BuildRequires:	Qt6PrintSupport-devel >= 6.0
+BuildRequires:	Qt6Svg-devel >= 6.0
+BuildRequires:	Qt6Qt5Compat-devel >= 6.0
+BuildRequires:	qt6-build >= 6.0
+BuildRequires:	qt6-linguist >= 6.0
 %else
 BuildRequires:	Qt5Core-devel >= 5.0
 BuildRequires:	Qt5Gui-devel >= 5.0
@@ -150,6 +161,8 @@ Obsługa gnuplota dla LaTeXa.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal} -I m4
@@ -165,7 +178,7 @@ Obsługa gnuplota dla LaTeXa.
 	--with-gd \
 	%{?with_ggi:--with-ggi} \
 	%{?with_svga:--with-linux-vga} \
-	--with-qt=%{?with_qt:%{?with_qt4:qt4}%{!?with_qt4:qt5}}%{!?with_qt:no} \
+	--with-qt=%{?with_qt:%{?with_qt6:qt6}%{!?with_qt6:qt5}}%{!?with_qt:no} \
 	--with-readline=gnu \
 	--with-texdir=%{_datadir}/texmf-dist/tex/latex/gnuplot \
 	--without-tutorial \
@@ -174,6 +187,10 @@ Obsługa gnuplota dla LaTeXa.
 
 %{__make}
 
+%if %{with tests}
+QT_QPA_PLATFORM=offscreen %{__make} check
+%endif
+
 %if %{with emacs}
 %{__make} -C docs info
 %endif
@@ -186,9 +203,6 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 	DESTDIR=$RPM_BUILD_ROOT \
 	appdefaultdir=%{_datadir}/X11/app-defaults
 
-install -d $RPM_BUILD_ROOT%{_mandir}/ja/man1
-%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/gnuplot-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/gnuplot.1
-
 [ ! -f $RPM_BUILD_ROOT%{_desktopdir}/gnuplot.desktop ]
 [ ! -f $RPM_BUILD_ROOT%{_pixmapsdir}/gnuplot.png ]
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -207,26 +221,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS ChangeLog Copyright FAQ.pdf NEWS README RELEASE_NOTES TODO docs/psdoc/ps_guide.ps
+%doc BUGS Copyright FAQ.pdf NEWS README RELEASE_NOTES docs/psdoc/ps_guide.ps
 %attr(755,root,root) %{_bindir}/gnuplot
 %dir %{_libexecdir}/%{name}
-%dir %{_libexecdir}/%{name}/5.2
-%{?with_qt:%attr(755,root,root) %{_libexecdir}/%{name}/5.2/gnuplot_qt}
-%attr(755,root,root) %{_libexecdir}/%{name}/5.2/gnuplot_x11
+%dir %{_libexecdir}/%{name}/6.0
+%{?with_qt:%attr(755,root,root) %{_libexecdir}/%{name}/6.0/gnuplot_qt}
+%attr(755,root,root) %{_libexecdir}/%{name}/6.0/gnuplot_x11
 %{_mandir}/man1/gnuplot.1*
 %lang(ja) %{_mandir}/ja/man1/gnuplot.1*
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/5.2
-%{_datadir}/%{name}/5.2/PostScript
-%{_datadir}/%{name}/5.2/js
-%{_datadir}/%{name}/5.2/lua
-%{_datadir}/%{name}/5.2/colors_*.gp
-%{_datadir}/%{name}/5.2/gnuplot.gih
-%{_datadir}/%{name}/5.2/gnuplotrc
+%dir %{_datadir}/%{name}/6.0
+%{_datadir}/%{name}/6.0/PostScript
+%{_datadir}/%{name}/6.0/js
+%{_datadir}/%{name}/6.0/lua
+%{_datadir}/%{name}/6.0/colors_*.gp
+%{_datadir}/%{name}/6.0/gnuplot.gih
+%{_datadir}/%{name}/6.0/gnuplotrc
 %if %{with qt}
-%dir %{_datadir}/%{name}/5.2/qt
-%lang(fr) %{_datadir}/%{name}/5.2/qt/qtgnuplot_fr.qm
-%lang(ja) %{_datadir}/%{name}/5.2/qt/qtgnuplot_ja.qm
+%dir %{_datadir}/%{name}/6.0/qt
+%lang(fr) %{_datadir}/%{name}/6.0/qt/qtgnuplot_fr.qm
+%lang(ja) %{_datadir}/%{name}/6.0/qt/qtgnuplot_ja.qm
 %endif
 %if %{with emacs}
 %{_infodir}/gnuplot.info*
diff --git a/configure.patch b/configure.patch
new file mode 100644
index 0000000..d6db38e
--- /dev/null
+++ b/configure.patch
@@ -0,0 +1,21 @@
+diff -up gnuplot-6.0.0/configure.ac._orig gnuplot-6.0.0/configure.ac
+--- gnuplot-6.0.0/configure.ac._orig	2023-12-19 00:28:58.000000000 +0100
++++ gnuplot-6.0.0/configure.ac	2024-05-10 13:40:06.723299475 +0200
+@@ -1024,7 +1024,7 @@ AC_ARG_ENABLE(function-blocks,dnl
+                [ Define to support defining a function as a here document])
+    )
+ 
+-Enable parsing of deprecated syntax
++dnl Enable parsing of deprecated syntax
+ AC_ARG_ENABLE(backward-compatibility,dnl
+ [  --enable-backward-compatibility       enable some deprecated syntax ],
+   [if test "$enableval" = yes; then
+@@ -1062,7 +1062,7 @@ if test "${enable_qt}" = yes ; then
+     pkg_failed="not_tried"
+     if test "x${with_qt}" != "xqt5"; then
+       AC_MSG_CHECKING([Checking for Qt6 support libraries])
+-      PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6PrintSupport Qt6Core5Compat])
++      PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6PrintSupport Qt6Core5Compat Qt6Widgets])
+     fi
+     if test $pkg_failed = no; then
+       QT6LOC=`$PKG_CONFIG --variable=libexecdir Qt6Core`
diff --git a/qt.patch b/qt.patch
new file mode 100644
index 0000000..71c01aa
--- /dev/null
+++ b/qt.patch
@@ -0,0 +1,88 @@
+diff -up gnuplot-6.0.0/src/qtterminal/qt_embed_example.h._orig gnuplot-6.0.0/src/qtterminal/qt_embed_example.h
+--- gnuplot-6.0.0/src/qtterminal/qt_embed_example.h._orig	2023-12-18 20:04:32.000000000 +0100
++++ gnuplot-6.0.0/src/qtterminal/qt_embed_example.h	2024-05-10 14:03:14.281439483 +0200
+@@ -48,7 +48,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
+-#include <QWidget>
++#include <QtWidgets/QWidget>
+ 
+ class QtGnuplotWidget;
+ class QPlainTextEdit;
+diff -up gnuplot-6.0.0/src/qtterminal/QtGnuplotWidget.h._orig gnuplot-6.0.0/src/qtterminal/QtGnuplotWidget.h
+--- gnuplot-6.0.0/src/qtterminal/QtGnuplotWidget.h._orig	2022-05-26 21:35:50.000000000 +0200
++++ gnuplot-6.0.0/src/qtterminal/QtGnuplotWidget.h	2024-05-10 15:33:01.644798333 +0200
+@@ -46,7 +46,7 @@
+ 
+ #include "QtGnuplotEvent.h"
+ 
+-#include <QWidget>
++#include <QtWidgets/QWidget>
+ #include <QPainter>
+ 
+ /* I had to add these in order to link against qt5 rather than qt4 */
+@@ -51,7 +51,7 @@
+ 
+ /* I had to add these in order to link against qt5 rather than qt4 */
+ #if QT_VERSION >= 0x050000
+-#include <QtWidgets>
++#include <QtWidgets/QtWidgets>
+ #include <QtPrintSupport/QPrinter>
+ #include <QtPrintSupport/QPrintDialog>
+ #endif
+diff -up gnuplot-6.0.0/src/qtterminal/QtGnuplotApplication.h._orig gnuplot-6.0.0/src/qtterminal/QtGnuplotApplication.h
+--- gnuplot-6.0.0/src/qtterminal/QtGnuplotApplication.h._orig	2017-12-22 18:32:30.000000000 +0100
++++ gnuplot-6.0.0/src/qtterminal/QtGnuplotApplication.h	2024-05-10 15:45:24.063586150 +0200
+@@ -46,7 +46,7 @@
+ 
+ #include "QtGnuplotEvent.h"
+ 
+-#include <QApplication>
++#include <QtWidgets/QApplication>
+ #include <QMap>
+ 
+ class QtGnuplotWindow;
+diff -up gnuplot-6.0.0/src/qtterminal/QtGnuplotItems.h._orig gnuplot-6.0.0/src/qtterminal/QtGnuplotItems.h
+--- gnuplot-6.0.0/src/qtterminal/QtGnuplotItems.h._orig	2017-12-22 18:32:30.000000000 +0100
++++ gnuplot-6.0.0/src/qtterminal/QtGnuplotItems.h	2024-05-10 15:47:24.579511849 +0200
+@@ -44,7 +44,7 @@
+ #ifndef QTGNUPLOTITEMS_H
+ #define QTGNUPLOTITEMS_H
+ 
+-#include <QGraphicsItem>
++#include <QtWidgets/QGraphicsItem>
+ #include <QFont>
+ #include <QPen>
+ 
+diff -up gnuplot-6.0.0/src/qtterminal/QtGnuplotScene.h._orig gnuplot-6.0.0/src/qtterminal/QtGnuplotScene.h
+--- gnuplot-6.0.0/src/qtterminal/QtGnuplotScene.h._orig	2022-05-26 21:35:50.000000000 +0200
++++ gnuplot-6.0.0/src/qtterminal/QtGnuplotScene.h	2024-05-10 15:48:40.249046369 +0200
+@@ -47,8 +47,8 @@
+ #include "QtGnuplotEvent.h"
+ #include "QtGnuplotItems.h"
+ 
+-#include <QGraphicsScene>
+-#include <QGraphicsItemGroup>
++#include <QtWidgets/QGraphicsScene>
++#include <QtWidgets/QGraphicsItemGroup>
+ 
+ #if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
+ # include <QTime>
+diff -up gnuplot-6.0.0/src/qtterminal/QtGnuplotWindow.h._orig gnuplot-6.0.0/src/qtterminal/QtGnuplotWindow.h
+--- gnuplot-6.0.0/src/qtterminal/QtGnuplotWindow.h._orig	2023-12-18 20:04:32.000000000 +0100
++++ gnuplot-6.0.0/src/qtterminal/QtGnuplotWindow.h	2024-05-10 16:10:27.124236899 +0200
+@@ -46,11 +46,11 @@
+ 
+ #include "QtGnuplotEvent.h"
+ 
+-#include <QMainWindow>
++#include <QtWidgets/QMainWindow>
+ 
+ /* I had to add these in order to link against qt5 rather than qt4 */
+ #if QT_VERSION >= 0x050000
+-#include <QtWidgets>
++#include <QtWidgets/QtWidgets>
+ #endif
+ 
+ class QLabel;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnuplot.git/commitdiff/659c901c28224a5912b693a29c97e5960bece69c

