From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GF9zM1tuJGXweAEAauVa8A:P1 (envelope-from ) for ; Mon, 09 Oct 2023 23:19:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GF9zM1tuJGXweAEAauVa8A (envelope-from ) for ; Mon, 09 Oct 2023 23:19:23 +0200 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 9025D510C5 for ; Mon, 9 Oct 2023 23:19:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696886363; 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; bh=sXMCA9iU0fZF0WRCJAx0bgZGO/1KPooTkteRJKoY1WU=; b=FxumBbsqBZsDyHQoBg+gNOvl6rfSfz32R2shY0v0S2KSVHAH51uz4YmxNKIGAwICvxvrXK 9DBCAHY/iB0y4iA9v5WGo4J5x+YbZnkTHZPOx2GFLxWHkQREpQKNMr1ThdCmeFDGwsUsCu 1I4ItZGyw/tCP1ym0OQknwVc42QvFiDUPqe0ebQ0BfjUk7CEBUtUuAumnYp2c8LCqhCYUs +OGCC4ePqU/pc0x6KviBMe1IoKFi1myze263n1atgSPJVU0/cwbHz8LSGkEFhzutoEuqfq RECiJiZYEUpiUyfE1ExT59TRLD1RqQd0VLnmBL7zqO7HGiR/rJ0P1Ega+maE3A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696886363; a=rsa-sha256; cv=none; b=QYkNjuj8J7eExmUqY+GHI/cBSvkGVfjlDJa4L54le8JKld5YZFrSiZdtfJxrRgu5AbRinr +6Ejp936dTYp4tG8B7Ln2YZ8IylILr08Wf80gfUYr/7vT+1Ug4jnD1It0Lj0ndnQqvBKO/ zz+82ECdzHHSvKwf4OHXbZqO05Wd2UCOx0TPdCei1dQksQSTBXMOSoTlF0ouEzVYp4sFDm WUkYJ/Usf+87AEYk7AHBWK9taneMD5G7Xh2jfYzLWrc5YsLYMpRTCejCFokoSyhs/o0Rxq V80eRNCaA+QgvgUx1UF+Q2a93AjkHunkEGMd5I3b1zUVxPl37RZVR00UwFQeWw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxeK-0007WD-TV; Mon, 09 Oct 2023 17:18:49 -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 1qpxeF-0007TP-KO for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:44 -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 1qpxeF-0006xf-8z for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpxea-0007eA-14; Mon, 09 Oct 2023 17:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 63/63] 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: Mon, 09 Oct 2023 21:19:03 +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.169688629429189 (code B ref 65479); Mon, 09 Oct 2023 21:19:03 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:14 +0000 Received: from localhost ([127.0.0.1]:33521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxdl-0007aa-N5 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:14 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:54486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxdg-0007a6-9t for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:09 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id AA18920495 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 1F2C980099; Mon, 9 Oct 2023 23:17:46 +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 GbpjZ4Rk1CDm; Mon, 9 Oct 2023 23:17:45 +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 134648009D; Mon, 9 Oct 2023 23:17:44 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:51 +0100 Message-ID: <24988295b7b65b4de4e9a8cc378ad13cb247ac91.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -3.71 X-Spam-Score: -3.71 X-Migadu-Queue-Id: 9025D510C5 X-TUID: dxKr8yCQXDtF * 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 e2f00bf146..fcdb0e9b8b 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 9e51a7e7aa..acb6f87a50 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 -- 2.41.0