From patchwork Sun Apr 19 13:42:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21361 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B743E27BBE4; Sun, 19 Apr 2020 14:43:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2BD6327BBE1 for ; Sun, 19 Apr 2020 14:43:14 +0100 (BST) Received: from localhost ([::1]:41914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQAE5-0005Pu-Jj for patchwork@mira.cbaines.net; Sun, 19 Apr 2020 09:43:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59086) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQADv-0005Pl-6S for guix-patches@gnu.org; Sun, 19 Apr 2020 09:43:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQADu-0000WB-DV for guix-patches@gnu.org; Sun, 19 Apr 2020 09:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQADt-0000V8-Ve for guix-patches@gnu.org; Sun, 19 Apr 2020 09:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQADt-0000AE-UF for guix-patches@gnu.org; Sun, 19 Apr 2020 09:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40712] gnu: Add midori. (v3) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Apr 2020 13:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40712 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "Mathieu Othacehe" Cc: 40712@debbugs.gnu.org, pacoon@protonmail.com Received: via spool by 40712-submit@debbugs.gnu.org id=B40712.1587303759599 (code B ref 40712); Sun, 19 Apr 2020 13:43:01 +0000 Received: (at 40712) by debbugs.gnu.org; 19 Apr 2020 13:42:39 +0000 Received: from localhost ([127.0.0.1]:44246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQADT-00009X-Kj for submit@debbugs.gnu.org; Sun, 19 Apr 2020 09:42:39 -0400 Received: from knopi.disroot.org ([178.21.23.139]:50098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQADR-00009O-4E for 40712@debbugs.gnu.org; Sun, 19 Apr 2020 09:42:34 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 87E3C259B7; Sun, 19 Apr 2020 15:42:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cmzbIPJCGH4e; Sun, 19 Apr 2020 15:42:30 +0200 (CEST) Date: Sun, 19 Apr 2020 09:42:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587303750; bh=OvrZiDzhyxHzhBAIrjD7pH/aY6yvPUX49fv+IBf6Fs8=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=Mye/FvTsG1bQ/rG16J2ItNUrNh7zFWy58PiBs934WbB1C5aNSxneRZZ0X0aBQNnLX CyEVqPdSiBPtNQ78fQJ97JRSoZCNnjGvvR/FkYv7fHdvDmYHLS9Rre4/ynLM7ncN/U 2KTzZtT9XUE+SOvTU7KFjCWnvRrdF7CjwQRsffFrhE75rM6Ke0RnOKye5g280rzTni WnxCZSzCFAVhNSniXXZCPU7g2z1ancvOvYJv9bP+hylD3wzyIGFEhLvWcB8XAxNgD0 +akR5u68UDPLNAnf7h+QE/uQqNFgNTJhebdfMyL2H38BUu7X//rR1qe2i0YKzmCuYc YmmLFxJTUVxfw== From: Raghav Gururajan Message-ID: <20200419094213.0a72afde.raghavgururajan@disroot.org> In-Reply-To: <506018746e019f11b206897175cd777a@disroot.org> References: <0e4745a8ba9eb6868126ec3809a47ed3@disroot.org> <878sirkblc.fsf@gmail.com> <6793693e5da6eb936de9494680bbc2ee@disroot.org> <506018746e019f11b206897175cd777a@disroot.org> Mime-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Mathieu! > >>> Thanks for your patch! This is a duplicate of > >>> https://lists.gnu.org/archive/html/guix-patches/2020-03/msg00729.html. > >> > >> Oops! I did not know that. Sorry! > >> > >>> Like with Rene patch HTTPS didn't work for me. However when adding: > >>> > >>> --8<---------------cut here---------------start------------->8--- > >>> ("glib-networking" ,glib-networking) > >>> --8<---------------cut here---------------end--------------->8--- > >>> > >>> to inputs, yours work. Not sure how to proceed here. > >> > >> It's because I have used glib phases. > > > > Along with 'glib-networking', could you also add the following please? > > > > (add-after 'install 'wrap-typelib > > (lambda* (#:key outputs #:allow-other-keys) > > (let ((prog (string-append (assoc-ref outputs "out") > > "/bin/midori"))) > > (wrap-program prog > > `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) > > #t))) > > > > Sorry, I am at work now and do not have my machine. > > Looks like typelib wrap not required. Please find the revised oatch attached > with this email. Here is the final revised patch. This works perfectly. I tried `./pre-inst-env guix environment --ad-hoc midori --pure` and `midori`. Regards, RG From f5ec76af711402fce8b505b4912d9a71a7aceeba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Apr 2020 09:39:05 -0400 Subject: [PATCH] gnu: Add midori. * gnu/packages/web-browsers.scm (midori): New variable. --- gnu/packages/web-browsers.scm | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 8a6ffaeef1..0cfc65ee56 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Raghav Gururajan ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,10 +31,13 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages backup) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnupg) #:use-module (gnu packages libevent) @@ -42,6 +46,7 @@ #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnome-xyz) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -57,11 +62,66 @@ #:use-module (gnu packages gcc) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) #:use-module (guix build-system asdf)) +(define-public midori + (package + (name "midori") + (version "9.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/midori-browser/core/releases/" + "download/v" version "/" name "-v" version ".tar.gz")) + (sha256 + (base32 + "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy")))) + (build-system cmake-build-system) + (arguments + `(#:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("adwaita-icon-theme" ,adwaita-icon-theme) + ("gcr" ,gcr) + ("glib" ,glib) + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("json-glib" ,json-glib) + ("libarchive" ,libarchive) + ("libpeas" ,libpeas) + ("libsoup" ,libsoup) + ("sqlite" ,sqlite) + ("vala" ,vala) + ("webkitgtk" ,webkitgtk))) + (synopsis "Lightweight and Fast Web Browser") + (description "Midori is a lightweight yet powerful web browser which runs +just as well on little embedded computers named for delicious pastries as it +does on beefy machines with a core temperature exceeding that of planet +earth. And it looks good doing that, too. Oh, and of course it's free +software.") + (home-page "https://www.midori-browser.org") + (license license:lgpl2.1+))) + (define-public dillo (package (name "dillo") -- 2.26.1