From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 YA9XAlmK5mSUiAAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OC5MAlmK5mTfEAAA9RJhRA (envelope-from ) for ; Thu, 24 Aug 2023 00:38:17 +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 84B206A03D for ; Thu, 24 Aug 2023 00:38:16 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830296; a=rsa-sha256; cv=none; b=CT9/DsKW1IIVpKHmR5ORnyNnvutjwDLPpzDbS9pN5J4SsX2/fCWmm/ylit2Ia5ic++bSZA A99mbdo9rkp5jc8uXSLy60wCKHNYSVqa7uQkoQjr0WxNBd5SeGOOYFRWkwXcFmsAPNt6yW PPxhWOOfEs/uw8Zi79lis93nntcIR1Rga6SJL1yYpELebqsuXwX2OeHcfDk7iQCmUjpVmB ySUauGa9RPfCu113qwC+MdFx+jwsYOKyfXJ6GTAPiu4ocl2iP9Fx0KlD4oPbQUzZvPj2Ul IbicBlrnUkWT3IaUOe46aFwTIYXbw4DvnvKz53GTWMMu1NzokmML4Sqnr6FE/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692830296; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=SJ1ZpAjNp5obAHQcMqpYg6UAkW6fsss44lnimzeNJQk=; b=C68pP3o57bJq4v4kVBUNJAwQLCB9A36/qFXJxNoEqswmVe88JfRKUtQJPuDmvifEV5C9iF zEPlPQUFPOau4vpCGOt37/Chke+tvVvCDGV4LaEVcJCWYgcZI3bpDkC+nLpuF9W+9pjSNN TJWBBdmJYMqntCwxpJOaEbUzQRJRMXMMq4VwEiA2BHoMPKTNV1HLtrB3zsq/qUmdftwKn2 1MJvdVYXbLv9BOlD+x3qkDPLobflCypqHjz0e7sOIpU6v4v/ebNq2bFlyH0bp7/MrIzI6g OXy0CB2370LXa0oIeWMjAz1QUTwatE8caBezocmlNDfhFBJEDjj6U+Zk5pCxig== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTR-0007xG-IK; Wed, 23 Aug 2023 18:37:13 -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 1qYwTF-0007mQ-Jx for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:01 -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 1qYwTE-0004vX-Tl for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTI-0004AJ-HS for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 06/61] gnu: docbook: Remove leftovers. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37: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 Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169283018815543 (code B ref 65479); Wed, 23 Aug 2023 22:37:04 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:28 +0000 Received: from localhost ([127.0.0.1]:35340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSg-00042N-R1 for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:27 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:41784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSV-00040i-SN for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:16 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 121F82086C for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:07 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 55EF38009C; Thu, 24 Aug 2023 00:36:07 +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 VFb9uEne33sw; Thu, 24 Aug 2023 00:36:06 +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 3807180092; Thu, 24 Aug 2023 00:36:06 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:34:58 +0100 Message-Id: <65fd1b35abc1b81ae36e4ed52bad3173d71a8f0a.1692830149.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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-Spam-Score: -4.71 X-Migadu-Queue-Id: 84B206A03D X-Migadu-Spam-Score: -4.71 X-TUID: ny+aq+1j6xUw docbook-xsl patches are probably remnants from 1f7d94597f1e78776f854eeca46c03a3aded8466. * gnu/packages/docbook.scm: Remove unused import. * gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: Remove. * gnu/packages/patches/docbook-xsl-support-old-url.patch: Ditto. * gnu/local.mk: Unregister it. * gnu/packages/moreutils.scm (moreutils)[native-inputs]: Drop obsolete comment. --- gnu/local.mk | 2 - gnu/packages/docbook.scm | 1 - gnu/packages/moreutils.scm | 2 +- ...ocbook-xsl-nonrecursive-string-subst.patch | 40 ------------------- .../patches/docbook-xsl-support-old-url.patch | 17 -------- 5 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch delete mode 100644 gnu/packages/patches/docbook-xsl-support-old-url.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6dcacd3d6e..b229b21603 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1063,8 +1063,6 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-fix-signal-processing.patch \ %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ - %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ - %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-opensslv3.patch \ diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 83a5496a0e..47d3a04479 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -47,7 +47,6 @@ (define-module (gnu packages docbook) #:use-module (guix git-download) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) #:use-module (guix build-system python)) ;; The fetch-plan, install-plan and phases for docbook-xml tend to vary diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm index d219c78d4f..d7f4a8522a 100644 --- a/gnu/packages/moreutils.scm +++ b/gnu/packages/moreutils.scm @@ -71,7 +71,7 @@ (define-public moreutils ;; For building the manual pages. (native-inputs (list docbook-xml-4.4 - docbook-xsl ;without -next, man pages are corrupted + docbook-xsl libxml2 libxslt)) (home-page "https://joeyh.name/code/moreutils/") diff --git a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch b/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch deleted file mode 100644 index fed4b76429..0000000000 --- a/gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch +++ /dev/null @@ -1,40 +0,0 @@ -Use a non-recursive replace function when the parser supports it. - -https://bugs.gnu.org/29782 -https://bugzilla.samba.org/show_bug.cgi?id=9515 -https://bugzilla.gnome.org/show_bug.cgi?id=736077 (for xsltproc) - -Patch copied from Debian: -https://salsa.debian.org/debian/docbook-xsl/-/blob/master/debian/patches/765567_non-recursive_string_subst.patch - -Description: use EXSLT "replace" function when available - A recursive implementation of string.subst is problematic, - long strings with many matches will cause stack overflows. -Author: Peter De Wachter -Bug-Debian: https://bugs.debian.org/750593 - ---- a/lib/lib.xsl -+++ b/lib/lib.xsl -@@ -6,7 +6,11 @@ - - This module implements DTD-independent functions - -- ******************************************************************** --> -+ ******************************************************************** --> -+ - - - -@@ -52,6 +56,9 @@ - - - -+ -+ -+ - - - diff --git a/gnu/packages/patches/docbook-xsl-support-old-url.patch b/gnu/packages/patches/docbook-xsl-support-old-url.patch deleted file mode 100644 index 5b7dda458f..0000000000 --- a/gnu/packages/patches/docbook-xsl-support-old-url.patch +++ /dev/null @@ -1,17 +0,0 @@ -Docbook 1.79.2 makes very few changes apart from changing the canonical URL -to cdn.docbook.org. This patch adds support for the previous URL to avoid -breaking packages that still use that. - -Adapted from Debian: -https://salsa.debian.org/debian/docbook-xsl/-/blob/master/debian/patches/0005-catalog.xml-Compatibility-with-1.79.1-or-earlier.patch - ---- a/catalog.xml -+++ b/catalog.xml -@@ -5,4 +5,7 @@ - - - -+ -+ -+ - -- 2.40.1