Re: [PATCH] gnu: maths: Fix expected hash of gnuplot tarball.

2016-07-22 Thread Tomáš Čech 

Just ignore it, it seemed to me that Efraim forgot to send the patch
as we discussed on IRC but in fact my imap server was
dead and I haven't noticed that. Sorry :)

S_W

On Fri, Jul 22, 2016 at 06:57:43PM +0200, Tomáš Čech wrote:

* gnu/packages/maths.scm(gnuplot): Fix hash of downloaded tarball.

Upstream silently changed tarballs without changing version.

Diff of the tarball change:
diff -Naur gnuplot-5.0.4-old/docs/gnuplot.pdf gnuplot-5.0.4-new/docs/gnuplot.pdf
--- gnuplot-5.0.4-old/docs/gnuplot.pdf  2016-07-20 05:25:57.0 +0200
+++ gnuplot-5.0.4-new/docs/gnuplot.pdf  2016-07-21 17:47:10.0 +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:20160719202555-07'00')
-/ModDate (D:20160719202555-07'00')
+/CreationDate (D:20160721084708-07'00')
+/ModDate (D:20160721084708-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 [<7A30FAEBBA4B7F11C1CD6990B04692C4> <7A30FAEBBA4B7F11C1CD6990B04692C4>]
+/ID [<6898D2AAE33E85175B346EB9F8A7546B> <6898D2AAE33E85175B346EB9F8A7546B>]
/Length 16171
/Filter /FlateDecode
>>
diff -Naur gnuplot-5.0.4-old/ChangeLog gnuplot-5.0.4-new/ChangeLog
--- gnuplot-5.0.4-old/ChangeLog 2016-07-20 05:22:29.0 +0200
+++ gnuplot-5.0.4-new/ChangeLog 2016-07-21 17:45:11.0 +0200
@@ -1,3 +1,10 @@
+2016-07-21  Ethan A Merritt  
+
+   * 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 

* term/aquaterm.trm:  The AQUA_boxfill() routine scales very badly
diff -Naur gnuplot-5.0.4-old/src/graphics.c gnuplot-5.0.4-new/src/graphics.c
--- gnuplot-5.0.4-old/src/graphics.c2016-07-06 06:43:36.0 +0200
+++ gnuplot-5.0.4-new/src/graphics.c2016-07-21 17:43:44.0 +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 -Naur gnuplot-5.0.4-old/src/term_api.h gnuplot-5.0.4-new/src/term_api.h
--- gnuplot-5.0.4-old/src/term_api.h2016-01-19 00:51:59.0 +0100
+++ gnuplot-5.0.4-new/src/term_api.h2016-07-21 17:39:07.0 +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 -Naur gnuplot-5.0.4-old/src/version.c gnuplot-5.0.4-new/src/version.c
--- gnuplot-5.0.4-old/src/version.c 2016-07-20 05:23:21.0 +0200
+++ gnuplot-5.0.4-new/src/version.c 2016-07-21 17:50:12.0 +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";
---
gnu/packages/maths.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9f780a0..86326f7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -390,7 +390,7 @@ singular value problems.")
  version "/gnuplot-" version ".tar.gz"))
  (sha256
   (base32
-"08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297"
+"07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m"
(build-system gnu-build-system)
(inputs `(("readline" ,readline)
  ("cairo" ,cairo)
--
2.9.2




signature.asc
Description: Digital signature

[PATCH] gnu: maths: Fix expected hash of gnuplot tarball.

2016-07-22 Thread Tomáš Čech 
* gnu/packages/maths.scm(gnuplot): Fix hash of downloaded tarball.

Upstream silently changed tarballs without changing version.

Diff of the tarball change:
diff -Naur gnuplot-5.0.4-old/docs/gnuplot.pdf gnuplot-5.0.4-new/docs/gnuplot.pdf
--- gnuplot-5.0.4-old/docs/gnuplot.pdf  2016-07-20 05:25:57.0 +0200
+++ gnuplot-5.0.4-new/docs/gnuplot.pdf  2016-07-21 17:47:10.0 +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:20160719202555-07'00')
-/ModDate (D:20160719202555-07'00')
+/CreationDate (D:20160721084708-07'00')
+/ModDate (D:20160721084708-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 [<7A30FAEBBA4B7F11C1CD6990B04692C4> <7A30FAEBBA4B7F11C1CD6990B04692C4>]
+/ID [<6898D2AAE33E85175B346EB9F8A7546B> <6898D2AAE33E85175B346EB9F8A7546B>]
 /Length 16171
 /Filter /FlateDecode
 >>
diff -Naur gnuplot-5.0.4-old/ChangeLog gnuplot-5.0.4-new/ChangeLog
--- gnuplot-5.0.4-old/ChangeLog 2016-07-20 05:22:29.0 +0200
+++ gnuplot-5.0.4-new/ChangeLog 2016-07-21 17:45:11.0 +0200
@@ -1,3 +1,10 @@
+2016-07-21  Ethan A Merritt  
+
+   * 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 

* term/aquaterm.trm:  The AQUA_boxfill() routine scales very badly
diff -Naur gnuplot-5.0.4-old/src/graphics.c gnuplot-5.0.4-new/src/graphics.c
--- gnuplot-5.0.4-old/src/graphics.c2016-07-06 06:43:36.0 +0200
+++ gnuplot-5.0.4-new/src/graphics.c2016-07-21 17:43:44.0 +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 -Naur gnuplot-5.0.4-old/src/term_api.h gnuplot-5.0.4-new/src/term_api.h
--- gnuplot-5.0.4-old/src/term_api.h2016-01-19 00:51:59.0 +0100
+++ gnuplot-5.0.4-new/src/term_api.h2016-07-21 17:39:07.0 +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 -Naur gnuplot-5.0.4-old/src/version.c gnuplot-5.0.4-new/src/version.c
--- gnuplot-5.0.4-old/src/version.c 2016-07-20 05:23:21.0 +0200
+++ gnuplot-5.0.4-new/src/version.c 2016-07-21 17:50:12.0 +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";
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9f780a0..86326f7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -390,7 +390,7 @@ singular value problems.")
   version "/gnuplot-" version ".tar.gz"))
   (sha256
(base32
-"08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297"
+"07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m"
 (build-system gnu-build-system)
 (inputs `(("readline" ,readline)
   ("cairo" ,cairo)
-- 
2.9.2