[bug#27657] [PATCH 2/3] gnu: graphviz: Update to 2.40.1.

[bug#27657] [PATCH 2/3] gnu: graphviz: Update to 2.40.1.

[Arun Isaac]

* gnu/packages/graphviz.scm (graphviz): Update to 2.40.1.
[arguments]: Remove pre-build phase.
---
 gnu/packages/graphviz.scm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index f236788e0..3339079f1 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -44,7 +44,7 @@
 (define-public graphviz
   (package
     (name "graphviz")
-    (version "2.38.0")
+    (version "2.40.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -52,21 +52,13 @@
                     version ".tar.gz"))
               (sha256
                (base32
-                "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"))))
+                "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"))))
     (build-system gnu-build-system)
     (arguments
      ;; FIXME: rtest/rtest.sh is a ksh script (!).  Add ksh as an input.
      '(#:tests? #f
        #:phases
        (modify-phases %standard-phases
-         (add-before 'build 'pre-build
-           (lambda _
-             ;; Work around bogus makefile when using an external
-             ;; libltdl.  Failing to do so, one hits this error:
-             ;; "No rule to make target `-lltdl', needed by `libgvc.la'."
-             (substitute* "lib/gvc/Makefile"
-               (("am__append_5 *=.*")
-                "am_append_5 =\n"))))
          (add-after
              'install 'move-docs
            (lambda* (#:key outputs #:allow-other-keys)
-- 
2.12.2

[bug#27657] [PATCH 3/3] gnu: wayland: Add workaround for graphviz 2.40.1.

[Arun Isaac]

* gnu/packages/freedesktop.scm (wayland)[arguments]: Add fix-graphviz phase.
---
 gnu/packages/freedesktop.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a9a7e08da..d0d7604b1 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -367,7 +367,17 @@ Python.")
                (base32
                 "0lgywr1m0d79vr4s8aimj8a307nss29hhy68gjpqj7m667055c39"))))
     (build-system gnu-build-system)
-    (arguments `(#:parallel-tests? #f))
+    (arguments
+     `(#:parallel-tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; Remove record shapes to workaround graphviz 2.40.1 problems
+         ;; http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226
+         ;; This will likely be fixed upstream in the next release
+         (add-before 'build 'fix-graphviz
+           (lambda _
+             (substitute* "doc/doxygen/dot/x-architecture.gv"
+               (("Mrecord") "none")))))))
     (native-inputs
      `(("doxygen" ,doxygen)
        ("graphviz" ,graphviz)
-- 
2.12.2

[bug#27657] [PATCH 3/3] gnu: wayland: Add workaround for graphviz 2.40.1.

[Marius Bakke]

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

Arun Isaac <arunisaac@systemreboot.net> writes:

> * gnu/packages/freedesktop.scm (wayland)[arguments]: Add fix-graphviz phase.

Thanks!

[...]

> +       (modify-phases %standard-phases
> +         ;; Remove record shapes to workaround graphviz 2.40.1 problems
> +         ;; http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226
> +         ;; This will likely be fixed upstream in the next release

Please add punctuations here. Why is it likely fixed next release, is
there a patch or bug report upstream? If so, please add them here.

> +         (add-before 'build 'fix-graphviz
> +           (lambda _
> +             (substitute* "doc/doxygen/dot/x-architecture.gv"
> +               (("Mrecord") "none")))))))

And make sure this phase ends on #t.

>      (native-inputs
>       `(("doxygen" ,doxygen)
>         ("graphviz" ,graphviz)
> -- 
> 2.12.2

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

[bug#27657] [PATCH 3/3] gnu: wayland: Add workaround for graphviz 2.40.1.

[Arun Isaac]

Marius Bakke writes:

> Arun Isaac <arunisaac@systemreboot.net> writes:
>
>> * gnu/packages/freedesktop.scm (wayland)[arguments]: Add fix-graphviz phase.
>
> Thanks!

Oops! I just got this mail, and have already pushed this patch to
staging. I'll have to make these changes a separate commit. Sorry about
the communication gap.

> [...]
>
>> +       (modify-phases %standard-phases
>> +         ;; Remove record shapes to workaround graphviz 2.40.1 problems
>> +         ;; http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226
>> +         ;; This will likely be fixed upstream in the next release
>
> Please add punctuations here. Why is it likely fixed next release, is
> there a patch or bug report upstream? If so, please add them here.

I thought it will likely be fixed next release because of the following
thread:
https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html

I'll replace this sentence with another one saying that this is a known
upstream bug.

>
>> +         (add-before 'build 'fix-graphviz
>> +           (lambda _
>> +             (substitute* "doc/doxygen/dot/x-architecture.gv"
>> +               (("Mrecord") "none")))))))
>
> And make sure this phase ends on #t.

Will do. I keep forgetting to return #t from phases. Can't Guix error
out if #t is not returned from the phase?

[bug#27657] [PATCH 3/3] gnu: wayland: Add workaround for graphviz 2.40.1.

[Leo Famulari]

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

On Sat, Jul 15, 2017 at 12:46:12AM +0530, Arun Isaac wrote:
> Will do. I keep forgetting to return #t from phases. Can't Guix error
> out if #t is not returned from the phase?

Sometimes the code in a phase returns a useful value. A common example:

(zero? (system* "foo"))

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