gnuplot update

gnuplot update

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 734 bytes --]

Hydra discovered that gnuplot's release tarball didn't match, and it
turns out that there was an in-place update to the release tarball. The
diff of the two tarballs is attached.

Attached is a patch to update to the new 5.0.4 release.


Old tarball:
https://flashner.co.il/~efraim/gnuplot-5.0.4-old.tar.gz
08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297

New tarball: (also at Sourceforge)
https://flashner.co.il/~efraim/gnuplot-5.0.4-new.tar.gz
07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: gnuplot.diff --]
[-- Type: text/plain, Size: 3407 bytes --]

diff -Naur gnuplot-5.0.4-new/docs/gnuplot.pdf gnuplot-5.0.4-old/docs/gnuplot.pdf
--- gnuplot-5.0.4-new/docs/gnuplot.pdf	2016-07-21 17:47:10.000000000 +0200
+++ gnuplot-5.0.4-old/docs/gnuplot.pdf	2016-07-20 05:25:57.000000000 +0200
@@ -11445,8 +11445,8 @@
 endobj
 6539 0 obj <<
 /Author(gnuplot)/Title(gnuplot documentation)/Subject(see www.gnuplot.info)/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.14)/Keywords()
-/CreationDate (D:20160721084708-07'00')
-/ModDate (D:20160721084708-07'00')
+/CreationDate (D:20160719202555-07'00')
+/ModDate (D:20160719202555-07'00')
 /Trapped /False
 /PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013/Mageia) kpathsea version 6.1.1)
 >> endobj
@@ -11470,7 +11470,7 @@
 /W [1 3 1]
 /Root 6538 0 R
 /Info 6539 0 R
-/ID [<6898D2AAE33E85175B346EB9F8A7546B> <6898D2AAE33E85175B346EB9F8A7546B>]
+/ID [<7A30FAEBBA4B7F11C1CD6990B04692C4> <7A30FAEBBA4B7F11C1CD6990B04692C4>]
 /Length 16171     
 /Filter /FlateDecode
 >>
diff -Naur gnuplot-5.0.4-new/ChangeLog gnuplot-5.0.4-old/ChangeLog
--- gnuplot-5.0.4-new/ChangeLog	2016-07-21 17:45:11.000000000 +0200
+++ gnuplot-5.0.4-old/ChangeLog	2016-07-20 05:22:29.000000000 +0200
@@ -1,10 +1,3 @@
-2016-07-21  Ethan A Merritt  <merritt@u.washington.edu>
-
-	* src/term_api.h:  Define TERM_POLYGON_PIXELS.
-	* src/graphics.c (plot_image_or_update_axes):  If this flag is set,
-	implement "plot ... with image pixels" using term->filled_polygon()
-	rather than term->fillbox().
-
 2016-07-19  Jun Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* term/aquaterm.trm:  The AQUA_boxfill() routine scales very badly 
diff -Naur gnuplot-5.0.4-new/src/graphics.c gnuplot-5.0.4-old/src/graphics.c
--- gnuplot-5.0.4-new/src/graphics.c	2016-07-21 17:43:44.000000000 +0200
+++ gnuplot-5.0.4-old/src/graphics.c	2016-07-06 06:43:36.000000000 +0200
@@ -4835,8 +4835,7 @@
 				corners[0].style = FS_TRANSPARENT_SOLID + (alpha<<4);
 			}
 
