From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aB9uALHQoWEHwwAAgWs5BA (envelope-from ) for ; Sat, 27 Nov 2021 07:31:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uDCPN7DQoWEnUgAAbx9fmQ (envelope-from ) for ; Sat, 27 Nov 2021 06:31:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 892502FB8A for ; Sat, 27 Nov 2021 07:31:12 +0100 (CET) Received: from localhost ([::1]:46612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqrEt-0000te-7e for larch@yhetil.org; Sat, 27 Nov 2021 01:31:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqrEk-0000tD-2A for bug-guix@gnu.org; Sat, 27 Nov 2021 01:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqrEj-00045V-Pz for bug-guix@gnu.org; Sat, 27 Nov 2021 01:31:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqrEj-0002v1-J8 for bug-guix@gnu.org; Sat, 27 Nov 2021 01:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52134: [PATCH] gnu: midori: Adjust inputs. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 27 Nov 2021 06:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52134 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 52134@debbugs.gnu.org Received: via spool by 52134-submit@debbugs.gnu.org id=B52134.163799462811166 (code B ref 52134); Sat, 27 Nov 2021 06:31:01 +0000 Received: (at 52134) by debbugs.gnu.org; 27 Nov 2021 06:30:28 +0000 Received: from localhost ([127.0.0.1]:61000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqrEC-0002tt-Eg for submit@debbugs.gnu.org; Sat, 27 Nov 2021 01:30:28 -0500 Received: from minsky.hcoop.net ([104.248.1.95]:44858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqrEA-0002pY-BB for 52134@debbugs.gnu.org; Sat, 27 Nov 2021 01:30:27 -0500 Received: from [2001:470:8:9f5:e878:315c:5ed6:89d] (helo=leyden.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mqrE4-0000py-CI for 52134@debbugs.gnu.org; Sat, 27 Nov 2021 01:30:20 -0500 From: Jack Hill Date: Sat, 27 Nov 2021 01:30:08 -0500 Message-Id: <20211127063008.13725-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637994672; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=wZZohpBnx/454O3Lph7FbzFWaYUPQF6+520b/Xped40=; b=gOVuukWLvqUWrsdh7ir4QBvgBZphvCalsGXhBjVlPrcSjSwgg2QdDMiR5l8wkmfdBO20zK WsHnFLXWjUGmujm6/MhHN/CDu0TtH+KcxGfFL+smsKKHxHr67/ccEr/SrUBKvg9hJdJe3J fZ1iXK9CMPaIFksUnL86O3vROM2jzFshHu+6A+93mnhxOFKlwghzsfpJizu+fy2SDA+k5I B1261o+77j7CIGq2pkeKGjdx4L22UO20BPt3x+FsseDV88IvNgSn2+bRAik645qpOwhB6k PSnKu045GQyO4FLaoMgYCf9vVG4IrOWHwNFcTKPspBaZ6yCqxEM9Q4jCjR+rJA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637994672; a=rsa-sha256; cv=none; b=RA6kf2O9o9hhSUfEsUhjKFkeulqxxDJKQ1y9uvqTuP+HGQg/IEHuYxQGW7gHeNJwoLbuoa a1/u3XAQjrbq5uuytpLew9DOSqg8xGrGw1Yyl3w/K/MpDiFFRJj/hkHlpMaCFJYL5R7xvZ aZ7G2P82qsw0ECMrJDt8QLd0bf2yo1/fkSxZB/TuCnmPrkHOHXj2fnzZMsRy8QNIpq9YVZ mpC3ArMe6XjCZj42k4NdUEAAOwIgcHKbNB0Y1M2fNScUTbM1obR/+P3oc4WaMCLlim6vmN C6qO9gEg2bGeDonDW2B6Rd9r6KBDZaFsKkNGEGkrkqsBP11+GinXo5opuJD0Fw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.40 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 892502FB8A X-Spam-Score: -1.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2uSmnrCx3n7j * gnu/packages/web-browsers.scm [use-modules]: Add (gnu packages base). (midori)[propogated-inputs]: Add desktop-file-utils and which. [inputs]: Replace webkit with webkit-with-libsoup2. --- gnu/packages/web-browsers.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 @@ (define-module (gnu packages web-browsers) #: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 @@ (define-public midori (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 @@ (define-public midori ("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 -- 2.34.0