From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: gnuplot update Date: Fri, 22 Jul 2016 15:33:52 +0300 Message-ID: <20160722123352.GA3727@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="XOIedfhf+7KOe/yw" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQZeZ-0007TR-WF for guix-devel@gnu.org; Fri, 22 Jul 2016 08:34:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQZeU-0004z4-Si for guix-devel@gnu.org; Fri, 22 Jul 2016 08:34:06 -0400 Received: from flashner.co.il ([178.62.234.194]:52538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQZeU-0004yY-Gf for guix-devel@gnu.org; Fri, 22 Jul 2016 08:34:02 -0400 Received: from localhost (85.65.166.137.dynamic.barak-online.net [85.65.166.137]) by flashner.co.il (Postfix) with ESMTPSA id 78855401A5 for ; Fri, 22 Jul 2016 12:33:54 +0000 (UTC) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --XOIedfhf+7KOe/yw Content-Type: multipart/mixed; boundary="huq684BweRXVnRxX" Content-Disposition: inline --huq684BweRXVnRxX Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --huq684BweRXVnRxX Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="gnuplot.diff" Content-Transfer-Encoding: quoted-printable diff -Naur gnuplot-5.0.4-new/docs/gnuplot.pdf gnuplot-5.0.4-old/docs/gnuplo= t.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 =20 /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 - - * 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 =20 * term/aquaterm.trm: The AQUA_boxfill() routine scales very badly=20 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 =3D FS_TRANSPARENT_SOLID + (alpha<<4); } =20 - 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 = */ =20 /* 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[] =3D "2016-07-21 "; +const char gnuplot_date[] =3D "2016-07-19 "; #endif const char gnuplot_copyright[] =3D "Copyright (C) 1986-1993, 1998, 2004, 2= 007-2016"; =20 --huq684BweRXVnRxX Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-gnuplot-Update-to-upstream-s-re-release-of-5.0.4.patch" Content-Transfer-Encoding: quoted-printable =46rom 898e50701f6e9624243ff457ab2aa250128f4cff Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner 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.") =20 (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 mis= match. + ;; 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 o= nly be - ;; distributed as patches to the original. - (license (license:fsf-free - "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyrigh= t")))) + ;; 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/Copyri= ght"))))) =20 (define-public hdf5 (package --=20 2.9.1 --huq684BweRXVnRxX-- --XOIedfhf+7KOe/yw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXkhKwAAoJEPTB05F+rO6TWNMP/A99niOGcjbKRZidC4hLpnpx SJV3z1q0DBq42b7ERysGxwx++x4XTKwt2a34q3eQ6wmBnLjmvN/E8t69F1KpEg1P 0bH3JdVRCUqKtRguRn7GZnAmftIMA0yCugyo10nfxSErJRzx1qNKDfCJ6eqsGdXk vem1F0CKax+oyWRLESht9tKWP1ih3Zy31Cy7rbqb0ptBfmlVxlsBGI5IqJGCypzy eVgQ5U1TcvXzoLtwxyEFBXM0Ax4KG+Pfq96YGVGqLqSROMB2o7qDDWntJld4Ht/9 Deop6JiuQ8MZqttDONgqlzSPS/wKhwOBlwi5ckTLBkmgqOAEiVJ485kU11lWMrpG ZM0bJ/tqBQ+U2ztb4K/GF2CbuYRc2qLjqwEIJ1JzPNaAsWW5kShO41EHrlcpkTZp F1XmUF+LXAypkHQUNgWfrluGwbxhsIbq/LQQ0T9wTdKpETdtxh2G+KJT6xQWoLMy e3B6lqbifPMK8FsALD8pBG8UZ526W3DQXt+UToxp3/DTGYlR8X6r92H5j8oLdXcr Ibo73fXPyWM2iPvAT6Rhnj1RQxOqZGzBdIu/z+n/hymzFnR555sXnsfTSOaGpPii 1zkhtXsPbsnotZQ/fJjJ78/RQOgad022dTUikoyXKH3cu7G6YgHERkeIK4k9BrY0 21JR8OhLmfQxVM+RPf5s =JRVm -----END PGP SIGNATURE----- --XOIedfhf+7KOe/yw--