[PATCH] gnu: pspp: Upgrade to 0.8.2

[PATCH] gnu: pspp: Upgrade to 0.8.2

[John Darrington]

* gnu/packages/maths.scm (pspp): Update to 0.8.2.
* gnu/packages/patches/pspp-tests.patch: Removed.
---
 gnu/packages/maths.scm                |    5 ++---
 gnu/packages/patches/pspp-tests.patch |   13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 gnu/packages/patches/pspp-tests.patch

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d46fd16..640d502 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -125,7 +125,7 @@ LP/MIP solver is included in the package.")
 (define-public pspp
   (package
     (name "pspp")
-    (version "0.8.1")
+    (version "0.8.2")
     (source
      (origin
       (method url-fetch)
@@ -133,8 +133,7 @@ LP/MIP solver is included in the package.")
                           version ".tar.gz"))
       (sha256
        (base32
-        "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x"))
-      (patches (list (search-patch "pspp-tests.patch")))))
+        "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr"))))
     (build-system gnu-build-system)
     (inputs
      `(("cairo" ,cairo)
diff --git a/gnu/packages/patches/pspp-tests.patch b/gnu/packages/patches/pspp-tests.patch
deleted file mode 100644
index 3e61b68..0000000
--- a/gnu/packages/patches/pspp-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/output/render-test.c b/tests/output/render-test.c
-index 5f4c1da..e9df96c 100644
---- a/tests/output/render-test.c
-+++ b/tests/output/render-test.c
-@@ -142,7 +142,7 @@ configure_drivers (int width, int length)
-   string_map_insert (&options, "left-margin", "0");
-   string_map_insert (&options, "right-margin", "0");
-   string_map_insert_nocopy (&options, xstrdup ("paper-size"),
--                            xasprintf ("%dx%dpt", width * 5, length * 8));
-+                            xasprintf ("%dx%dpt", width * 5, length * 16));
-   driver = output_driver_create (&options);
-   if (driver == NULL)
-     exit (EXIT_FAILURE);
-- 
1.7.10.4

Re: [PATCH] gnu: pspp: Upgrade to 0.8.2

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/maths.scm (pspp): Update to 0.8.2.
> * gnu/packages/patches/pspp-tests.patch: Removed.

Could you remove the patch from gnu-system.am too?

Thanks,
Ludo’.

[PATCH] gnu: pspp: Upgrade to 0.8.2

[John Darrington]

From: John Darrington <john@darrington.wattle.id.au>

* gnu/packages/maths.scm (pspp): Update to 0.8.2.
* gnu/packages/patches/pspp-tests.patch: Deleted.
* gnu-system.am: Removed pspp-tests.patch from the manifest.
---
 gnu-system.am                         |    1 -
 gnu/packages/maths.scm                |    5 ++---
 gnu/packages/patches/pspp-tests.patch |   13 -------------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 gnu/packages/patches/pspp-tests.patch

diff --git a/gnu-system.am b/gnu-system.am
index 0ac867f..49e2057 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -275,7 +275,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/perl-no-sys-dirs.patch			\
   gnu/packages/patches/plotutils-libpng-jmpbuf.patch		\
   gnu/packages/patches/procps-make-3.82.patch			\
-  gnu/packages/patches/pspp-tests.patch				\
   gnu/packages/patches/pulseaudio-test-timeouts.patch		\
   gnu/packages/patches/pulseaudio-volume-test.patch		\
   gnu/packages/patches/python-fix-dbm.patch			\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d46fd16..640d502 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -125,7 +125,7 @@ LP/MIP solver is included in the package.")
 (define-public pspp
   (package
     (name "pspp")
-    (version "0.8.1")
+    (version "0.8.2")
     (source
      (origin
       (method url-fetch)
@@ -133,8 +133,7 @@ LP/MIP solver is included in the package.")
                           version ".tar.gz"))
       (sha256
        (base32
-        "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x"))
-      (patches (list (search-patch "pspp-tests.patch")))))
+        "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr"))))
     (build-system gnu-build-system)
     (inputs
      `(("cairo" ,cairo)
diff --git a/gnu/packages/patches/pspp-tests.patch b/gnu/packages/patches/pspp-tests.patch
deleted file mode 100644
index 3e61b68..0000000
--- a/gnu/packages/patches/pspp-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/output/render-test.c b/tests/output/render-test.c
-index 5f4c1da..e9df96c 100644
---- a/tests/output/render-test.c
-+++ b/tests/output/render-test.c
-@@ -142,7 +142,7 @@ configure_drivers (int width, int length)
-   string_map_insert (&options, "left-margin", "0");
-   string_map_insert (&options, "right-margin", "0");
-   string_map_insert_nocopy (&options, xstrdup ("paper-size"),
--                            xasprintf ("%dx%dpt", width * 5, length * 8));
-+                            xasprintf ("%dx%dpt", width * 5, length * 16));
-   driver = output_driver_create (&options);
-   if (driver == NULL)
-     exit (EXIT_FAILURE);
-- 
1.7.10.4

Re: [PATCH] gnu: pspp: Upgrade to 0.8.2

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> From: John Darrington <john@darrington.wattle.id.au>
>
> * gnu/packages/maths.scm (pspp): Update to 0.8.2.
> * gnu/packages/patches/pspp-tests.patch: Deleted.
> * gnu-system.am: Removed pspp-tests.patch from the manifest.

Applied, thanks!

Ludo’.