CVS commit: pkgsrc/graphics/gnuplot

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/gnuplot
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 5 Jun 2024 13:56:14 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun  5 13:56:14 UTC 2024

Modified Files:
        pkgsrc/graphics/gnuplot: Makefile PLIST distinfo options.mk
        pkgsrc/graphics/gnuplot/patches: patch-src_plot.c
Added Files:
        pkgsrc/graphics/gnuplot/patches:
            patch-src_qtterminal_QtGnuplotApplication.h
            patch-src_qtterminal_QtGnuplotItems.h
            patch-src_qtterminal_QtGnuplotScene.h
            patch-src_qtterminal_QtGnuplotWidget.h
            patch-src_qtterminal_QtGnuplotWindow.h
            patch-src_qtterminal_qt__embed__example.h

Log Message:
gnuplot: updated to 6.0.1

Changes in 6.0.1

CHANGE Use of data source '-' inside a multiplot is an error; use a local datablock instead
CHANGE gd: scale "dot" (pointtype 0) by current linewidth Bug 2690
FIX configure script modified to accommodate Fedora dependencies Bug 2706
FIX mp: configure --with-metapost failed to include mp terminal
FIX empty field in csv file should not generate a tic label Bug 2667 2672
FIX Do not autoscale or extend axis ranges while zooming Bug 2679 2680
FIX svg: set default fill properties for depth-sorted pm3d objects
FIX x11: Empirical correction for bad rotation of enhanced text Bug 2661
FIX wxt: Add exception handler for mouse event processing Bug 2680 2683
FIX wxt: make right-mouse zoom box independent of terminal scaling Bug 2578
FIX regression: border color of objects with fillstyle "empty" Bug 2686
FIX "set colorbox border {<lt>}" parsing error
FIX gd x11: very short arrows were not drawn at all Bug 2690
FIX qt wxt x11: "set term" from a script causes next pause to fail Bug 2703
FIX tikz: fix use of palettes with a fixed number of colors Bug 2706
FIX "stats ... name FOO" Do not delete existing variables FOO_* Bug 2695
FIX order-dependent parsing of 2D plots with "fs solid fc variable"

http://gnuplot.info/docs_6.0/NewFeatures.html


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 pkgsrc/graphics/gnuplot/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/gnuplot/PLIST
cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/gnuplot/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/gnuplot/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gnuplot/patches/patch-src_plot.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotApplication.h \
    pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotItems.h \
    pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotScene.h \
    pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWidget.h \
    pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWindow.h \
    pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_qt__embed__example.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gnuplot/Makefile
diff -u pkgsrc/graphics/gnuplot/Makefile:1.186 pkgsrc/graphics/gnuplot/Makefile:1.187
--- pkgsrc/graphics/gnuplot/Makefile:1.186      Wed May 29 16:32:54 2024
+++ pkgsrc/graphics/gnuplot/Makefile    Wed Jun  5 13:56:14 2024
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.186 2024/05/29 16:32:54 adam Exp $
+# $NetBSD: Makefile,v 1.187 2024/06/05 13:56:14 adam Exp $
 
-DISTNAME=      gnuplot-5.4.10
+DISTNAME=      gnuplot-6.0.1
 CATEGORIES+=   graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://gnuplot.info/
+HOMEPAGE=      https://gnuplot.sourceforge.net/
 COMMENT=       Portable interactive, function plotting utility
-PKGREVISION=   4
 #LICENSE=      gnuplot + BSD
 
 API_VERSION=   ${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])+/\1.\2/}

Index: pkgsrc/graphics/gnuplot/PLIST
diff -u pkgsrc/graphics/gnuplot/PLIST:1.22 pkgsrc/graphics/gnuplot/PLIST:1.23
--- pkgsrc/graphics/gnuplot/PLIST:1.22  Fri Nov 20 17:25:02 2020
+++ pkgsrc/graphics/gnuplot/PLIST       Wed Jun  5 13:56:14 2024
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.22 2020/11/20 17:25:02 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.23 2024/06/05 13:56:14 adam Exp $
 bin/gnuplot
 ${PLIST.qt}libexec/gnuplot/${API_VERSION}/gnuplot_qt
 ${PLIST.x11}libexec/gnuplot/${API_VERSION}/gnuplot_x11
+man/ja/man1/gnuplot.1
 man/man1/gnuplot.1
 share/gnuplot/${API_VERSION}/PostScript/8859-1.ps
 share/gnuplot/${API_VERSION}/PostScript/8859-15.ps

Index: pkgsrc/graphics/gnuplot/distinfo
diff -u pkgsrc/graphics/gnuplot/distinfo:1.52 pkgsrc/graphics/gnuplot/distinfo:1.53
--- pkgsrc/graphics/gnuplot/distinfo:1.52       Mon Dec 18 08:22:51 2023
+++ pkgsrc/graphics/gnuplot/distinfo    Wed Jun  5 13:56:14 2024
@@ -1,9 +1,15 @@
-$NetBSD: distinfo,v 1.52 2023/12/18 08:22:51 adam Exp $
+$NetBSD: distinfo,v 1.53 2024/06/05 13:56:14 adam Exp $
 
