From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yNJiB6h/B2IpVAAAgWs5BA (envelope-from ) for ; Sat, 12 Feb 2022 10:36:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iP6mBKh/B2KDWgAA9RJhRA (envelope-from ) for ; Sat, 12 Feb 2022 10:36:40 +0100 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 556A41E7FA for ; Sat, 12 Feb 2022 10:36:39 +0100 (CET) Received: from localhost ([::1]:44038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIopa-0006ii-BR for larch@yhetil.org; Sat, 12 Feb 2022 04:36:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIoo2-0006hs-Sa for guix-patches@gnu.org; Sat, 12 Feb 2022 04:35:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIoo2-0006Ly-Bo for guix-patches@gnu.org; Sat, 12 Feb 2022 04:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIoo2-0006nw-6j for guix-patches@gnu.org; Sat, 12 Feb 2022 04:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45725] [PATCH v4] gnu: Add gutenprint. References: <20210108113822.24978-1-dftxbs3e@free.fr> In-Reply-To: <20210108113822.24978-1-dftxbs3e@free.fr> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Feb 2022 09:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45725@debbugs.gnu.org Cc: Brice Waegeneire Received: via spool by 45725-submit@debbugs.gnu.org id=B45725.164465846326102 (code B ref 45725); Sat, 12 Feb 2022 09:35:02 +0000 Received: (at 45725) by debbugs.gnu.org; 12 Feb 2022 09:34:23 +0000 Received: from localhost ([127.0.0.1]:33504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIonP-0006mw-6r for submit@debbugs.gnu.org; Sat, 12 Feb 2022 04:34:23 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:61135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIonM-0006md-Av for 45725@debbugs.gnu.org; Sat, 12 Feb 2022 04:34:22 -0500 Received: (Authenticated sender: brice@waegenei.re) by mail.gandi.net (Postfix) with ESMTPSA id D36E940006; Sat, 12 Feb 2022 09:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waegenei.re; s=gm1; t=1644658454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGuAmrqeIb4bLuN2NLkxaRkJRHMI9zFa4rpFGBk3qhA=; b=p2yqR4X8qG7crSSEWK94abOmSzvemJwSliNHZ5qHdFV7sb43dVfSAw5FwMyNGqDASNA63l 2AliWggjb98Rkdn/IOJzT5RYHFig9mcvwF8MFTj0fbq5fSNnKAQiNe7FSBPLGPOqgE0rlw jM2xoIMTiJs39RvRrxLViUW/QLM0EqJNvaC68de9See++z8PyCQeUAOI/WP6aSbmIqiC34 4Vuyma5IwkGdfEsji+QcEbzRELWJTWWHkGkid2gH+sDTc440IgbaFu3u2TyTSTtyPT0Ah0 hNBeujhDyAxzNz94BI6noW23QMVVFISimxQbQ+DQeQCfkFvsO2o8qh5g25U6Eg== From: Brice Waegeneire Date: Sat, 12 Feb 2022 10:34:10 +0100 Message-Id: <20220212093410.9161-1-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" 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=1644658599; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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:dkim-signature; bh=cGuAmrqeIb4bLuN2NLkxaRkJRHMI9zFa4rpFGBk3qhA=; b=llBiTVq6TWiNa6h1qOU8QWbhMZ8bTwZY/H7ngvxIKjpzMkAkITUGKU/ORjbILZTSTt3QK8 stNuj063phaadi/I29S4d59EJnW/FInvdt3Yqud89k3DffuUfvuAoX4gSRB+UKHalcZku2 NZ4ikd+dtq7XVJAZfzrLdG+bdQ6rH3ZG6PtuEOz77I7igqe3OHS2IKYRRgq6uSqJw/Sty6 Guzr+HhOgThR2tneV3BnWHB1pyKFoMUJy9L672a3yFFuYCYyRfOA5YPCnIs+ILn0jlpOal 9c0/za16dC0Qzw7rDwJAOVJp0EWd5b5uMDQhSZe4nYG823WGXRxi/3vMQlk+Cg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644658599; a=rsa-sha256; cv=none; b=VphIo4rze98Df43ZvDWm7DsujXtGgAs1xLTwne7wHyh/M28IgEBbGZovt4JEcnUKtFB6wn xxgwhWoCyj94Xl/Ea0eonoj0Z23Lmx8n+c6+cHOBbJqfRrF/IstX3Efug7SlFDB3sycmBB 9gN/JWQswtkRYJdOWdA5HNv/7NQAriLjIe4LQ+C9oMleFNvZSitmNq056cCwuT8m6nveY7 eEHIV14i7j0cqro1ImyFCkBcWVeeWukSrDZSt6FUzbcB0bpGLuJPNnYSdEo0dg/91mNg7l nrnCmOt0J0ZUXKIoNBZGTKzD/FbRFxxa4ctIaeeiivSMciBeXVnC8pvi9drNVA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=waegenei.re header.s=gm1 header.b=p2yqR4X8; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.23 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=waegenei.re header.s=gm1 header.b=p2yqR4X8; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 556A41E7FA X-Spam-Score: -1.23 X-Migadu-Scanner: scn1.migadu.com X-TUID: AvwvOU4LoVZr From: John Doe * gnu/packages/cups.scm (gutenprint): New variable. Co-authored-by: Brice Waegeneire --- I reworked this patch from John Doe by: - updating it to 5.3.4 - adding the copyright header - using the new input style - fixing the synopsis and description as suggested by Ludo’ It works fine in cups-service-type, as I'm using a driver from gutenprint to print to my local printer. gnu/packages/cups.scm | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index da113ac168..0831fad764 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -8,6 +8,8 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 John Doe +;;; Copyright © 2022 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +49,7 @@ (define-module (gnu packages cups) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages scanner) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -984,6 +987,58 @@ (define-public splix (home-page "http://splix.ap2c.org/") (license license:gpl2)))) +(define-public gutenprint + (package + (name "gutenprint") + (version "5.3.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gimp-print/" name "-" + (version-major+minor version) "/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0fq2y9sx37d342fihp1ys9kf4sr2j5nc1kl33j9sirmqs80sfi6v")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "check-parallel" + #:configure-flags (list "--enable-cups-level3-ppds" + "--enable-globalized-cups-ppds" + "--enable-cups-ppds" + "--enable-cups-1_2-enhancements") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-paths + (lambda* (#:key outputs native-inputs #:allow-other-keys) + (substitute* "Makefile.in" + (("/usr/bin/time") "time")) + (let ((out (assoc-ref outputs "out"))) + (substitute* (find-files "." "^(Makefile|Makefile\\.in|configure)$") + (("^(\\s*)cups_conf_serverbin(\\s*)=(.+)$") + (string-append "cups_conf_serverbin=" out "/lib/cups\n")) + (("^(\\s*)cups_conf_serverroot(\\s*)=(.+)$") + (string-append "cups_conf_serverroot=" out "/etc/cups\n")) + (("^(\\s*)cups_conf_datadir(\\s*)=(.+)$") + (string-append "cups_conf_datadir=" out "/share/cups\n"))) + (substitute* "src/cups/Makefile.in" + (("^(\\s*)bindir(\\s*)=(.+)$") + (string-append "bindir = " out "/bin\n")) + (("^(\\s*)sbindir(\\s*)=(.+)$") + (string-append "sbindir = " out "/sbin\n"))) + #t)))))) + (native-inputs + (list perl + time)) + (inputs + (list cups-minimal)) + (synopsis "Printer drivers for CUPS") + (description "This package provides printer drivers for CUPS. +This project also maintains an enhanced Print plug-in for GIMP 2.x from +the same code base. This driver supports widespread inkjet printers by major vendors, + including Canon, Epson, Fujitsu, SONY, @dots{}") + (home-page "http://gimp-print.sourceforge.net/") + (license license:gpl2+))) + (define-public python-pycups (package (name "python-pycups") base-commit: 068d99978a0c9c6fb66f95455060c8d08ba55ac5 -- 2.34.0