From 9c4752bd3ef514090094c8bdd4cbc3afb38cf186 Mon Sep 17 00:00:00 2001
From: Jack Hill <jackhill@jackhill.us>
Date: Sat, 27 Nov 2021 01:30:08 -0500
Subject: gnu: midori: Adjust inputs.

* gnu/packages/web-browsers.scm (midori)[propogated-inputs]: Add
  desktop-file-utils and which.
  [inputs]: Replace webkit with webkit-with-libsoup2.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/web-browsers.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 7ea2a9a9ec..50a41309d3 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -51,6 +51,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
@@ -125,10 +126,12 @@
            (assoc-ref glib-or-gtk:%standard-phases
                       'glib-or-gtk-wrap)))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
+     `(("desktop-file-utils" ,desktop-file-utils) ;for tests
+       ("glib:bin" ,glib "bin")
        ("gtk+:bin" ,gtk+ "bin")
        ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("which" ,which))) ;for tests
     (inputs
      `(("adwaita-icon-theme" ,adwaita-icon-theme)
        ("gcr" ,gcr)
@@ -139,10 +142,9 @@
        ("json-glib" ,json-glib)
        ("libarchive" ,libarchive)
        ("libpeas" ,libpeas)
-       ("libsoup" ,libsoup)
        ("sqlite" ,sqlite)
        ("vala" ,vala)
-       ("webkitgtk" ,webkitgtk)))
+       ("webkitgtk" ,webkitgtk-with-libsoup2)))
     (synopsis "Lightweight graphical web browser")
     (description "@code{Midori} is a lightweight, Webkit-based web browser.
 It features integration with GTK+3, configurable web search engine, bookmark
-- 
cgit v1.2.3

search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4cd9de6068f439c52f6874f00ec608c41156d095'>root</a>/<a href='/guix/log/gnu?id=4cd9de6068f439c52f6874f00ec608c41156d095'>gnu</a>/<a href='/guix/log/gnu/tests?id=4cd9de6068f439c52f6874f00ec608c41156d095'>tests</a>/<a href='/guix/log/gnu/tests/docker.scm?id=4cd9de6068f439c52f6874f00ec608c41156d095'>docker.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/tests/docker.scm?id=4cd9de6068f439c52f6874f00ec608c41156d095&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-08-27 12:20:44 +0200'>2019-08-27</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=7979a287f8eb84cbbfa44629951572408939a756'>pack: Create /tmp in Docker images.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-07-04 18:05:02 +0200'>2019-07-04</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=b9fcf0c82a14df48c7c6f36a08dbdcd3184fcbf8'>pack: 'docker' backend records the profile's search paths.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-07 09:57:19 +0200'>2019-06-07</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=a0f352b30f4869a7af7017b8a5011ac7602dd115'>pack: Add '--entry-point'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-15 16:36:21 +0200'>2019-05-15</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=247649d42e60b718f3f46b2bcf72d19bf799d503'>vm: 'system-docker-image' provides an entry point.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-18 22:24:14 +0100'>2019-01-18</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=69e47686c9a8a2b5c4ee33e5b14da657de3d7ca0'>tests: docker: Use "package" instead of "dummy-package".</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-15 12:16:46 +0100'>2019-01-15</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=49ec5d88c5770ae49b45849cb691c8921ecf4ca7'>tests: docker: Run a guest guile inside the docker container.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-11 12:14:37 +0100'>2019-01-11</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=babfd9447df08a809622238b4830eb046dab2ba6'>tests: Nitpick on Docker test.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-10 05:15:41 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=dc4b4a38fa2577d4dd01f80b4bc8c9255304e576'>tests: docker: Fix test.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-01-10 03:44:20 +0100'>2019-01-10</span></td><td><a href='/guix/commit/gnu/tests/docker.scm?id=7d8a4eeacc534c8742e0b22d855aa73e5ab66b7f'>tests: Add Docker system test.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>