-BLAKE2s (gnuplot-5.4.10.tar.gz) = 76605805bf82eb22387c2bda2687e5f1d481780bc12057cb33a834e31834dc0d
-SHA512 (gnuplot-5.4.10.tar.gz) = fe5226a243dad62e8617d820764dc5923e76a51a68c58a666a699110f5b5be0f5e759e0586e923472a59ca6d1b30d1093d7a65e9c1d3a36fcd33a95df36ab89f
-Size (gnuplot-5.4.10.tar.gz) = 5687565 bytes
+BLAKE2s (gnuplot-6.0.1.tar.gz) = 2737e2499b7d28bd8b77dacac5843fbec0eceab3657ae777ac745d8c36853c14
+SHA512 (gnuplot-6.0.1.tar.gz) = 47e72ac444f35e22a5de111da3333c80846226d87411a3168e45a8433a258e351ad9b6f0ba21d76f2456042b755123a697b685fd2552b4bd9edc5b97fafcbc62
+Size (gnuplot-6.0.1.tar.gz) = 7528936 bytes
 SHA1 (patch-configure) = 51813d74dc2be0e6fcc2e55fcbcbcf2b4678b954
 SHA1 (patch-src_gp__hist.h) = b1549572ba1bacad5ae76e7a5a6b632e693b74a7
-SHA1 (patch-src_plot.c) = a91ef7ff92917c54e37f3cca765e92d9857a47a5
+SHA1 (patch-src_plot.c) = e0e56991a76daadcabbd7dc54a538ddd386947ab
+SHA1 (patch-src_qtterminal_QtGnuplotApplication.h) = de110ef5be8c66a760c8d53fd71e1928e44d4462
+SHA1 (patch-src_qtterminal_QtGnuplotItems.h) = 6079c4174df9e7915b7a0a97fdf6561bec034068
+SHA1 (patch-src_qtterminal_QtGnuplotScene.h) = fd1a539afc7da994dc69e5d1a3681bf71fba72b3
+SHA1 (patch-src_qtterminal_QtGnuplotWidget.h) = 2c04c0e4ee9b564dbdd8ce7ecc9e13271e6bbadb
+SHA1 (patch-src_qtterminal_QtGnuplotWindow.h) = 505759b11e596beb316d98f42f1e56c33444bc90
+SHA1 (patch-src_qtterminal_qt__embed__example.h) = 6aebdcd91e97718ac9a4a085f19055eeaaa85fb8
 SHA1 (patch-src_readline.h) = ae138bb783a5a5e68f89850cdd861cc545399aaf

Index: pkgsrc/graphics/gnuplot/options.mk
diff -u pkgsrc/graphics/gnuplot/options.mk:1.24 pkgsrc/graphics/gnuplot/options.mk:1.25
--- pkgsrc/graphics/gnuplot/options.mk:1.24     Mon Dec 18 08:22:51 2023
+++ pkgsrc/graphics/gnuplot/options.mk  Wed Jun  5 13:56:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2023/12/18 08:22:51 adam Exp $
+# $NetBSD: options.mk,v 1.25 2024/06/05 13:56:14 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gnuplot
 PKG_SUPPORTED_OPTIONS=         cairo cerf gd gnuplot-pdf-doc lua wxwidgets x11
@@ -63,14 +63,15 @@ post-install:
 
 .if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
 PLIST.qt=              yes
+USE_LANGUAGES+=                c++
 .  if !empty(PKG_OPTIONS:Mqt5)
-USE_LANGUAGES+=                c++11
+USE_CXX_FEATURES=      c++11
 CONFIGURE_ARGS+=       --with-qt=qt5
 .    include "../../x11/qt5-qtbase/buildlink3.mk"
 .    include "../../x11/qt5-qtsvg/buildlink3.mk"
 .    include "../../x11/qt5-qttools/buildlink3.mk"
 .  elif !empty(PKG_OPTIONS:Mqt6)
-USE_LANGUAGES+=                c++17
+USE_CXX_FEATURES=      c++17
 CONFIGURE_ARGS+=       --with-qt=qt6
 .    include "../../devel/qt6-qt5compat/buildlink3.mk"
 .    include "../../devel/qt6-qttools/buildlink3.mk"

Index: pkgsrc/graphics/gnuplot/patches/patch-src_plot.c
diff -u pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.1 pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.2
--- pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.1        Fri Nov  3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_plot.c    Wed Jun  5 13:56:14 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_plot.c,v 1.1 2017/11/03 15:00:10 adam Exp $
+$NetBSD: patch-src_plot.c,v 1.2 2024/06/05 13:56:14 adam Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
---- src/plot.c.orig    2017-06-02 01:43:38.000000000 +0000
+--- src/plot.c.orig    2023-12-18 23:28:58.000000000 +0000
 +++ src/plot.c
