From patchwork Sat Sep 23 14:20:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54235 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 A8D3927BBE2; Sat, 23 Sep 2023 16:34:06 +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.9 required=5.0 tests=BAYES_00,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 907B127BBEB for ; Sat, 23 Sep 2023 16:34:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk4dp-0005Hz-BH; Sat, 23 Sep 2023 11:33:57 -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 1qk4dl-00058Y-J0 for guix-patches@gnu.org; Sat, 23 Sep 2023 11:33:54 -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 1qk4dl-0001Vs-AG for guix-patches@gnu.org; Sat, 23 Sep 2023 11:33:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4dw-0004PC-Gb; Sat, 23 Sep 2023 11:34:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 62/62] gnu: Remove docbook-xsl-1.79.1. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:34:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169548322216856 (code B ref 65479); Sat, 23 Sep 2023 15:34:04 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:33:42 +0000 Received: from localhost ([127.0.0.1]:40456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4da-0004Nn-1H for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:33:42 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:43602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4dD-0004Me-Ta for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:33:20 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id F305F207FC for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6F9F280092; Sat, 23 Sep 2023 17:31:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id CrMNgeMbcQog; Sat, 23 Sep 2023 17:31:54 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id E13CD80060; Sat, 23 Sep 2023 17:31:53 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:37 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docbook.scm (docbook-xsl-1.79.1): Remove variable. * gnu/packages/gnome.scm (colord)[native-inputs]: Replace with docbook-xsl. --- gnu/packages/docbook.scm | 86 ---------------------------------------- gnu/packages/gnome.scm | 2 +- 2 files changed, 1 insertion(+), 87 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index e3de6bc00a..8edd30d063 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -502,92 +502,6 @@ (define-public docbook-xsl "This package provides XSL style sheets for DocBook.") (license (license:x11-style "" "See 'COPYING' file."))))) -(define-public docbook-xsl-1.79.1 - (package - (name "docbook-xsl") - (version "1.79.1") - (source (origin - (method url-fetch) - ;; At the time, the non namespaced version was still the - ;; default; our latest docbook-xsl is namespaced, so for - ;; consistency preserves this property for older versions too. - (uri (string-append "mirror://sourceforge/docbook/" - name "-ns/" version "/" - name "-ns-" version ".tar.bz2")) - (sha256 - (base32 - "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin")) - (modules '((guix build utils))) - ;; Bundled binary files. - (snippet - #~(delete-file-recursively "tools")))) - (build-system copy-build-system) - (outputs '("out" "doc")) - (arguments - (list - #:install-plan - (let ((target (format #f "xml/xsl/~a-~a/" name version)) - (select-rx '("\\.xml$" "\\.xsl$" "\\.dtd$" "\\.ent$"))) - #~`(#$@(map - (lambda (directory) - ;; XXX: When filters are used, the source basename - ;; isn't kept under the target path, append it again. - (let ((target* (string-append target directory))) - (list directory target* #:include-regexp select-rx))) - (list "assembly" "common" "eclipse" "epub" "epub3" "fo" - "highlighting" "html" "htmlhelp" "javahelp" "lib" - "manpages" "params" "profiling" "roundtrip" - "template" "website" - "xhtml" "xhtml-1_1" "xhtml5")) - ("catalog.xml" #$target) - ("VERSION.xsl" #$target))) - #:phases - #~(let ((dest-path (format #f "~a/xml/xsl/~a-~a" - #$output #$name #$version))) - (modify-phases %standard-phases - (add-before 'install 'patch-catalog-xml - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmlcatalog (search-input-file inputs - "/bin/xmlcatalog")) - (catalog-files (find-files "." "catalog\\.xml$")) - (store-uri (string-append "file://" dest-path "/"))) - (for-each - (lambda (catalog) - (for-each - (lambda (type) - ;; Patch /current/ references to point to /gnu/store/…. - (invoke xmlcatalog "--noout" - "--add" type - "http://docbook.sourceforge.net/release/xsl-ns/current/" - store-uri - catalog) - ;; Patch versioned references to point to /gnu/store/…. - (invoke xmlcatalog "--noout" - "--add" type - (format - #f "http://docbook.sourceforge.net/release/xsl-ns/~a/" - #$version) - store-uri - catalog)) - (list "rewriteSystem" "rewriteURI"))) - catalog-files)))) - ;; XXX: The copy-build-system doesn't seem to allow installing to a - ;; different output. - (add-after 'install 'install-doc - (lambda _ - (let ((doc (format #f "~a/share/doc/~a-~a" - #$output:doc #$name #$version))) - (install-file "NEWS" doc) - (install-file "RELEASE-NOTES.html" doc) - (copy-recursively "slides" doc) - (copy-recursively "webhelp" doc)))))))) - (native-inputs (list libxml2)) - (home-page "https://docbook.org") - (synopsis "DocBook XSL namespaced style sheets for document authoring") - (description "This package provides the @emph{namespaced} XSL style sheets -for DocBook.") - (license (license:x11-style "" "See 'COPYING' file.")))) - (define-public docbook-dsssl (package (name "docbook-dsssl") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aeb5544fe0..06495a48f8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5631,7 +5631,7 @@ (define-public colord (native-inputs (modify-inputs (package-native-inputs colord-minimal) (append bash-completion - docbook-xsl-1.79.1 + docbook-xsl gtk-doc/stable libxslt sane-backends