01/01: gnu: mate-applets: Build with a fixed version of yelp-tools.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 4ed041d90159f0efc0068745ce9ef03bdb6ef234
Author: Marius Bakke <address@hidden>
Date:   Tue Oct 8 22:04:12 2019 +0200

    gnu: mate-applets: Build with a fixed version of yelp-tools.
    
    Fixes <https://bugs.gnu.org/37668>.
    Reported by Jan Wielkiewicz <address@hidden>.
    
    * gnu/packages/gnome.scm (yelp-tools/fixed): New public variable.
    * gnu/packages/mate.scm (mate-applets)[native-inputs]: Replace YELP-TOOLS 
with
    YELP-TOOLS/FIXED.
---
 gnu/packages/gnome.scm | 11 +++++++++++
 gnu/packages/mate.scm  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d8b73e2..eae62a1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4623,6 +4623,17 @@ lifting is done by packages like yelp-xsl and itstool.  
This package just
 wraps things up in a developer-friendly way.")
     (license license:gpl2+)))
 
+(define-public yelp-tools/fixed
+  ;; This variant fixes a python-libxml2 crash when processing UTF-8
+  ;; sequences: <https://bugs.gnu.org/37468>.  TODO: Remove this in
+  ;; the next rebuild cycle.
+  (hidden-package
+   (package/inherit
+    yelp-tools
+    (propagated-inputs
+     `(("itstool" ,itstool/fixed)
+       ,@(alist-delete "itstool" (package-propagated-inputs yelp-tools)))))))
+
 (define-public libgee
   (package
     (name "libgee")
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index ba90cce..fb3c5ab 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -565,7 +565,7 @@ assorted menu related utility programs.")
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("libxslt" ,libxslt)
-       ("yelp-tools" ,yelp-tools)
+       ("yelp-tools" ,yelp-tools/fixed)
        ("scrollkeeper" ,scrollkeeper)
        ("gettext" ,gettext-minimal)
        ("docbook-xml" ,docbook-xml)