From patchwork Sun Mar 28 15:49:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-Patchwork-Id: 28158 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 5D24C27BC64; Sun, 28 Mar 2021 16:50:41 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id C41B627BC63 for ; Sun, 28 Mar 2021 16:50:40 +0100 (BST) Received: from localhost ([::1]:38186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQXgV-0002v3-WB for patchwork@mira.cbaines.net; Sun, 28 Mar 2021 11:50:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQXfw-0002LJ-FR for guix-patches@gnu.org; Sun, 28 Mar 2021 11:50:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35275) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQXfv-0006V0-EM for guix-patches@gnu.org; Sun, 28 Mar 2021 11:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQXfv-0006J3-BP for guix-patches@gnu.org; Sun, 28 Mar 2021 11:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47433] [PATCH v2 1/2] gnu: Add the-foundation. Resent-From: =?utf-8?q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Mar 2021 15:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47433 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47433@debbugs.gnu.org Cc: =?utf-8?q?L=C3=A9o?= Le Bouter Received: via spool by 47433-submit@debbugs.gnu.org id=B47433.161694659524208 (code B ref 47433); Sun, 28 Mar 2021 15:50:03 +0000 Received: (at 47433) by debbugs.gnu.org; 28 Mar 2021 15:49:55 +0000 Received: from localhost ([127.0.0.1]:46818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQXfn-0006IH-2S for submit@debbugs.gnu.org; Sun, 28 Mar 2021 11:49:55 -0400 Received: from mail.zaclys.net ([178.33.93.72]:33199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQXfk-0006Ho-Mk for 47433@debbugs.gnu.org; Sun, 28 Mar 2021 11:49:53 -0400 Received: from localhost.localdomain (82-64-145-38.subs.proxad.net [82.64.145.38]) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 12SFnjss003299 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Sun, 28 Mar 2021 17:49:46 +0200 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 12SFnjss003299 Authentication-Results: mail.zaclys.net; dmarc=fail (p=reject dis=none) header.from=zaclys.net Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1616946586; bh=ybFvFG6mMqmSd7HKnIJQLI1HOXwegxFfbX8tx38QVrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rBOu8meNEERR0lGSwlg+Co031io+dCsTbllOtfk/zO9ybSC8P6L6iAGw8pqeDDWmo L8nghLdeg2SGHM4gxrfZAg7mgGqtdhQcecKi8ctaWAEsJbzCdqlhOi/By8V3A145eq wCjAnE20eC5iFh2pUegqc09odj6S03ERZGfZ9hPQ= Date: Sun, 28 Mar 2021 17:49:42 +0200 Message-Id: <20210328154943.21575-2-lle-bout@zaclys.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210328154943.21575-1-lle-bout@zaclys.net> References: <20210328154943.21575-1-lle-bout@zaclys.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: =?utf-8?q?L=C3=A9o?= Le Bouter X-ACL-Warn: , =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches X-Patchwork-Original-From: =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches via From: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (the-foundation): New variable. --- gnu/packages/web.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ae41588037..7896094726 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6639,6 +6639,42 @@ Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols.") (license license:expat))) +(define-public the-foundation + (let ((commit "c8bbd0d694578e5277f50f1523315f01ca910ec6")) + (package + (name "the-foundation") + (version (string-take commit 7)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.skyjake.fi/skyjake/the_Foundation") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "169v4n30vfr5hmvv37fccnds1nxhx86h6h428qxkqs2n21f2xb7w")))) + (build-system cmake-build-system) + (arguments + `(;; Tests are not meant to be run automatically for now. + ;; See https://codeberg.org/skyjake/the_Foundation/issues/2 + #:tests? #f)) + (native-inputs + `(("git" ,git-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("zlib" ,zlib) + ("pcre" ,pcre) + ("openssl" ,openssl) + ("libunistring" ,libunistring))) + (home-page "https://git.skyjake.fi/skyjake/the_Foundation") + (synopsis "Opinionated C11 library for low-level functionality") + (description "@code{the_Foundation} is a C11 library and a coding +convention for object-oriented programming that has been designed from the +point of view of someone who appreciates the user-friendliness of Qt and some +of the thinking behind C++ STL.") + (license license:bsd-2)))) + (define-public python-py-ubjson (package (name "python-py-ubjson") From patchwork Sun Mar 28 15:49:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-Patchwork-Id: 28157 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 AB49527BC64; Sun, 28 Mar 2021 16:50:17 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id 144DB27BC63 for ; Sun, 28 Mar 2021 16:50:17 +0100 (BST) Received: from localhost ([::1]:36902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQXg8-0002Mp-6u for patchwork@mira.cbaines.net; Sun, 28 Mar 2021 11:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQXfw-0002LP-G8 for guix-patches@gnu.org; Sun, 28 Mar 2021 11:50:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35276) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQXfw-0006V6-8L for guix-patches@gnu.org; Sun, 28 Mar 2021 11:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQXfw-0006JA-50 for guix-patches@gnu.org; Sun, 28 Mar 2021 11:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47433] [PATCH v2 2/2] gnu: Add lagrange. Resent-From: =?utf-8?q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Mar 2021 15:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47433 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47433@debbugs.gnu.org Cc: =?utf-8?q?L=C3=A9o?= Le Bouter Received: via spool by 47433-submit@debbugs.gnu.org id=B47433.161694659624214 (code B ref 47433); Sun, 28 Mar 2021 15:50:04 +0000 Received: (at 47433) by debbugs.gnu.org; 28 Mar 2021 15:49:56 +0000 Received: from localhost ([127.0.0.1]:46820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQXfn-0006IP-Fa for submit@debbugs.gnu.org; Sun, 28 Mar 2021 11:49:55 -0400 Received: from mail.zaclys.net ([178.33.93.72]:53175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQXfk-0006Hq-N5 for 47433@debbugs.gnu.org; Sun, 28 Mar 2021 11:49:54 -0400 Received: from localhost.localdomain (82-64-145-38.subs.proxad.net [82.64.145.38]) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 12SFnjst003299 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Sun, 28 Mar 2021 17:49:46 +0200 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 12SFnjst003299 Authentication-Results: mail.zaclys.net; dmarc=fail (p=reject dis=none) header.from=zaclys.net Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1616946586; bh=bFAzp9brik+cxlyWJ2BpjVJ8/K+o+oXVL/ohtpvn4uQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a8pCL3uIDmgK6KiWPHMc3f2YnbLrDJMLKeF2gdlg4CXmV9m47G8tkHmBs5goxXD7M qW3JlodQcaIsojwNs1EvOneyUxpK/2pTJn0v/3b85k0clLXhRkxLL3hA/EUvoLQk6X l0qR342rpYfbMjnABL6DGbTTyaNNJuEhqltIh7VE= Date: Sun, 28 Mar 2021 17:49:43 +0200 Message-Id: <20210328154943.21575-3-lle-bout@zaclys.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210328154943.21575-1-lle-bout@zaclys.net> References: <20210328154943.21575-1-lle-bout@zaclys.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: =?utf-8?q?L=C3=A9o?= Le Bouter X-ACL-Warn: , =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches X-Patchwork-Original-From: =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches via From: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (lagrange): New variable. --- gnu/packages/web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7896094726..5edb720a41 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -143,6 +143,7 @@ #:use-module (gnu packages mail) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages nss) @@ -160,6 +161,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages re2c) #:use-module (gnu packages readline) + #:use-module (gnu packages sdl) #:use-module (gnu packages search) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) @@ -6675,6 +6677,45 @@ point of view of someone who appreciates the user-friendliness of Qt and some of the thinking behind C++ STL.") (license license:bsd-2)))) +;; When upgrading, also upgrade the "the-foundation" package just above. +;; Lagrange pins specific commits of it and "the-foundation" does not make +;; releases (yet?). +(define-public lagrange + (package + (name "lagrange") + (version "1.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.skyjake.fi/skyjake/lagrange") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0djwr0n06z993kdpvks1dj7nr4j6481sfh5mjjg7q2hsfnsj9kmx")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "lib/the_Foundation") + #t)))) + (build-system cmake-build-system) + (arguments + `(;; No tests + #:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("the-foundation" ,the-foundation) + ("sdl2" ,sdl2) + ("mpg123" ,mpg123))) + (home-page "https://gmi.skyjake.fi/lagrange/") + (synopsis "Beautiful desktop GUI client for browsing Geminispace") + (description "@code{Lagrange} is a desktop GUI client for browsing +Geminispace. It offers modern conveniences familiar from web browsers, such +as smooth scrolling, inline image viewing, multiple tabs, visual themes, +Unicode fonts, bookmarks, history, and page outlines.") + (license license:bsd-2))) + (define-public python-py-ubjson (package (name "python-py-ubjson")