From 43b6b45e7be8cc25eba9f606015bee9653730b43 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Wed, 8 Jan 2020 21:57:33 -0500
Subject: gnu: Add libsoup-minimal.

* gnu/packages/gnome.scm (libsoup-minimal): New variable.
---
 gnu/packages/gnome.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fa9a8fc168..6d0f7fe2a4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -183,6 +183,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu artwork)
+  #:use-module ((guix build utils) #:select (modify-phases))
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
@@ -3741,6 +3742,22 @@ libxml to ease remote use of the RESTful API.")
 and the GLib main loop, to integrate well with GNOME applications.")
     (license license:lgpl2.0+)))
 
+
+;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
+(define-public libsoup-minimal
+  (package
+    (inherit libsoup)
+    (name "libsoup-minimal")
+    (outputs (delete "doc" (package-outputs libsoup)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments libsoup)
+       ((#:configure-flags configure-flags)
+        `(delete "-Dgtk_doc=true" ,configure-flags))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (delete 'move-doc)))))
+    (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup)))))
+
 (define-public libsecret
   (package
     (name "libsecret")
-- 
cgit v1.2.3

ass='right' method='get' action='/guix/log/gnu/system'>
<input type='hidden' name='id' value='893651af3ec8ea003404cfefbbaa4fcd56dad3d5'/><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/commit/?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>root</a>/<a href='/guix/commit/gnu?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>gnu</a>/<a href='/guix/commit/gnu/system?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>system</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='893651af3ec8ea003404cfefbbaa4fcd56dad3d5'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2020-04-14 12:56:44 +0200</td></tr>
<tr><th>committer</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2020-04-14 13:01:58 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/system?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>893651af3ec8ea003404cfefbbaa4fcd56dad3d5</a> (<a href='/guix/patch/gnu/system?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>a7665167fa090241c8601eb60da8b9355b94df3d</a> /<a href='/guix/tree/gnu/system?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>gnu/system</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/system?id=8e4d1493f1d56e29252eb7a36b3eee2a0e073ee4'>8e4d1493f1d56e29252eb7a36b3eee2a0e073ee4</a> (<a href='/guix/diff/gnu/system?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5&amp;id2=8e4d1493f1d56e29252eb7a36b3eee2a0e073ee4'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-893651af3ec8ea003404cfefbbaa4fcd56dad3d5.tar.gz'>guix-893651af3ec8ea003404cfefbbaa4fcd56dad3d5.tar.gz</a><br/><a href='/guix/snapshot/guix-893651af3ec8ea003404cfefbbaa4fcd56dad3d5.zip'>guix-893651af3ec8ea003404cfefbbaa4fcd56dad3d5.zip</a><br/></td></tr></table>
<div class='commit-subject'>installer: Open manual in the selected language on tty2.</div><div class='commit-msg'>Fixes &lt;https://bugs.gnu.org/40624&gt;.
Reported by Florian Pelz &lt;pelzflorian@pelzflorian.de&gt;.

Regression introduced in b5c2d93d7a223155898dd0ed6932f6acf78ac454.

* gnu/installer.scm (apply-locale): Remove 'lambda' around
'stop-service' and 'start-service' calls.
</div><div class='diffstat-header'><a href='/guix/diff/?id=893651af3ec8ea003404cfefbbaa4fcd56dad3d5'>Diffstat</a> (limited to 'gnu/system')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>