From patchwork Tue Jun 21 00:50:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Wicki X-Patchwork-Id: 40203 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 3CF7427BBEA; Tue, 21 Jun 2022 01:52:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9745127BBE9 for ; Tue, 21 Jun 2022 01:52:16 +0100 (BST) Received: from localhost ([::1]:50258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3S7r-0004BD-Ny for patchwork@mira.cbaines.net; Mon, 20 Jun 2022 20:52:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3S7e-0004B1-Sz for guix-patches@gnu.org; Mon, 20 Jun 2022 20:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o3S7e-0002du-Ii for guix-patches@gnu.org; Mon, 20 Jun 2022 20:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o3S7e-0003lJ-FM for guix-patches@gnu.org; Mon, 20 Jun 2022 20:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56087] [PATCH] gnu: suckless: add farbfeld and propagate input to sent Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jun 2022 00:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 56087@debbugs.gnu.org Received: via spool by 56087-submit@debbugs.gnu.org id=B56087.165577267114399 (code B ref 56087); Tue, 21 Jun 2022 00:52:02 +0000 Received: (at 56087) by debbugs.gnu.org; 21 Jun 2022 00:51:11 +0000 Received: from localhost ([127.0.0.1]:58631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3S6p-0003kB-5j for submit@debbugs.gnu.org; Mon, 20 Jun 2022 20:51:11 -0400 Received: from chimborazo.ee.ethz.ch ([129.132.2.15]:51119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3S6m-0003je-5s for 56087@debbugs.gnu.org; Mon, 20 Jun 2022 20:51:09 -0400 Received: from silvi (unknown [85.195.207.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id 35886401C8; Tue, 21 Jun 2022 02:50:58 +0200 (CEST) Date: Tue, 21 Jun 2022 02:50:47 +0200 From: Gabriel Wicki Message-ID: <20220621005047.ajgnk3ob22t37wsc@silvi> References: <20220619115925.bcrcjpd7yse2n25t@silvi> <66ac65e65fb19a239aedcb132c75343b88083306.camel@telenet.be> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <66ac65e65fb19a239aedcb132c75343b88083306.camel@telenet.be> 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" X-getmail-retrieved-from-mailbox: Patches Hi Maxime Thanks for your quick reply! Here is the revised patchset. I've added a patch to use `guix style`'s output. Greetings, gabriel From 15e88ce3cb4ab51d6fe9ad9ae3ab15a435fb4db8 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Sat, 18 Jun 2022 17:00:16 +0200 Subject: [PATCH 1/3] gnu: Add farbfeld. * gnu/packages/suckless.scm (farbfeld): New variable. [use-modules]: Add (gnu packages imagemagick) --- gnu/packages/suckless.scm | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 5aa37657b9..895fc4161b 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -39,6 +39,7 @@ (define-module (gnu packages suckless) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) #:use-module (gnu packages mpd) @@ -1084,3 +1085,43 @@ (define-public sfeed various other formats. There are also some programs and scripts included to import and export OPML and to fetch, filter, merge and order feed items.") (license license:isc))) + +(define-public farbfeld + (let ((commit "ab5e3dfc9cdb476218538c6687df9f44826d8f11") (revision "0")) + (package + (name "farbfeld") + (version (git-version "4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.suckless.org/farbfeld") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870")))) + (build-system gnu-build-system) + (inputs (list libpng libjpeg-turbo imagemagick)) + (arguments + (list #:tests? + #f ;no check target + #:make-flags + #~(list (string-append "PREFIX=" + #$output) + (string-append "CC=" + #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-2ff + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "2ff" + (("png2ff") (string-append #$output "/bin/png2ff")) + (("jpg2ff") (string-append #$output "/bin/jpg2ff")) + (("convert") (search-input-file inputs "/bin/convert"))))) + (delete 'configure)))) + (synopsis "Image format and conversion tools") + (description + "farbfeld is a lossless image format which is easy to parse, +pipe and compress.") + (home-page "https://git.suckless.org/farbfeld/") + (license license:isc)))) -- 2.34.0 From 1c5a9ff89bc4525b9e1a07b6b96b017ad58a81fe Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Sat, 18 Jun 2022 17:04:12 +0200 Subject: [PATCH 2/3] gnu: sent: Add farbfeld to propagated-inputs. * gnu/packages/suckless.scm (sent)[propagated-inputs]: Add it. [phases]{patch-farbfeld}: New phase. [inputs]: Add farbfeld. [home-page]: Add trailing slash to fix linter warning. --- gnu/packages/suckless.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 895fc4161b..837977d51b 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -520,7 +520,11 @@ (define-public sent (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configuration + (delete 'configure) ; no configuration + (add-before 'build 'patch-farbfeld + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "config.def.h" + (("2ff") (search-input-file inputs "/bin/2ff")))))) #:tests? #f ; no test suite #:make-flags (let ((pkg-config (lambda (flag) @@ -534,7 +538,8 @@ (define-public sent (native-inputs (list pkg-config)) (inputs - `(("libpng" ,libpng) + `(("farbfeld" ,farbfeld) + ("libpng" ,libpng) ("libx11" ,libx11) ("libxft" ,libxft) ("fontconfig" ,fontconfig))) @@ -544,7 +549,7 @@ (define-public sent Especially for presentations using the Takahashi method this is very nice and allows you to write down the presentation for a quick lightning talk within a few minutes.") - (home-page "https://tools.suckless.org/sent") + (home-page "https://tools.suckless.org/sent/") (license license:x11))) (define-public wmname -- 2.34.0 From 6fb7a48822e51625de8ca1026260faac80adbe17 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Tue, 21 Jun 2022 02:38:40 +0200 Subject: [PATCH 3/3] gnu: sent: Apply guix style * gnu/packages/suckless.scm (sent): Apply `guix style`. --- gnu/packages/suckless.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 837977d51b..ac3ee7df10 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -520,31 +520,32 @@ (define-public sent (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configuration + (delete 'configure) ;no configuration (add-before 'build 'patch-farbfeld (lambda* (#:key inputs #:allow-other-keys) (substitute* "config.def.h" (("2ff") (search-input-file inputs "/bin/2ff")))))) - #:tests? #f ; no test suite + #:tests? + #f ;no test suite #:make-flags (let ((pkg-config (lambda (flag) - (string-append - "$(shell pkg-config " flag " " - "xft fontconfig x11 libpng)")))) - (list (string-append "CC=" ,(cc-for-target)) + (string-append "$(shell pkg-config " flag " " + "xft fontconfig x11 libpng)")))) + (list (string-append "CC=" + ,(cc-for-target)) (string-append "PREFIX=" %output) - (string-append "INCS=-I. " (pkg-config "--cflags")) - (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) - (native-inputs - (list pkg-config)) - (inputs - `(("farbfeld" ,farbfeld) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxft" ,libxft) - ("fontconfig" ,fontconfig))) + (string-append "INCS=-I. " + (pkg-config "--cflags")) + (string-append "LIBS=" + (pkg-config "--libs") " -lm"))))) + (native-inputs (list pkg-config)) + (inputs `(("farbfeld" ,farbfeld) ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxft" ,libxft) + ("fontconfig" ,fontconfig))) (synopsis "Plain-text presentation tool") - (description "Sent uses plain-text files and PNG images to create slideshow + (description + "Sent uses plain-text files and PNG images to create slideshow presentations. Each paragraph represents a slide in the presentation. Especially for presentations using the Takahashi method this is very nice and allows you to write down the presentation for a quick lightning talk within a