From patchwork Wed Jun 26 19:24:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 2651 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 F19E927BBE9; Wed, 26 Jun 2024 20:26:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 7DDDC27BBE2 for ; Wed, 26 Jun 2024 20:26:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMYHL-00032I-2L; Wed, 26 Jun 2024 15:26:03 -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 1sMYHI-00031x-FW for guix-patches@gnu.org; Wed, 26 Jun 2024 15:26:00 -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 1sMYHI-0007LV-5Q for guix-patches@gnu.org; Wed, 26 Jun 2024 15:26:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMYHK-000782-Ip for guix-patches@gnu.org; Wed, 26 Jun 2024 15:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71787] [PATCH 00/12] Update and unbundle ghostscript and mupdf Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 19:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71787@debbugs.gnu.org Cc: David Elsing , skyvine@protonmail.com X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171942993427367 (code B ref -1); Wed, 26 Jun 2024 19:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2024 19:25:34 +0000 Received: from localhost ([127.0.0.1]:40296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMYGs-00077K-5G for submit@debbugs.gnu.org; Wed, 26 Jun 2024 15:25:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:56502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMYGq-00077C-47 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 15:25:32 -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 1sMYGn-0002lA-Ah for guix-patches@gnu.org; Wed, 26 Jun 2024 15:25:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMYGl-0007FZ-5w for guix-patches@gnu.org; Wed, 26 Jun 2024 15:25:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9D448240027 for ; Wed, 26 Jun 2024 21:25:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1719429923; bh=Cz/I5FnDTVx8D6hg050Ub4cSJlKZ3q1ScdpLa5J9sew=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=rPg7k8Ig2c//lbh51CfxPugkNT0n9P18mqnoGvCjZA4oSBrNh9uID7FuPYcN2CVmk Xmx8Sf+Lvg4TE7Cn60X+yljlrlsnmzoQi5IYGX5wGNImcTv126rm/oMWmyE0kVnFU4 7aNSPsCIcnnpKc+9p3nfQ6bC791cIh6meOsxAzFTWhOXirGlNlylMVa+GBURvfmxzq aYBm+AkGv52w3HIkfK+15s78tFzCPtU2uVBpK/a2+SmOkrsT507MwOHrHerhBse1DX BOfFUzAVdRpWV9SFgLfPbv0W6wt7FNH2Z1t2eljWvUG6Kql3LHUnad93pAFyeYM7fi 586rLHkXikRiw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4W8Wr26HGdz9rxD; Wed, 26 Jun 2024 21:25:22 +0200 (CEST) From: David Elsing Date: Wed, 26 Jun 2024 19:24:48 +0000 Message-ID: <20240626192505.12401-1-david.elsing@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=david.elsing@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , 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 Hello, this patch series unbundles the remaining dependencies of ghostscript and mupdf and updates them to the latest version. I also switched the sources of ghostscript and mupdf to the Git repository, as the tarball contains some autogenerated files and (different) bundled dependencies. For the licenses of the ghostscript source files, the Debian package [1] has a very detailed list. As the tesseract package has many dependencies (including a circular dependency with ghostscript) and depends on the very large tesseract-ocr-tessdata-fast package, I decided to disable tesseract for the main packages and make package variants instead. Previously, the ghostscript package was modified to omit non-reproducible metadata when the GS_GENERATE_UUIDS environment variable was set to "0" or "no". In the meantime, suitable options have been added upstream and I made a patch to enable them depending on GS_GENERATE_UUIDS. Building the ghostscript documentation transitively depends on ghostscript itself. Therefore, I made a separate package (also for the missing Python dependencies). [1] https://packages.debian.org/en/sid/ghostscript David Elsing (12): gnu: Add lcms2mt. gnu: Add memento. gnu: Add extract. gnu: ijs: Remove unneeded files and build shared library. gnu: ghostscript: Unbundle dependencies and remove non-free parts. gnu: Add ghostscript/tesseract. gnu: mupdf: Update to 1.24.4 and unbundle remaining dependencies. gnu: Add mupdf/tesseract. gnu: Add python-pymupdf. gnu: Add python-svglib. gnu: Add python-rst2pdf. gnu: Add ghostscript-documentation. gnu/local.mk | 8 +- gnu/packages/c.scm | 41 ++ gnu/packages/ghostscript.scm | 359 ++++++++++++++---- .../patches/extract-shared-library.patch | 59 +++ .../ghostscript-CVE-2023-36664-fixup.patch | 56 --- .../patches/ghostscript-CVE-2023-36664.patch | 142 ------- .../patches/ghostscript-leptonica-hurd.patch | 78 ---- .../ghostscript-no-header-creationdate.patch | 46 --- .../patches/ghostscript-no-header-id.patch | 57 --- .../patches/ghostscript-no-header-uuid.patch | 49 --- .../patches/ghostscript-reproducibility.patch | 26 ++ gnu/packages/pdf.scm | 141 +++++-- gnu/packages/python-xyz.scm | 143 +++++++ 13 files changed, 651 insertions(+), 554 deletions(-) create mode 100644 gnu/packages/patches/extract-shared-library.patch delete mode 100644 gnu/packages/patches/ghostscript-CVE-2023-36664-fixup.patch delete mode 100644 gnu/packages/patches/ghostscript-CVE-2023-36664.patch delete mode 100644 gnu/packages/patches/ghostscript-leptonica-hurd.patch delete mode 100644 gnu/packages/patches/ghostscript-no-header-creationdate.patch delete mode 100644 gnu/packages/patches/ghostscript-no-header-id.patch delete mode 100644 gnu/packages/patches/ghostscript-no-header-uuid.patch create mode 100644 gnu/packages/patches/ghostscript-reproducibility.patch