-			if (rectangular_image && term->fillbox
-			&&  !(term->flags & TERM_POLYGON_PIXELS)) {
+			if (rectangular_image && term->fillbox) {
 			    /* Some terminals (canvas) can do filled rectangles */
 			    /* more efficiently than filled polygons. */
 			    (*term->fillbox)( corners[0].style,
diff -Naur gnuplot-5.0.4-new/src/term_api.h gnuplot-5.0.4-old/src/term_api.h
--- gnuplot-5.0.4-new/src/term_api.h	2016-07-21 17:39:07.000000000 +0200
+++ gnuplot-5.0.4-old/src/term_api.h	2016-01-19 00:51:59.000000000 +0100
@@ -261,7 +261,6 @@
 #define TERM_IS_LATEX        (1<<13)	/* text uses TeX markup            */
 #define TERM_EXTENDED_COLOR  (1<<14)	/* uses EXTENDED_COLOR_SPECS       */
 #define TERM_NULL_SET_COLOR  (1<<15)	/* no support for RGB color        */
-#define TERM_POLYGON_PIXELS  (1<<16)	/* filledpolygon rather than fillbox */
 
 /* The terminal interface structure --- heart of the terminal layer.
  *
diff -Naur gnuplot-5.0.4-new/src/version.c gnuplot-5.0.4-old/src/version.c
--- gnuplot-5.0.4-new/src/version.c	2016-07-21 17:50:12.000000000 +0200
+++ gnuplot-5.0.4-old/src/version.c	2016-07-20 05:23:21.000000000 +0200
@@ -44,7 +44,7 @@
 #ifdef DEVELOPMENT_VERSION
 #include "timestamp.h"
 #else
-const char gnuplot_date[] = "2016-07-21 ";
+const char gnuplot_date[] = "2016-07-19 ";
 #endif
 const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2016";
 


[-- Attachment #1.3: 0001-gnu-gnuplot-Update-to-upstream-s-re-release-of-5.0.4.patch --]
[-- Type: text/plain, Size: 3506 bytes --]

From 898e50701f6e9624243ff457ab2aa250128f4cff Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 22 Jul 2016 15:27:16 +0300
Subject: [PATCH] gnu: gnuplot: Update to upstream's re-release of 5.0.4.

* gnu/packages/maths.scm (gnuplot): Add a guix revision number to the
version scheme of gnuplot to force an update.
---
 gnu/packages/maths.scm | 53 +++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ef84986..00814ca 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -381,34 +381,39 @@ singular value problems.")
 
 (define-public gnuplot
   (package
-    (name "gnuplot")
-    (version "5.0.4")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
-                          version "/gnuplot-" version ".tar.gz"))
-      (sha256
-       (base32
-        "08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297"))))
-    (build-system gnu-build-system)
-    (inputs `(("readline" ,readline)
-              ("cairo" ,cairo)
-              ("pango" ,pango)
-              ("gd" ,gd)))
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("texlive" ,texlive-minimal)))
-    (home-page "http://www.gnuplot.info")
-    (synopsis "Command-line driven graphing utility")
-    (description "Gnuplot is a portable command-line driven graphing
+    ;; Gnuplot version 5.0.4 was updated in-place, resulting in a hash mismatch.
+    ;; This can be removed at the next version update.
+    (let ((upstream-version "5.0.4")
+          (guix-revision "1"))
+      (name "gnuplot")
+      (version (string-append upstream-version "-" guix-revision))
+      (source
+       (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
+                            upstream-version "/gnuplot-"
+                            upstream-version ".tar.gz"))
+        (sha256
+         (base32
+          "07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m"))))
+      (build-system gnu-build-system)
+      (inputs `(("readline" ,readline)
+                ("cairo" ,cairo)
+                ("pango" ,pango)
+                ("gd" ,gd)))
+      (native-inputs `(("pkg-config" ,pkg-config)
+                       ("texlive" ,texlive-minimal)))
+      (home-page "http://www.gnuplot.info")
+      (synopsis "Command-line driven graphing utility")
+      (description "Gnuplot is a portable command-line driven graphing
 utility.  It was originally created to allow scientists and students to
 visualize mathematical functions and data interactively, but has grown to
 support many non-interactive uses such as web scripting.  It is also used as a
 plotting engine by third-party applications like Octave.")
-    ;;  X11 Style with the additional restriction that derived works may only be
-    ;;  distributed as patches to the original.
-    (license (license:fsf-free
-              "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright"))))
+      ;;  X11 Style with the additional restriction that derived works may only be
+      ;;  distributed as patches to the original.
+      (license (license:fsf-free
+                "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright")))))
 
 (define-public hdf5
   (package
-- 
2.9.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: gnuplot update

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 277 bytes --]

Ignore the previous patch, here's the real one to update it.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: 0001-gnu-gnuplot-Update-to-upstream-s-re-release-of-5.0.4.patch --]
[-- Type: text/plain, Size: 3586 bytes --]

From 2f2d8925c57da87a3e6c6fa697e58e0fe5a2b14f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Fri, 22 Jul 2016 15:27:16 +0300
Subject: [PATCH] gnu: gnuplot: Update to upstream's re-release of 5.0.4.

* gnu/packages/maths.scm (gnuplot): Add a guix revision number to the
version scheme of gnuplot to force an update.
---
 gnu/packages/maths.scm | 55 +++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ef84986..ad7d0e2 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -380,35 +380,40 @@ singular value problems.")
                                 "See LICENSE in the distribution."))))
 
 (define-public gnuplot
-  (package
-    (name "gnuplot")
-    (version "5.0.4")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
-                          version "/gnuplot-" version ".tar.gz"))
-      (sha256
-       (base32
-        "08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297"))))
-    (build-system gnu-build-system)
-    (inputs `(("readline" ,readline)
-              ("cairo" ,cairo)
-              ("pango" ,pango)
-              ("gd" ,gd)))
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("texlive" ,texlive-minimal)))
-    (home-page "http://www.gnuplot.info")
-    (synopsis "Command-line driven graphing utility")
-    (description "Gnuplot is a portable command-line driven graphing
+  ;; Gnuplot version 5.0.4 was updated in-place, resulting in a hash mismatch.
+  ;; This can be removed at the next version update.
+  (let ((upstream-version "5.0.4")
+        (guix-revision "1"))
+    (package
+      (name "gnuplot")
+      (version (string-append upstream-version "-" guix-revision))
+      (source
+       (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
+                            upstream-version "/gnuplot-"
+                            upstream-version ".tar.gz"))
+        (sha256
+         (base32
+          "07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m"))))
+      (build-system gnu-build-system)
+      (inputs `(("readline" ,readline)
+                ("cairo" ,cairo)
+                ("pango" ,pango)
+                ("gd" ,gd)))
+      (native-inputs `(("pkg-config" ,pkg-config)
+                       ("texlive" ,texlive-minimal)))
+      (home-page "http://www.gnuplot.info")
+      (synopsis "Command-line driven graphing utility")
+      (description "Gnuplot is a portable command-line driven graphing
 utility.  It was originally created to allow scientists and students to
 visualize mathematical functions and data interactively, but has grown to
 support many non-interactive uses such as web scripting.  It is also used as a
 plotting engine by third-party applications like Octave.")
-    ;;  X11 Style with the additional restriction that derived works may only be
-    ;;  distributed as patches to the original.
-    (license (license:fsf-free
-              "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright"))))
+      ;;  X11 Style with the additional restriction that derived works may only be
+      ;;  distributed as patches to the original.
+      (license (license:fsf-free
+                "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright")))))
 
 (define-public hdf5
   (package
-- 
2.9.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: gnuplot update

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]

Efraim Flashner <efraim@flashner.co.il> skribis:

> Hydra discovered that gnuplot's release tarball didn't match, and it
> turns out that there was an in-place update to the release tarball. The
> diff of the two tarballs is attached.
>
> Attached is a patch to update to the new 5.0.4 release.
>
>
> Old tarball:
> https://flashner.co.il/~efraim/gnuplot-5.0.4-old.tar.gz
> 08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297
>
> New tarball: (also at Sourceforge)
> https://flashner.co.il/~efraim/gnuplot-5.0.4-new.tar.gz
> 07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m

For future reference, here’s the diff:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2422 bytes --]

$ diff -ur gnuplot-5.0.4{.old,}
diff -ur gnuplot-5.0.4.old/ChangeLog gnuplot-5.0.4/ChangeLog
--- gnuplot-5.0.4.old/ChangeLog	2016-07-20 05:22:29.000000000 +0200
+++ gnuplot-5.0.4/ChangeLog	2016-07-21 17:45:11.000000000 +0200
@@ -1,3 +1,10 @@
+2016-07-21  Ethan A Merritt  <merritt@u.washington.edu>
+
+	* src/term_api.h:  Define TERM_POLYGON_PIXELS.
+	* src/graphics.c (plot_image_or_update_axes):  If this flag is set,
+	implement "plot ... with image pixels" using term->filled_polygon()
+	rather than term->fillbox().
+
 2016-07-19  Jun Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* term/aquaterm.trm:  The AQUA_boxfill() routine scales very badly 
Binary files gnuplot-5.0.4.old/docs/gnuplot.pdf and gnuplot-5.0.4/docs/gnuplot.pdf differ
diff -ur gnuplot-5.0.4.old/src/graphics.c gnuplot-5.0.4/src/graphics.c
--- gnuplot-5.0.4.old/src/graphics.c	2016-07-06 06:43:36.000000000 +0200
+++ gnuplot-5.0.4/src/graphics.c	2016-07-21 17:43:44.000000000 +0200
@@ -4835,7 +4835,8 @@
 				corners[0].style = FS_TRANSPARENT_SOLID + (alpha<<4);
 			}
 
-			if (rectangular_image && term->fillbox) {
+			if (rectangular_image && term->fillbox
+			&&  !(term->flags & TERM_POLYGON_PIXELS)) {
 			    /* Some terminals (canvas) can do filled rectangles */
 			    /* more efficiently than filled polygons. */
 			    (*term->fillbox)( corners[0].style,
diff -ur gnuplot-5.0.4.old/src/term_api.h gnuplot-5.0.4/src/term_api.h
--- gnuplot-5.0.4.old/src/term_api.h	2016-01-19 00:51:59.000000000 +0100
+++ gnuplot-5.0.4/src/term_api.h	2016-07-21 17:39:07.000000000 +0200
@@ -261,6 +261,7 @@
 #define TERM_IS_LATEX        (1<<13)	/* text uses TeX markup            */
 #define TERM_EXTENDED_COLOR  (1<<14)	/* uses EXTENDED_COLOR_SPECS       */
 #define TERM_NULL_SET_COLOR  (1<<15)	/* no support for RGB color        */
+#define TERM_POLYGON_PIXELS  (1<<16)	/* filledpolygon rather than fillbox */
 
 /* The terminal interface structure --- heart of the terminal layer.
  *
diff -ur gnuplot-5.0.4.old/src/version.c gnuplot-5.0.4/src/version.c
--- gnuplot-5.0.4.old/src/version.c	2016-07-20 05:23:21.000000000 +0200
+++ gnuplot-5.0.4/src/version.c	2016-07-21 17:50:12.000000000 +0200
@@ -44,7 +44,7 @@
 #ifdef DEVELOPMENT_VERSION
 #include "timestamp.h"
 #else
-const char gnuplot_date[] = "2016-07-19 ";
+const char gnuplot_date[] = "2016-07-21 ";
 #endif
 const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2016";

[-- Attachment #3: Type: text/plain, Size: 54 bytes --]


Looks innocuous.  Please push, thanks!

Ludo’.