summary refs log tree commit diff
path: root/gnu/packages/gtk.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-27 19:48:55 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-27 20:17:16 +0200
commitcbc8a92011d3a439b25201039941aac803870ec2 (patch)
treecb83ad712afbe518ce71d9f44d4b3d45681d0f66 /gnu/packages/gtk.scm
parentb651a5ab35414da54887780d03ea786ad4c894f2 (diff)
downloadguix-cbc8a92011d3a439b25201039941aac803870ec2.tar.gz
gnu: cairo: Fix undefined behaviour.
This fixes <https://bugs.freedesktop.org/show_bug.cgi?id=104325> which showed
up in Guix as an infinite loop during cairocffi tests.

* gnu/packages/patches/cairo-setjmp-wrapper.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gtk.scm (cairo)[source](patches): Add it.
Diffstat (limited to 'gnu/packages/gtk.scm')
-rw-r--r--gnu/packages/gtk.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1cf99f8db1..3322860d83 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -120,7 +120,8 @@ tools have full access to view and control running applications.")
             (sha256
              (base32
               "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c"))
-            (patches (search-patches "cairo-CVE-2016-9082.patch"))))
+            (patches (search-patches "cairo-CVE-2016-9082.patch"
+                                     "cairo-setjmp-wrapper.patch"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("fontconfig" ,fontconfig)