Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-sgml-utils/files/
Date: Thu, 07 Apr 2022 02:19:19
Message-Id: 1649297929.6b17db6bcc1017685e69ac46114f02280f7457a9.sam@gentoo
1 commit: 6b17db6bcc1017685e69ac46114f02280f7457a9
2 Author: Garrett Holmstrom <gholms <AT> devzero <DOT> com>
3 AuthorDate: Wed Apr 6 18:15:41 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 7 02:18:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b17db6b
7
8 app-text/docbook-sgml-utils: Fix prefix patch
9
10 `docbook-utils-0.6.14-prefix.patch` doesn't work because
11 we're applying it with `-p1` and its file names lack top-level
12 directories, so in this patch we add some to fix that.
13
14 Signed-off-by: Garrett Holmstrom <gholms <AT> devzero.com>
15 Closes: https://github.com/gentoo/gentoo/pull/24933
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 .../files/docbook-utils-0.6.14-prefix.patch | 20 ++++++++++----------
19 1 file changed, 10 insertions(+), 10 deletions(-)
20
21 diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
22 index 29906c2046ad..3aa8d0ae3d1d 100644
23 --- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
24 +++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
25 @@ -1,5 +1,5 @@
26 ---- doc/HTML/Makefile.am~ 2007-10-08 04:13:04 +0200
27 -+++ doc/HTML/Makefile.am 2007-10-08 04:13:34 +0200
28 +--- docbook-utils-0.6.14/doc/HTML/Makefile.am~ 2007-10-08 04:13:04 +0200
29 ++++ docbook-utils-0.6.14/doc/HTML/Makefile.am 2007-10-08 04:13:34 +0200
30 @@ -23,7 +23,7 @@
31 $(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \
32 $(top_srcdir)/doc/refentry/frontend-spec.sgml \
33 @@ -9,8 +9,8 @@
34 SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
35 jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
36 -V '%use-id-as-filename%' $<
37 ---- doc/man/Makefile.am~ 2007-10-08 04:14:16 +0200
38 -+++ doc/man/Makefile.am 2007-10-08 04:14:29 +0200
39 +--- docbook-utils-0.6.14/doc/man/Makefile.am~ 2007-10-08 04:14:16 +0200
40 ++++ docbook-utils-0.6.14/doc/man/Makefile.am 2007-10-08 04:14:29 +0200
41 @@ -10,7 +10,7 @@
42
43 $(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \
44 @@ -20,8 +20,8 @@
45 SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
46 nsgmls $< | \
47 sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
48 ---- bin/jw.in~ 2007-10-08 04:27:18 +0200
49 -+++ bin/jw.in 2007-10-08 04:28:40 +0200
50 +--- docbook-utils-0.6.14/bin/jw.in~ 2007-10-08 04:27:18 +0200
51 ++++ docbook-utils-0.6.14/bin/jw.in 2007-10-08 04:28:40 +0200
52 @@ -63,7 +63,7 @@
53 then
54 SGML_CONF=`sgmlwhich`
55 @@ -40,8 +40,8 @@
56 if [ -f "$SGML_CONF" ]
57 then
58 RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
59 ---- backends/txt~ 2007-10-08 04:59:59 +0200
60 -+++ backends/txt 2007-10-08 05:00:52 +0200
61 +--- docbook-utils-0.6.14/backends/txt~ 2007-10-08 04:59:59 +0200
62 ++++ docbook-utils-0.6.14/backends/txt 2007-10-08 05:00:52 +0200
63 @@ -2,21 +2,21 @@
64 # Send any comments to Eric Bischoff <eric@×××××××.de>
65 # This program is under GPL license. See LICENSE file for details.
66 @@ -72,8 +72,8 @@
67 ARGS="-dump"
68 else
69 echo >&2 "No way to convert HTML to text found."
70 ---- configure.in~ 2004-02-11 15:14:15 +0100
71 -+++ configure.in 2007-10-14 10:40:51 +0200
72 +--- docbook-utils-0.6.14/configure.in~ 2004-02-11 15:14:15 +0100
73 ++++ docbook-utils-0.6.14/configure.in 2007-10-14 10:40:51 +0200
74 @@ -20,11 +20,11 @@
75 AC_SUBST(docdir)