From 1b0f266e40aead09be95a984bd9c6cec3dff397e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 2 Jul 2017 22:45:33 +0200
Subject: gnu: Switch guile-cairo and dependents to Guile 2.2 again.

Fixes <https://bugs.gnu.org/27551>.
Reported by Leo Famulari <leo@famulari.name>.

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/packages/patches/guile-rsvg-pkgconfig.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/patches')

diff --git a/gnu/packages/patches/guile-rsvg-pkgconfig.patch b/gnu/packages/patches/guile-rsvg-pkgconfig.patch
index 2272b4e1cd..51483a3472 100644
--- a/gnu/packages/patches/guile-rsvg-pkgconfig.patch
+++ b/gnu/packages/patches/guile-rsvg-pkgconfig.patch
@@ -9,7 +9,7 @@ and LDFLAGS for Guile would not be captured.
  
 +dnl The above macro fails to set the 'GUILE_CFLAGS' and 'GUILE_LIBS'
 +dnl substitution variables, hence this line.
-+PKG_CHECK_MODULES(GUILE, guile-2.0)
++PKG_CHECK_MODULES(GUILE, guile-$GUILE_EFFECTIVE_VERSION)
 +
  PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0)
  AC_SUBST(GUILE_CAIRO_LIBS)
-- 
cgit v1.2.3

d class='form'><form class='right' method='get' action='/guix/log/gnu/packages/web-browsers.scm'>
<input type='hidden' name='id' value='783467ae02b6b88081ef0c02af71b28db9729b59'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=783467ae02b6b88081ef0c02af71b28db9729b59'>root</a>/<a href='/guix/log/gnu?id=783467ae02b6b88081ef0c02af71b28db9729b59'>gnu</a>/<a href='/guix/log/gnu/packages?id=783467ae02b6b88081ef0c02af71b28db9729b59'>packages</a>/<a href='/guix/log/gnu/packages/web-browsers.scm?id=783467ae02b6b88081ef0c02af71b28db9729b59'>web-browsers.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/web-browsers.scm?id=783467ae02b6b88081ef0c02af71b28db9729b59&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-05-08 15:16:24 -0400'>2017-05-08</span></td><td><a href='/guix/commit/gnu/packages/web-browsers.scm?id=c5196ac7ee668a65c0cfda25ce354b826b15435c'>gnu: Move lynx to web-browsers.scm.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2017-05-08 15:07:48 -0400'>2017-05-08</span></td><td><a href='/guix/commit/gnu/packages/web-browsers.scm?id=8bdc36d4bd5d38a5e595c9c51e61bad4caf291e0'>gnu: Move links to web-browsers.scm.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2017-05-06 10:59:06 -0400'>2017-05-06</span></td><td><a href='/guix/commit/gnu/packages/web-browsers.scm?id=7610c3ca5540a7d0946e15a765b35f8bf068316e'>gnu: Move qutebrowser to web-browsers.scm.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2017-04-30 15:08:59 -0400'>2017-04-30</span></td><td><a href='/guix/commit/gnu/packages/web-browsers.scm?id=fbaf9376f6ad57f8da86ac968e79526bdb1fdcf6'>Revert "gnu: Move netsurf to web-browsers.scm."</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-04-30 14:11:16 -0400'>2017-04-30</span></td><td><a href='/guix/commit/gnu/packages/web-browsers.scm?id=a39ee1accb384fa4747a2a14d44616557419087f'>gnu: Move netsurf to web-browsers.scm.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>
<tr><td><span title='2017-04-10 19:16:47 -0400'>2017-04-10</span></td><td><a href='/guix/commit/gnu/packages/web-browsers.scm?id=0c3953ea603e6abd885a5a91b84f7f7788d0829f'>gnu: Move dillo to web-browsers.scm.</a><span class='msg-avail'>...</span></td><td>Kei Kebreau</td></tr>