From 1b0f266e40aead09be95a984bd9c6cec3dff397e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 2 Jul 2017 22:45:33 +0200 Subject: gnu: Switch guile-cairo and dependents to Guile 2.2 again. Fixes . Reported by Leo Famulari . This reinstates the following commits: e3ddb1e83 * gnu: guile-cairo: Switch to Guile 2.2. ae5c6ef39 * gnu: guile-gnome: Update to 2.16.5. 0fd8013fc * gnu: guile-rsvg: Update to commit 05c6a2fd. 66b9183c4 * gnu: guile-lib: Switch to Guile 2.2. and adds the following changes: * gnu/bootloader/grub.scm (svg->png): Add 'package->derivation' call for GUILE-2.2. Pass #:guile-for-build to 'gexp->derivation'. * gnu/build/svg.scm (svg->png): Add 'em' and 'ex' to the 'let-values' form to account for all the values returned by 'rsvg-handle-get-dimensions', which Guile 2.2 does not truncate. --- gnu/build/svg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/build') diff --git a/gnu/build/svg.scm b/gnu/build/svg.scm index f7e92a1a19..b5474ec4a0 100644 --- a/gnu/build/svg.scm +++ b/gnu/build/svg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2015 Andy Wingo ;;; ;;; This file is part of GNU Guix. @@ -50,7 +50,7 @@ (define* (svg->png in-svg out-png (define svg (rsvg-handle-new-from-file in-svg)) - (let-values (((origin-width origin-height) + (let-values (((origin-width origin-height em ex) (rsvg-handle-get-dimensions svg))) (let* ((surf (cairo-image-surface-create 'argb32 origin-width origin-height)) -- cgit v1.2.3