-@@ -107,7 +107,7 @@ extern smg$create_key_table();
+@@ -81,7 +81,7 @@
  /* BSD editline
  */
  #ifdef HAVE_LIBEDITLINE
--# include <editline/readline.h>
-+# include <readline/readline.h>
- #endif
- 
- /* enable gnuplot history with readline */
+-#  include <editline/readline.h>
++#  include <readline/readline.h>
+ #  ifdef GNUPLOT_HISTORY
+ #    include <histedit.h>
+ #  endif

Added files:

Index: pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotApplication.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotApplication.h:1.1
--- /dev/null   Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotApplication.h Wed Jun  5 13:56:14 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_qtterminal_QtGnuplotApplication.h,v 1.1 2024/06/05 13:56:14 adam Exp $
+
+Use proper includes.
+
+--- src/qtterminal/QtGnuplotApplication.h.orig 2024-05-16 12:06:43.607251330 +0000
++++ src/qtterminal/QtGnuplotApplication.h
+@@ -46,8 +46,8 @@
+ 
+ #include "QtGnuplotEvent.h"
+ 
+-#include <QApplication>
+-#include <QMap>
++#include <QtWidgets/QApplication>
++#include <QtCore/QMap>
+ 
+ class QtGnuplotWindow;
+ 
Index: pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotItems.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotItems.h:1.1
--- /dev/null   Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotItems.h       Wed Jun  5 13:56:14 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_qtterminal_QtGnuplotItems.h,v 1.1 2024/06/05 13:56:14 adam Exp $
+
+Use proper includes.
+
+--- src/qtterminal/QtGnuplotItems.h.orig       2024-05-16 12:05:32.052464582 +0000
++++ src/qtterminal/QtGnuplotItems.h
+@@ -44,9 +44,9 @@
+ #ifndef QTGNUPLOTITEMS_H
+ #define QTGNUPLOTITEMS_H
+ 
+-#include <QGraphicsItem>
+-#include <QFont>
+-#include <QPen>
++#include <QtWidgets/QGraphicsItem>
++#include <QtGui/QFont>
++#include <QtGui/QPen>
+ 
+ class QtGnuplotPoint : public QGraphicsItem
+ {
Index: pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotScene.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotScene.h:1.1
--- /dev/null   Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotScene.h       Wed Jun  5 13:56:14 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_qtterminal_QtGnuplotScene.h,v 1.1 2024/06/05 13:56:14 adam Exp $
+
+Use proper includes.
+
+--- src/qtterminal/QtGnuplotScene.h.orig       2024-05-16 12:07:29.007371294 +0000
++++ src/qtterminal/QtGnuplotScene.h
+@@ -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>
Index: pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWidget.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWidget.h:1.1
--- /dev/null   Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWidget.h      Wed Jun  5 13:56:14 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_qtterminal_QtGnuplotWidget.h,v 1.1 2024/06/05 13:56:14 adam Exp $
+
+Use proper includes.
+
+--- src/qtterminal/QtGnuplotWidget.h.orig      2024-05-16 11:56:34.675244242 +0000
++++ src/qtterminal/QtGnuplotWidget.h
+@@ -46,12 +46,12 @@
+ 
+ #include "QtGnuplotEvent.h"
+ 
+-#include <QWidget>
+-#include <QPainter>
++#include <QtWidgets/QWidget>
++#include <QtGui/QPainter>
+ 
+ /* 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
Index: pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWindow.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWindow.h:1.1
--- /dev/null   Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_QtGnuplotWindow.h      Wed Jun  5 13:56:14 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_qtterminal_QtGnuplotWindow.h,v 1.1 2024/06/05 13:56:14 adam Exp $
+
+Use proper includes.
+
+--- src/qtterminal/QtGnuplotWindow.h.orig      2024-05-16 11:59:19.466156816 +0000
++++ src/qtterminal/QtGnuplotWindow.h
+@@ -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;
Index: pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_qt__embed__example.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_qt__embed__example.h:1.1
--- /dev/null   Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_qtterminal_qt__embed__example.h   Wed Jun  5 13:56:14 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_qtterminal_qt__embed__example.h,v 1.1 2024/06/05 13:56:14 adam Exp $
+
+--- src/qtterminal/qt_embed_example.h.orig     2024-05-16 12:08:20.647170315 +0000
++++ src/qtterminal/qt_embed_example.h
+@@ -48,7 +48,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
+-#include <QWidget>
++#include <QtWidgets/QWidget>
+ 
+ class QtGnuplotWidget;
+ class QPlainTextEdit;

Prev by Date: CVS commit: pkgsrc/devel/libcerf
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/libcerf
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index