diff mbox series

[1/1] package/gnuplot: bump to version 5.4.10

Message ID 20231226182338.1040930-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/gnuplot: bump to version 5.4.10 | expand

Commit Message

Fabrice Fontaine Dec. 26, 2023, 6:23 p.m. UTC 
Drop second patch (already in version)

http://www.gnuplot.info/ReleaseNotes_5_4_10.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-unbreak-HAVE_DEFLATE_ENCODER-builds.patch | 51 -------------------
 package/gnuplot/gnuplot.hash                  |  8 +--
 package/gnuplot/gnuplot.mk                    |  2 +-
 3 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch

Comments

Peter Korsgaard Jan. 10, 2024, 7:48 p.m. UTC | #1 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Drop second patch (already in version)
 > http://www.gnuplot.info/ReleaseNotes_5_4_10.html

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.11.x, thanks.
diff mbox series

Patch

diff --git a/package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch b/package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch
deleted file mode 100644
index c3edb39cc6..0000000000
--- a/package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch
+++ /dev/null
@@ -1,51 +0,0 @@ 
-From 84002a5bd7f4cb10e9beffab88ae55b4e982bcea Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Sun, 1 Oct 2023 10:20:31 +0200
-Subject: [PATCH] term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds
-
-Commit 2f2cf617808 (post: handle RGBA images (only current use is to render
-a pixmap)) added an extra '}' outside the HAVE_DEFLATE_ENCODER (gd support)
-conditional, leading to build breakage:
-
-In file included from term.h:298,
-                 from term.c:1211:
-../term/post.trm:4016:11: error: expected declaration specifiers or '...' before string constant
- 4016 |     fputs("%%%%BeginImage\n", gppsfile);
-
-http://autobuild.buildroot.net/results/5676609b6331b645f2e557aca67afe4c3a087433/build-end.log
-
-Fix it by dropping the extra { } added by the above commit.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-Upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/merge-requests/28/
----
- term/post.trm | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/term/post.trm b/term/post.trm
-index 186eb9d3c..100811b86 100644
---- a/term/post.trm
-+++ b/term/post.trm
-@@ -4000,17 +4000,16 @@ PS_image (unsigned int M, unsigned int N, coordval *image, gpiPoint *corner, t_i
- 	cscale = 1.0;
- 
- #ifdef HAVE_DEFLATE_ENCODER
--    if (ps_params->level3) {
-+    if (ps_params->level3)
- 	encoded_image = (void *)PS_encode_png_image(M, N, image, color_mode,
- 					    bits_per_component, max_colors, cscale,
- 					    &num_encoded_bytes);
--    } else {
-+    else
- #endif
- 	encoded_image = PS_encode_image(M, N, image, color_mode,
- 					bits_per_component, max_colors, cscale,
- 					(ps_params->level1 ? PS_ASCII_HEX : PS_ASCII85),
- 					&num_encoded_bytes);
--    }
- 
- 
-     fputs("%%%%BeginImage\n", gppsfile);
--- 
-2.30.2
-
diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash
index 6ed24b6d3c..39dacd50a4 100644
--- a/package/gnuplot/gnuplot.hash
+++ b/package/gnuplot/gnuplot.hash
@@ -1,6 +1,6 @@ 
-# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.9/
-md5  345533e461e41c263b3293f46651f0b2  gnuplot-5.4.9.tar.gz
-sha1  1a3953660656a38178ae2b368efa895af55a5001  gnuplot-5.4.9.tar.gz
+# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.10/
+md5  334851e63450362bdb95e67fa8a23665  gnuplot-5.4.10.tar.gz
+sha1  9981e5b0111c07d376deef571ccc75ce4b4ebbd2  gnuplot-5.4.10.tar.gz
 # Locally computed
-sha256  a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97  gnuplot-5.4.9.tar.gz
+sha256  975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c  gnuplot-5.4.10.tar.gz
 sha256  895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d  Copyright
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index b98da4267a..825863d080 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-GNUPLOT_VERSION = 5.4.9
+GNUPLOT_VERSION = 5.4.10
 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
 GNUPLOT_LICENSE = gnuplot license (open source)
 GNUPLOT_LICENSE_FILES = Copyright