From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QOK9JNQuH2U3fQAA9RJhRA:P1 (envelope-from ) for ; Thu, 05 Oct 2023 23:47:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QOK9JNQuH2U3fQAA9RJhRA (envelope-from ) for ; Thu, 05 Oct 2023 23:47:00 +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 5C4A141047 for ; Thu, 5 Oct 2023 23:47:00 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Ra3SHLYd; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696542420; 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: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: dkim-signature; bh=DAy0OVSLIulfuEFQ2tz7LxY1Is8DWnAK7tt3ObbtFaE=; b=CRVhWnWM0ENH/NgG9j1rP7OvuRACMBKk0yV5tWe606O+ts75sFhFTiksyrITsvuiYCaHXr owhSHilOZLO9nBjACy0q7+ICqZkVyG220keDpK1ZO4ePOxV9/8s6rbBLO3xPyTp+Ajxr12 OrNep8ydxiM7ngFpL1XG2kLVqi/qAeRdRvndXgFrFyb2qIbT7GafJj6GgQ+Gnho1g3DYOw SdcokNFDizKLhnJyzoV9avZ/VxprNoreZX6z5DvVjSbSRmlm/lM4fLOM/ykB499hepWt8w oZErsdnAFnOXLTIpMxXjrfj6f0bgAY+c/OUtDJWsjfCm7u2ZGTyuq3+eHK9SjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Ra3SHLYd; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696542420; a=rsa-sha256; cv=none; b=mqweLC0uYJANtTEPcMJZ7HaRweEaU5MB8v3cKbBgE94/WaiYyfdvZ9qB6wxWSsZvg1dYG/ MUou0u/QouWs5csSuMLpL7F6toyE7iKKTK31GqvH28HpGS4nsPtS/5k2I1gz2g4eLSUynn swgEiCVZ3rSFKQW8aBtHZXKWSK/gUWFIU5K1sr7wSmoNyKzklVEc+CHhMQMalcKyPlJ8ij tIdMDLhTdRMPEoXC3qY1ehF99BW0WTh2qhCfPmX9LwxgdM13LfFOoVQa/jwvLOLNyipEGV zEPyhk2d+OB2allbFBtueM7zYZIZPgMCN7hTwJdwZqjrTTEXkMKOXC3Jddt8Ng== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoWBB-0005ko-2v; Thu, 05 Oct 2023 17:46:45 -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 1qoWBA-0005kY-7F for guix-patches@gnu.org; Thu, 05 Oct 2023 17:46: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 1qoWB9-0007i5-VI for guix-patches@gnu.org; Thu, 05 Oct 2023 17:46:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoWBS-0002tz-2B for guix-patches@gnu.org; Thu, 05 Oct 2023 17:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 07/61] gnu: docbook-utils: Import patches from debian. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 21:47:02 +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: Bruno Victal Cc: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169654237111070 (code B ref 65479); Thu, 05 Oct 2023 21:47:02 +0000 Received: (at 65479) by debbugs.gnu.org; 5 Oct 2023 21:46:11 +0000 Received: from localhost ([127.0.0.1]:48786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoWAc-0002sT-Og for submit@debbugs.gnu.org; Thu, 05 Oct 2023 17:46:11 -0400 Received: from mail-oa1-x2b.google.com ([2001:4860:4864:20::2b]:59415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoWAa-0002sF-08 for 65479@debbugs.gnu.org; Thu, 05 Oct 2023 17:46:09 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1e1b1b96746so918385fac.2 for <65479@debbugs.gnu.org>; Thu, 05 Oct 2023 14:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696542343; x=1697147143; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=DAy0OVSLIulfuEFQ2tz7LxY1Is8DWnAK7tt3ObbtFaE=; b=Ra3SHLYdVLzbCbC/+ANSa8VKEsxK/4vfMsuDvGbbGz25tcdQQcpU/GF1f9/2ZCOAED m8GMViqH2CEGbOhfxJ1QJrmPM1BK48YX5JvBidYZ3s9z/mSdMs0TJmEnd2h/YDbuZ2EB 86+Wv32tw3qq3Bw2ArRWbR8TZUPTouaBIit8YNtFUTnWlYRti+4jJck3szYpSU/st90L tOfgt8KQKoToXijas3+7XqLA/EiA/6MkbBAOvRlMtW48MA8mlxtlvh1nkTOMEMOl+w73 Pcsbj+m8R79qAkTu+bw8q8pkFk8/r8K/gbnEYkWeoPIC9reLhLxrew+X1390ma05BpOi LL3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696542343; x=1697147143; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DAy0OVSLIulfuEFQ2tz7LxY1Is8DWnAK7tt3ObbtFaE=; b=cHLHjc9WveEYb/pVVr5Gt1NM8sTaBU5K4/+1n3zZoExiHBh6+V9GCTfL5PygGUwCD3 FWAJSACeriNGbGSTLvN2wat2rJNwPkUZ5UJwIkSLGususeLlXfX94Gu35SGmDdpPHqyn JXHlDGK1o6CHX2gj7gh4jIzf2YdOJkF3KA2u/g7qTE2tz1LAtJ0akGEgOrotv5JDkvuU pE8AbmLDaSenIerm8lZMYCR7fPQcGDkqX+kRCaQQZDxM7Bb5QP+mKEeXosUBZZ4sKrtS 2DGCApHr8sXvjWqqTmRIZnJoBJkgVSi2lmznFg0BNHxCCbiqFhQJOr2EYwhE/mQlwHZt 4fjw== X-Gm-Message-State: AOJu0Yyw4Waf/N4QkeBRzo81TUMir7eD5HYyfkjEltSZxzZ+EKeLRZ5W b7Wbb3pMcWyBj74E6eoo8ExahzhoeKQ= X-Google-Smtp-Source: AGHT+IGqWvE5c6Ir4lETYwkCmJGPTX4YUutB5W78SeldoUfZNhz26zxtJuWQ0oWVVaW39OBC9do2dg== X-Received: by 2002:a05:6870:a11b:b0:1d6:5670:fcce with SMTP id m27-20020a056870a11b00b001d65670fccemr7625653oae.51.1696542343072; Thu, 05 Oct 2023 14:45:43 -0700 (PDT) Received: from hurd (dsl-151-116.b2b2c.ca. [66.158.151.116]) by smtp.gmail.com with ESMTPSA id k26-20020a0c971a000000b0065cfb75fe81sm827662qvd.67.2023.10.05.14.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 14:45:42 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <40aa16c4ec5e774fa7ad47a488eb1c89250490b1.1692830149.git.mirai@makinata.eu> (Bruno Victal's message of "Wed, 23 Aug 2023 23:34:59 +0100") References: <40aa16c4ec5e774fa7ad47a488eb1c89250490b1.1692830149.git.mirai@makinata.eu> Date: Thu, 05 Oct 2023 17:45:41 -0400 Message-ID: <874jj4oi9m.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: -5.09 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 5C4A141047 X-Spam-Score: -5.09 X-TUID: gicoR4aUVvRL Hi, Bruno Victal writes: > * gnu/packages/docbook.scm (docbook-utils)[source]: Import patches from debian. > Drop snippet for patching OpenSP and OpenJade. > [arguments]<:phases>: Add 'autoreconf phase. Instead of adding an autoreconf phase, I'd add a 'delete-configure' or 'force-bootstrap' phase :-). > [native-inputs]: Add autoconf, automake and libtool. > * gnu/packages/patches/docbook-utils-documentation-edits.patch: New file. > * gnu/packages/patches/docbook-utils-escape-characters.patch: Ditto. > * gnu/packages/patches/docbook-utils-remove-jade-sp.patch: Ditto. > * gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch: Ditto. > * gnu/packages/patches/docbook-utils-source-date-epoch.patch: Ditto. > * gnu/packages/patches/docbook-utils-use-date-element.patch: Ditto. > * gnu/local.mk: Register them. > --- > gnu/local.mk | 6 + > gnu/packages/docbook.scm | 24 +- > .../docbook-utils-documentation-edits.patch | 100 ++++++++ > .../docbook-utils-escape-characters.patch | 34 +++ > .../docbook-utils-remove-jade-sp.patch | 215 ++++++++++++++++++ > ...book-utils-respect-refentry-for-name.patch | 34 +++ > .../docbook-utils-source-date-epoch.patch | 29 +++ > .../docbook-utils-use-date-element.patch | 61 +++++ > 8 files changed, 496 insertions(+), 7 deletions(-) > create mode 100644 gnu/packages/patches/docbook-utils-documentation-edits.patch > create mode 100644 gnu/packages/patches/docbook-utils-escape-characters.patch > create mode 100644 gnu/packages/patches/docbook-utils-remove-jade-sp.patch > create mode 100644 gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch > create mode 100644 gnu/packages/patches/docbook-utils-source-date-epoch.patch > create mode 100644 gnu/packages/patches/docbook-utils-use-date-element.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index b229b21603..565a1860ea 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1063,6 +1063,12 @@ 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-utils-documentation-edits.patch \ > + %D%/packages/patches/docbook-utils-escape-characters.patch \ > + %D%/packages/patches/docbook-utils-remove-jade-sp.patch \ > + %D%/packages/patches/docbook-utils-respect-refentry-for-name.patch \ > + %D%/packages/patches/docbook-utils-source-date-epoch.patch \ > + %D%/packages/patches/docbook-utils-use-date-element.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 47d3a04479..994aa57f18 100644 > --- a/gnu/packages/docbook.scm > +++ b/gnu/packages/docbook.scm > @@ -773,18 +773,20 @@ (define-public docbook-utils > (sha256 > (base32 > "1scj5vgw1xz872pq54a89blcxqqm11p90yzv8a9mqq57x27apyj8")) > + (patches > + (search-patches "docbook-utils-documentation-edits.patch" > + "docbook-utils-escape-characters.patch" > + "docbook-utils-remove-jade-sp.patch" > + "docbook-utils-respect-refentry-for-name.patch" > + "docbook-utils-use-date-element.patch" > + "docbook-utils-source-date-epoch.patch")) > (modules '((guix build utils))) > (snippet > #~(begin > ;; Patch build system. > - (substitute* (find-files "." "\\.in$") > + (substitute* (find-files "." "\\.((in)|(am))$") Why the nested groups ? Just "\\.(in|am)$" should be sufficient. > ;; Do not hard-code SGML_CATALOG_FILES. > - ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") "") > - ;; Use OpenSP and OpenJade. > - (("\\bjade\\b") > - "openjade") > - (("\\bnsgmls\\b") > - "onsgmls")) > + ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") "")) > > ;; Do not override the SGML_CATALOG_FILES environment > ;; variable. > @@ -805,6 +807,14 @@ (define-public docbook-utils > "CONVERT=") > (("\\[ -x /usr/bin/([^ ]+) \\]" _ command) > (format #f "command -v ~a > /dev/null" command))))))) > + (arguments > + (list > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'autoreconf > + (lambda _ > + (invoke "autoreconf" "-vif")))))) I'd rename the phase to force-rebootstrap and do (delete-file "configure") > + (native-inputs (list autoconf automake libtool)) > (build-system gnu-build-system) > ;; Propagated for convenience. All these tools are used at run time to > ;; provide the complete functionality of the docbook-utils commands. > diff --git a/gnu/packages/patches/docbook-utils-documentation-edits.patch b/gnu/packages/patches/docbook-utils-documentation-edits.patch > new file mode 100644 > index 0000000000..03c0a4abcf > --- /dev/null > +++ b/gnu/packages/patches/docbook-utils-documentation-edits.patch > @@ -0,0 +1,100 @@ Please add some metadata at the top mentioning where this was retrieved from. [...] > diff --git a/gnu/packages/patches/docbook-utils-remove-jade-sp.patch b/gnu/packages/patches/docbook-utils-remove-jade-sp.patch > new file mode 100644 > index 0000000000..8aae51373f > --- /dev/null > +++ b/gnu/packages/patches/docbook-utils-remove-jade-sp.patch > @@ -0,0 +1,215 @@ > +Description: Change dependencies on jade and sp to openjade and opensp > +Author: Neil Roeth > +Last-Update: 2016-07-24 > + > +Edit by Bruno Victal : > + Patch was edited so that it could be applied against the original > + docbook-utils-0.6.14 sources. Please add provenance info. [...] The rest LGTM. -- Thanks, Maxim