From patchwork Wed Sep 18 21:14:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 68117 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 64AA727BBE2; Wed, 18 Sep 2024 22:16:08 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 D024C27BBE9 for ; Wed, 18 Sep 2024 22:16:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sr21j-0000fJ-QQ; Wed, 18 Sep 2024 17:15:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sr21h-0000Yr-6J for guix-patches@gnu.org; Wed, 18 Sep 2024 17:15:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sr21g-0002lj-Rx; Wed, 18 Sep 2024 17:15:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=92bgkoJTKhlGr3wEpRQCsoCE+0ldIDB3aw9Ggelr094=; b=BFc3T4/4iALla9EwJIVIe+ik7JuFfzT2CziyUo0Mq7QvD/8q++ElWi2iZ1ok+v5RyBEGA4SYx7lJVzVpwipTXSdb7Rsu1KRNlzoYUXA++ourehZ0AXjIhXCByACE9AC27q+8cvRkNIo9z2cbuZlaiwO4Smk6QGETb7N+oPqf0Uy3Lm4gPZXbm0zmQ0haI/EVInYhg+Sd11GrYJCpXVrDaPw7f+Wt4Kr9GKKxxawuVf7WNv/LisK+fGNgnibQhb7Q1s+SS1zRclmAb5z1HC8AVkF+qW5VkeE3Iy5auKaIijuen31uTq//jctZXCjGCG6AShFmL/Mr5Ry4B/AB82WWwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sr21q-00050d-5p; Wed, 18 Sep 2024 17:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73338] [PATCH 2/2] gnu: impressive: Update to 13.2 and fix build Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Wed, 18 Sep 2024 21:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73338 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73338@debbugs.gnu.org Cc: Aaron Covrig , lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de Received: via spool by submit@debbugs.gnu.org id=B.172669414119218 (code B ref -1); Wed, 18 Sep 2024 21:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2024 21:15:41 +0000 Received: from localhost ([127.0.0.1]:59308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sr21U-0004zq-8O for submit@debbugs.gnu.org; Wed, 18 Sep 2024 17:15:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:44524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sr21R-0004zc-6p for submit@debbugs.gnu.org; Wed, 18 Sep 2024 17:15:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sr21A-0006ty-Dd for guix-patches@gnu.org; Wed, 18 Sep 2024 17:15:20 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sr218-0002kw-Cz for guix-patches@gnu.org; Wed, 18 Sep 2024 17:15:20 -0400 Received: by mail-qt1-x82f.google.com with SMTP id d75a77b69052e-4585e25f42bso1145791cf.2 for ; Wed, 18 Sep 2024 14:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1726694117; x=1727298917; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=92bgkoJTKhlGr3wEpRQCsoCE+0ldIDB3aw9Ggelr094=; b=Aj6m5sBuEQYdEEQA8N4MHBM69dczcwJZxSmKNo0Duuv+yzloVOIsVaGZzv9kuIyW7s zKU4gYXJ1rGNwq1cxhJSW9RATloI9spa67+3YfUQxcoS3bdw8rfi+uV1oJmo360qU7I0 hD/HwEtlcW/n6WBnXd3ChcEze7DaZm4Vm7Jlo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726694117; x=1727298917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=92bgkoJTKhlGr3wEpRQCsoCE+0ldIDB3aw9Ggelr094=; b=npEheB1GMRNj9QksmsDZNXdNTODQy+QWu0o8w1WAi6jF2brIli+vmQoAwyexh0oh+9 DcHR47wQgCoRGc5hxjlN+KuYvJlhJ1XNViEnC8wwd/VZc8MUCuorg1Ps9H0G258iRtZC 19zDdOt/cAQcuSESapkE7Lwex5ocTV+ViOmtlyZ+stHNtJphHmFBpM+DItyAwAKKNKgR k67I0Na4NwhnI45TQN1U3GD1JlAHa0/c0WpOEotlc7XM/zCpCpVj9clmBQfzHywTAEFL WbTmkyB9W2AMeqbISDwMa6UnxTHtt533JAS+OlezCHvDyj+ORpbo95A4hcoZ3ft3BWOE FF/Q== X-Gm-Message-State: AOJu0YwAWyIeWrEFwLbHy1H/CdRQF6Le/a45j75vM+HtmXKY7rxxUaB3 qTERy5LmUtRnm69DJ4Wsg7UM1HQPI3rzPwFVTIJY//GT1oYEVhCoII80zXNSUhINAbHOy0/zrRV THGZhLoBKtRJI5KVHz4s22eTr7BBcdHZmC0/OFrlqC2AIQxGdGrWYldwOSc4OKsqO9LB30BS9Cx wdjO6LL99aeIqbrDWW2y+jdaBfZVdIElci/ctehQ== X-Google-Smtp-Source: AGHT+IFJSYvg71QFBmDRaIckOCRWRyb2zOBSCvX/EcR/feszAIY1MR/U52NeIo9oRBneNrDWwUUyNw== X-Received: by 2002:a05:622a:14ce:b0:458:2756:fd8 with SMTP id d75a77b69052e-4599d2b91b5mr260814231cf.40.1726694116879; Wed, 18 Sep 2024 14:15:16 -0700 (PDT) Received: from mobile-dev.lan ([73.172.106.204]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45b178f451dsm1100881cf.75.2024.09.18.14.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 14:15:16 -0700 (PDT) Date: Wed, 18 Sep 2024 17:14:51 -0400 Message-ID: <20240918211510.468854-2-aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240918211510.468854-1-aaron.covrig.us@ieee.org> References: <20240918211510.468854-1-aaron.covrig.us@ieee.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82f; envelope-from=aaron.covrig.us@ieee.org; helo=mail-qt1-x82f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pdf.scm (impressive): Update to 13.2 [inputs]: depends on fixed python-pypandoc from prior commit --- gnu/packages/pdf.scm | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e743d51286..8efff540df 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2024 dan ;;; Copyright © 2023 Benjamin Slade ;;; Copyright © 2024 Artyom V. Poptsov +;;; Copyright © 2024 Aaron Covrig ;;; ;;; This file is part of GNU Guix. ;;; @@ -1171,39 +1172,37 @@ (define-public python-reportlab (define-public impressive (package (name "impressive") - (version "0.13.1") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/impressive/Impressive/" - version "/Impressive-" version ".tar.gz")) - (sha256 - (base32 - "0d1d2jxfl9vmy4swcdz660xd4wx91w1i3n07k522pccapwxig294")))) + ;; (version "0.13.1") + (version "0.13.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/impressive/Impressive/" + version "/Impressive-" version ".tar.gz")) + (sha256 + (base32 + ;; "0d1d2jxfl9vmy4swcdz660xd4wx91w1i3n07k522pccapwxig294")))) + "0g15q67f992prkjndrk75hhd601iypfmkafhdx7hijs2byr26c83")))) (build-system python-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (delete 'build) - (delete 'configure) - (delete 'check) - (replace 'install - (lambda* (#:key inputs #:allow-other-keys) - ;; There's no 'setup.py' so install things manually. - (let* ((bin (string-append #$output "/bin")) - (impressive (string-append bin "/impressive")) - (man1 (string-append #$output "/share/man/man1"))) - (mkdir-p bin) - (copy-file "impressive.py" impressive) - (chmod impressive #o755) - (wrap-program (string-append bin "/impressive") - `("LIBRARY_PATH" ":" prefix ;for ctypes - (,(string-append #$(this-package-input "sdl") - "/lib"))) - `("PATH" ":" prefix ;for pdftoppm - (,(search-input-file inputs "bin/xpdf")))) - (install-file "impressive.1" man1))))))) + #:phases #~(modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key inputs #:allow-other-keys) + ;; There's no 'setup.py' so install things manually. + (let* ((bin (string-append #$output "/bin")) + (impressive (string-append bin "/impressive")) + (man1 (string-append #$output "/share/man/man1"))) + (mkdir-p bin) + (copy-file "impressive.py" impressive) + (chmod impressive #o755) + (wrap-program (string-append bin "/impressive") + `("PATH" ":" prefix ;for pdftoppm + (,(search-input-file inputs "bin/xpdf")))) + (install-file "impressive.1" man1))))))) ;; TODO: Add dependency on pdftk. (inputs (list bash-minimal python-pygame python-pillow sdl xpdf)) (home-page "https://impressive.sourceforge.net")