Accepting request 1107996 from home:ateixeira:branches:M17N
- Update to 1.23.0: * Too many changes, see NEWS file for details. - Refreshed patches: * 0002-documentation-for-the-locale-keyword.patch * 0004-don-t-use-usr-bin-env-in-shebang.patch * groff-1.20.1-deunicode.patch * groff-1.20.1-nroff-empty-LANGUAGE.patch * groff-1.21-CVE-2009-5081.patch * groff-force-locale-usage.patch - Drop sort-perl-hash-keys.patch (upstreamed) - Drop doc-volume-operating-system and doc-default-operating-system changes (doesn't default to BSD anymore) - Configure flag --with-appresdir has been renamed to --with-appdefdir - Update file list with files that were removed from the package OBS-URL: https://build.opensuse.org/request/show/1107996 OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=92
This commit is contained in:
parent
09ac97e932
commit
a7c3e60b5e
@ -8,22 +8,18 @@ Subject: [PATCH] documentation for the locale keyword
|
||||
man/groff_font.5.man | 8 +++++++-
|
||||
2 files changed, 34 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/doc/groff.texi b/doc/groff.texi
|
||||
index 7b09e0f..1cff7b4 100644
|
||||
Index: b/doc/groff.texi
|
||||
===================================================================
|
||||
--- a/doc/groff.texi
|
||||
+++ b/doc/groff.texi
|
||||
@@ -16530,7 +16530,7 @@ types @code{A0}-@code{A7}, @code{B0}-@code{B7}, @code{C0}-@code{C7},
|
||||
significant for @var{string} if it holds predefined paper types.
|
||||
Alternatively, @var{string} can be a file name (e.g.@:
|
||||
@file{/etc/papersize}); if the file can be opened, @code{groff} reads
|
||||
-the first line and tests for the above paper sizes. Finally,
|
||||
+the first line and tests for the above paper sizes. Or,
|
||||
@var{string} can be a custom paper size in the format
|
||||
@code{@var{length},@var{width}} (no spaces before and after the comma).
|
||||
Both @var{length} and @var{width} must have a unit appended; valid
|
||||
@@ -16540,6 +16540,32 @@ which starts with a digit is always treated as a custom paper format.
|
||||
@code{papersize} sets both the vertical and horizontal dimension of the
|
||||
output medium.
|
||||
@@ -18404,10 +18404,36 @@ for points, and @samp{P} for picas. Exa
|
||||
argument that starts with a digit is always treated as a custom paper
|
||||
format.
|
||||
|
||||
-Finally, the argument can be a file name (e.g., @file{/etc/papersize});
|
||||
+Or, the argument can be a file name (e.g., @file{/etc/papersize});
|
||||
if the file can be opened, the first line is read and a match attempted
|
||||
against each of the other forms. No comment syntax is supported.
|
||||
|
||||
+Finally, @var{string} can be a keyword @code{locale}. In this case groff will
|
||||
+determine the default paper size from the country code of @code{LC_PAPER}. For
|
||||
@ -51,25 +47,25 @@ index 7b09e0f..1cff7b4 100644
|
||||
+@end group
|
||||
+@end example
|
||||
+
|
||||
More than one argument can be specified; @code{groff} scans from left to
|
||||
right and uses the first valid paper specification.
|
||||
More than one argument can be specified;
|
||||
each is scanned in turn and the first valid paper specification used.
|
||||
|
||||
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
|
||||
index 64bd212..29a7136 100644
|
||||
Index: b/man/groff_font.5.man
|
||||
===================================================================
|
||||
--- a/man/groff_font.5.man
|
||||
+++ b/man/groff_font.5.man
|
||||
@@ -150,7 +150,7 @@ can be a file name (e.g.\& `/etc/papersize'); if the file can be opened,
|
||||
.B groff
|
||||
reads the first line and tests for the above paper sizes.
|
||||
@@ -286,7 +286,7 @@ format.
|
||||
.
|
||||
.
|
||||
.IP
|
||||
-Finally,
|
||||
+or,
|
||||
.I string
|
||||
can be a custom paper size in the format
|
||||
.IB length , width
|
||||
@@ -172,7 +172,13 @@ format.
|
||||
.B papersize
|
||||
sets both the vertical and horizontal dimension of the output medium.
|
||||
+Or,
|
||||
the argument can be a file name
|
||||
(e.g.,
|
||||
.IR /etc/papersize );
|
||||
@@ -296,7 +296,13 @@ the first line is read and a match attem
|
||||
No comment syntax is supported.
|
||||
.
|
||||
.
|
||||
+Finally
|
||||
+.I string
|
||||
@ -79,8 +75,5 @@ index 64bd212..29a7136 100644
|
||||
.IP
|
||||
+.
|
||||
More than one argument can be specified;
|
||||
.B groff
|
||||
scans from left to right and uses the first valid paper specification.
|
||||
--
|
||||
1.7.6.3
|
||||
|
||||
each is scanned in turn and the first valid paper specification used.
|
||||
.
|
||||
|
@ -14,140 +14,60 @@ Resolves: #987069
|
||||
src/roff/grog/grog.pl | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: groff-1.22.4/contrib/chem/chem.pl
|
||||
Index: b/contrib/chem/chem.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/chem/chem.pl
|
||||
+++ groff-1.22.4/contrib/chem/chem.pl
|
||||
--- a/contrib/chem/chem.pl
|
||||
+++ b/contrib/chem/chem.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# chem - a groff preprocessor for producing chemical structure diagrams
|
||||
|
||||
Index: groff-1.22.4/contrib/groffer/groffer.pl
|
||||
Index: b/contrib/glilypond/glilypond.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/groffer.pl
|
||||
+++ groff-1.22.4/contrib/groffer/groffer.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# groffer - display groff files
|
||||
|
||||
Index: groff-1.22.4/contrib/groffer/roff2.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/roff2.pl
|
||||
+++ groff-1.22.4/contrib/groffer/roff2.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# roff2* - transform roff files into other formats
|
||||
|
||||
Index: groff-1.22.4/src/roff/grog/grog.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/src/roff/grog/grog.pl
|
||||
+++ groff-1.22.4/src/roff/grog/grog.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
# grog - guess options for groff command
|
||||
# Inspired by doctype script in Kernighan & Pike, Unix Programming
|
||||
# Environment, pp 306-8.
|
||||
Index: groff-1.22.4/contrib/glilypond/glilypond.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/glilypond/glilypond.pl
|
||||
+++ groff-1.22.4/contrib/glilypond/glilypond.pl
|
||||
--- a/contrib/glilypond/glilypond.pl
|
||||
+++ b/contrib/glilypond/glilypond.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
package main;
|
||||
|
||||
Index: groff-1.22.4/contrib/gperl/gperl.pl
|
||||
Index: b/contrib/gperl/gperl.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/gperl/gperl.pl
|
||||
+++ groff-1.22.4/contrib/gperl/gperl.pl
|
||||
--- a/contrib/gperl/gperl.pl
|
||||
+++ b/contrib/gperl/gperl.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# gperl - add Perl part to groff files, this is the preprocessor for that
|
||||
|
||||
Index: groff-1.22.4/contrib/gpinyin/gpinyin.pl
|
||||
Index: b/contrib/gpinyin/gpinyin.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/gpinyin/gpinyin.pl
|
||||
+++ groff-1.22.4/contrib/gpinyin/gpinyin.pl
|
||||
--- a/contrib/gpinyin/gpinyin.pl
|
||||
+++ b/contrib/gpinyin/gpinyin.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# gpinyin - European-like Chinese writing 'pinyin' into 'groff'
|
||||
|
||||
Index: groff-1.22.4/contrib/gpinyin/subs.pl
|
||||
Index: b/mdate.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/gpinyin/subs.pl
|
||||
+++ groff-1.22.4/contrib/gpinyin/subs.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# gpinyin - European-like Chinese writing 'pinyin' into 'groff'
|
||||
|
||||
Index: groff-1.22.4/contrib/groffer/main_subs.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/main_subs.pl
|
||||
+++ groff-1.22.4/contrib/groffer/main_subs.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# groffer - display groff files
|
||||
|
||||
Index: groff-1.22.4/contrib/groffer/man.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/man.pl
|
||||
+++ groff-1.22.4/contrib/groffer/man.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# groffer - display groff files
|
||||
|
||||
Index: groff-1.22.4/contrib/groffer/subs.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/subs.pl
|
||||
+++ groff-1.22.4/contrib/groffer/subs.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
||||
# groffer - display groff files
|
||||
|
||||
Index: groff-1.22.4/mdate.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/mdate.pl
|
||||
+++ groff-1.22.4/mdate.pl
|
||||
--- a/mdate.pl
|
||||
+++ b/mdate.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
#
|
||||
# Copyright (C) 1991-2018 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
||||
#
|
||||
Index: groff-1.22.4/src/roff/grog/subs.pl
|
||||
Index: b/tmac/hyphenex.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/src/roff/grog/subs.pl
|
||||
+++ groff-1.22.4/src/roff/grog/subs.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
# grog - guess options for groff command
|
||||
# Inspired by doctype script in Kernighan & Pike, Unix Programming
|
||||
# Environment, pp 306-8.
|
||||
Index: groff-1.22.4/tmac/hyphenex.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/tmac/hyphenex.pl
|
||||
+++ groff-1.22.4/tmac/hyphenex.pl
|
||||
--- a/tmac/hyphenex.pl
|
||||
+++ b/tmac/hyphenex.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env perl
|
||||
+#! /usr/bin/perl
|
||||
|
@ -1,17 +1,16 @@
|
||||
Index: groff-1.22.4/tmac/tty.tmac
|
||||
Index: b/tmac/tty.tmac
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/tmac/tty.tmac
|
||||
+++ groff-1.22.4/tmac/tty.tmac
|
||||
@@ -68,8 +68,11 @@
|
||||
.fchar \[.j] j
|
||||
.fchar \[bq] ,
|
||||
--- a/tmac/tty.tmac
|
||||
+++ b/tmac/tty.tmac
|
||||
@@ -70,6 +70,11 @@
|
||||
.fchar \[radicalex] \[rn]
|
||||
.fchar \[sqrtex] \[rn]
|
||||
.
|
||||
-.if '\*[.T]'utf8' \
|
||||
+.if '\*[.T]'utf8' \{\
|
||||
. mso unicode.tmac
|
||||
+.\" use ascii hyphenation characters - bnc#68385
|
||||
+. shc -
|
||||
+.\}
|
||||
.
|
||||
+.
|
||||
.\" color definitions
|
||||
.defcolor black rgb #000000
|
||||
.defcolor red rgb #ff0000
|
||||
|
@ -1,11 +1,11 @@
|
||||
Index: groff-1.20.1/src/roff/nroff/nroff.sh
|
||||
Index: b/src/roff/nroff/nroff.sh
|
||||
===================================================================
|
||||
--- groff-1.20.1.orig/src/roff/nroff/nroff.sh 2010-08-23 15:04:18.000000000 +0200
|
||||
+++ groff-1.20.1/src/roff/nroff/nroff.sh 2010-08-23 15:46:28.313156532 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
IBM-1047)
|
||||
Tloc=cp1047 ;;
|
||||
--- a/src/roff/nroff/nroff.sh
|
||||
+++ b/src/roff/nroff/nroff.sh
|
||||
@@ -131,7 +131,7 @@ then
|
||||
*)
|
||||
# Some old shells don't support ${FOO:-bar} expansion syntax. We
|
||||
# should switch to it when it is safe to abandon support for them.
|
||||
- case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
|
||||
+ case "${LC_ALL:-${LC_CTYPE:-${LANG}}}" in
|
||||
*.UTF-8)
|
||||
|
@ -1,46 +1,21 @@
|
||||
Index: groff-1.22.4/contrib/pdfmark/pdfroff.1.man
|
||||
Index: b/contrib/pdfmark/pdfroff.1.man
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/pdfmark/pdfroff.1.man
|
||||
+++ groff-1.22.4/contrib/pdfmark/pdfroff.1.man
|
||||
@@ -540,7 +540,7 @@ gs \-dBATCH \-dQUIET \-dNOPAUSE \-dSAFER
|
||||
--- a/contrib/pdfmark/pdfroff.1.man
|
||||
+++ b/contrib/pdfmark/pdfroff.1.man
|
||||
@@ -619,7 +619,7 @@ gs \-dBATCH \-dQUIET \-dNOPAUSE \-dSAFER
|
||||
.I GROFF_TMPDIR
|
||||
Identifies the directory in which
|
||||
.B pdfroff
|
||||
.I pdfroff
|
||||
-should create temporary files.
|
||||
+should create a subdirectory for its temporary files.
|
||||
.
|
||||
If
|
||||
.I \%GROFF_TMPDIR
|
||||
@@ -553,7 +553,8 @@ and
|
||||
.I TEMP
|
||||
are considered in turn, as possible temporary file repositories.
|
||||
If none of these are set, then temporary files are created
|
||||
-in the current directory.
|
||||
+in a subdirectory of
|
||||
+.BR /tmp .
|
||||
.
|
||||
.TP
|
||||
.I GROFF_GHOSTSCRIPT_INTERPRETER
|
||||
Index: groff-1.22.4/doc/fixinfo.sh
|
||||
Index: b/doc/groff.texi
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/doc/fixinfo.sh
|
||||
+++ groff-1.22.4/doc/fixinfo.sh
|
||||
@@ -24,7 +24,9 @@
|
||||
#
|
||||
# 09-2014: no more problem with texinfo 5.0 or higher
|
||||
#
|
||||
-t=${TMPDIR-.}/gro$$.tmp
|
||||
+t="`mktemp -t groff-fixinfo.XXXXXXXXXX`" || exit
|
||||
+trap 'rm -f -- "$t"' EXIT
|
||||
+trap 'trap - EXIT; rm -f -- "$t"; exit 1' HUP INT QUIT TERM
|
||||
|
||||
cat $1 | sed '
|
||||
1 {
|
||||
Index: groff-1.22.4/doc/groff.texi
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/doc/groff.texi
|
||||
+++ groff-1.22.4/doc/groff.texi
|
||||
@@ -13857,9 +13857,9 @@ into a document:
|
||||
--- a/doc/groff.texi
|
||||
+++ b/doc/groff.texi
|
||||
@@ -16005,9 +16005,9 @@ The following code fragment introduces t
|
||||
@pindex perl
|
||||
@Example
|
||||
.sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\
|
||||
@ -53,10 +28,10 @@ Index: groff-1.22.4/doc/groff.texi
|
||||
\nH:\nM:\nS
|
||||
@endExample
|
||||
|
||||
Index: groff-1.22.4/gendef.sh
|
||||
Index: b/gendef.sh
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/gendef.sh
|
||||
+++ groff-1.22.4/gendef.sh
|
||||
--- a/gendef.sh
|
||||
+++ b/gendef.sh
|
||||
@@ -33,11 +33,9 @@ do
|
||||
#define $def"
|
||||
done
|
||||
@ -81,11 +56,11 @@ Index: groff-1.22.4/gendef.sh
|
||||
exit 0
|
||||
|
||||
# eof
|
||||
Index: groff-1.22.4/src/roff/groff/pipeline.c
|
||||
Index: b/src/roff/groff/pipeline.c
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/src/roff/groff/pipeline.c
|
||||
+++ groff-1.22.4/src/roff/groff/pipeline.c
|
||||
@@ -379,6 +379,7 @@ int run_pipeline(int ncommands, char ***
|
||||
--- a/src/roff/groff/pipeline.c
|
||||
+++ b/src/roff/groff/pipeline.c
|
||||
@@ -378,6 +378,7 @@ int run_pipeline(int ncommands, char ***
|
||||
/* Don't use 'tmpnam' here: Microsoft's implementation yields unusable
|
||||
file names if current directory is on network share with read-only
|
||||
root. */
|
||||
@ -93,46 +68,3 @@ Index: groff-1.22.4/src/roff/groff/pipeline.c
|
||||
tmpfiles[0] = tempnam(tmpdir, NULL);
|
||||
tmpfiles[1] = tempnam(tmpdir, NULL);
|
||||
|
||||
Index: groff-1.22.4/contrib/groffer/main_subs.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/main_subs.pl
|
||||
+++ groff-1.22.4/contrib/groffer/main_subs.pl
|
||||
@@ -1244,7 +1244,7 @@ sub main_temp {
|
||||
our $fh_stdin;
|
||||
our $tmp_cat;
|
||||
our $tmp_stdin;
|
||||
- my $template = 'groffer_' . "$$" . '_XXXX';
|
||||
+ my $template = 'groffer_' . "$$" . '_XXXXXXXXXX';
|
||||
foreach ($ENV{'GROFF_TMPDIR'}, $ENV{'TMPDIR'}, $ENV{'TMP'}, $ENV{'TEMP'},
|
||||
$ENV{'TEMPDIR'}, File::Spec->catfile($ENV{'HOME'}, 'tmp')) {
|
||||
if ($_ && -d $_ && -w $_) {
|
||||
@@ -1276,12 +1276,12 @@ sub main_temp {
|
||||
|
||||
# further argument: SUFFIX => '.sh'
|
||||
if ($Debug{'KEEP'}) {
|
||||
- ($fh_cat, $tmp_cat) = tempfile(',cat_XXXX', DIR => $tmpdir);
|
||||
- ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXX', DIR => $tmpdir);
|
||||
+ ($fh_cat, $tmp_cat) = tempfile(',cat_XXXXXXXXXX', DIR => $tmpdir);
|
||||
+ ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXXXXXXXX', DIR => $tmpdir);
|
||||
} else {
|
||||
- ($fh_cat, $tmp_cat) = tempfile(',cat_XXXX', UNLINK => 1,
|
||||
+ ($fh_cat, $tmp_cat) = tempfile(',cat_XXXXXXXXXX', UNLINK => 1,
|
||||
DIR => $tmpdir);
|
||||
- ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXX', UNLINK => 1,
|
||||
+ ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXXXXXXXX', UNLINK => 1,
|
||||
DIR => $tmpdir);
|
||||
}
|
||||
} # main_temp()
|
||||
Index: groff-1.22.4/contrib/groffer/roff2.pl
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/contrib/groffer/roff2.pl
|
||||
+++ groff-1.22.4/contrib/groffer/roff2.pl
|
||||
@@ -123,7 +123,7 @@ if ($Has_Groffer) {
|
||||
last;
|
||||
}
|
||||
}
|
||||
- my $template = $Name . '_XXXX';
|
||||
+ my $template = $Name . '_XXXXXXXXXX';
|
||||
my ($fh, $stdin);
|
||||
if ($tempdir) {
|
||||
($fh, $stdin) = tempfile($template, UNLINK => 1, DIR => $tempdir) ||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293
|
||||
size 4137480
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEELQwI0rCtDT2GJmcCctI/usmdTnUFAlwfpGIACgkQctI/usmd
|
||||
TnXDmw//cpZmQ2Ll8VWziyqOcY/37dmlFht2TNBXxfmUrlBYtv7mlgYOoBb6k5a5
|
||||
JqoK5GUm8MlEOkeptnrS+cti9JAmC1jzAijilF8BdXRKZHvE1OUKvqkWBFum+Zo7
|
||||
qsOaoYT/h+za3WSXdDOIgAqXn0mhcUGmD3Y/hVb3UdMn+MjzOLit8bCt2UtyKyeL
|
||||
oalHbnTxnctYhwUwVqkYD3tsTwo8FubW99f+m4ylBaVysUQg9w9Aikwuzv72oYDF
|
||||
Sp6GXsru9Zj+lRK1oASPTZi95FUKkiFvZFU+izZmprvGLnSWtUmBmkds7KuB9gwX
|
||||
ADI8f3oO4WGuy9imuDHv+oPrf+pjlbkNUZIaUwC4XeafvP0P7QraPWClUhmD0z7I
|
||||
4vn7uHVFEiECB+s9FwgWKiIe/9EkdIILw3n0jc5R9IvQzl/wFV1G7XMSw2RcZgv4
|
||||
cMQb2U2AuqOmsZ0fxaEUYrXM98WDi/5jJ3WEDNG+sjTgjFLl2c6HZgT0z9Y18N+S
|
||||
5A401GG0kHt6T2H7QXHFECeiffKGJ7n5hgUz1T4KVN2LXtOrEF0ivnxre9/9r3Om
|
||||
yeAsrp+ajB40Yfs2NU57UxcTUHp/Ae0+MXa3uYwDr+JtzRk0mv9obbj5LEIa2t0a
|
||||
S1zPh+DVMBoHRqbM9j3ZBe5fTdwwtl8oKY/hOKZGXkr95pzkhl8=
|
||||
=x7ud
|
||||
-----END PGP SIGNATURE-----
|
BIN
groff-1.23.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
groff-1.23.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
16
groff-1.23.0.tar.gz.sig
Normal file
16
groff-1.23.0.tar.gz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEELQwI0rCtDT2GJmcCctI/usmdTnUFAmSl3ZoACgkQctI/usmd
|
||||
TnXSyg//RuCRFxuFEdgZG1Rx+6/MM4e1nqpEq2Q8mMN3w3Uz76fKnsxKbazJ3JjV
|
||||
wcwim+s6IYQYGmjgaptSX7aE4Q+y+NDzy3MLrATakJ6BPriL7AywVA8tjjmwXCbD
|
||||
OFNA4Z3zZj0+DuCDEG6RZ9fz+JVIlTuknWwUgeYx+w3uukPAYaHjnDzwecCLZhKK
|
||||
XecTqBEiGnuNRHeAMTTBSG87iWboFfSeD/Tk9EiJwt678YTkQ/We58kD/JHZ7H1f
|
||||
zceH7kECrLuvS+dfqGYvDHxzVBK8NofGzOEmjrpvlYbeVhieZ7uyPwuSfzao2kBb
|
||||
QSJESlkRVA3ZijcGS6zP4fCDAmqnZtURBpCKqw1Y3oj8ZyTiD5JpzozxAvG6FrIU
|
||||
DQi1ybUHXv3aCdpX/DAxe2bsKrh3C4BHq7v+YPsT/SxOD9Vg4T6JBzMhz3k+11zR
|
||||
lQ9mfwIzIbYgV/RzLra8jfxIjCE7bvmIM2lxSoocIhUWs+BZvQ7NQIJiAUBILVS0
|
||||
C7Q5FQ+C8P5UrOyzIcuSmwnRW1oyEHe76BBy2rWNH4CJ7hRJmBlOy+SE15mujz9n
|
||||
7nj6Vlhdke16NbYvjGN2y+K75jojWRMRnfkgz3Qj4hBDDzVLp373DeEdg9u0zLUO
|
||||
iZxwWs2l0y3L+7G2hNgFJUmI3pQ19RqWbzzxaXtDy1mi6tbz/Fg=
|
||||
=S9AY
|
||||
-----END PGP SIGNATURE-----
|
@ -1,8 +1,8 @@
|
||||
Index: groff-1.22.4/font/devdvi/devdvi.am
|
||||
Index: b/font/devdvi/devdvi.am
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/font/devdvi/devdvi.am
|
||||
+++ groff-1.22.4/font/devdvi/devdvi.am
|
||||
@@ -83,9 +83,9 @@ font/devdvi/DESC: $(devdvi_srcdir)/DESC.
|
||||
--- a/font/devdvi/devdvi.am
|
||||
+++ b/font/devdvi/devdvi.am
|
||||
@@ -81,9 +81,9 @@ font/devdvi/DESC: $(devdvi_srcdir)/DESC.
|
||||
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
|
||||
&& cat $(devdvi_srcdir)/DESC.in >$@ \
|
||||
&& if test "$(PAGE)" = A4; then \
|
||||
@ -14,11 +14,11 @@ Index: groff-1.22.4/font/devdvi/devdvi.am
|
||||
fi \
|
||||
&& (test -z '$(DVIPRINT)' \
|
||||
|| echo print '$(DVIPRINT)' >>$@)
|
||||
Index: groff-1.22.4/font/devlbp/devlbp.am
|
||||
Index: b/font/devlbp/devlbp.am
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/font/devlbp/devlbp.am
|
||||
+++ groff-1.22.4/font/devlbp/devlbp.am
|
||||
@@ -47,9 +47,9 @@ font/devlbp/DESC: $(devlbp_srcdir)/DESC.
|
||||
--- a/font/devlbp/devlbp.am
|
||||
+++ b/font/devlbp/devlbp.am
|
||||
@@ -45,9 +45,9 @@ font/devlbp/DESC: $(devlbp_srcdir)/DESC.
|
||||
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
|
||||
&& cat $(devlbp_srcdir)/DESC.in >$@ \
|
||||
&& if test "$(PAGE)" = A4; then \
|
||||
@ -30,11 +30,11 @@ Index: groff-1.22.4/font/devlbp/devlbp.am
|
||||
fi \
|
||||
&& (test -z '$(LBPPRINT)' \
|
||||
|| echo print '$(LBPPRINT)' >>$@)
|
||||
Index: groff-1.22.4/font/devlj4/devlj4.am
|
||||
Index: b/font/devlj4/devlj4.am
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/font/devlj4/devlj4.am
|
||||
+++ groff-1.22.4/font/devlj4/devlj4.am
|
||||
@@ -92,9 +92,9 @@ font/devlj4/DESC: $(devlj4_srcdir)/DESC.
|
||||
--- a/font/devlj4/devlj4.am
|
||||
+++ b/font/devlj4/devlj4.am
|
||||
@@ -90,9 +90,9 @@ font/devlj4/DESC: $(devlj4_srcdir)/DESC.
|
||||
&& echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>$@ \
|
||||
&& cat $(devlj4_srcdir)/DESC.in >>$@ \
|
||||
&& if test "$(PAGE)" = A4; then \
|
||||
@ -46,35 +46,35 @@ Index: groff-1.22.4/font/devlj4/devlj4.am
|
||||
fi \
|
||||
&& (test -z '$(LJ4PRINT)' \
|
||||
|| echo print '$(LJ4PRINT)' >>$@)
|
||||
Index: groff-1.22.4/font/devpdf/devpdf.am
|
||||
Index: b/font/devpdf/devpdf.am
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/font/devpdf/devpdf.am
|
||||
+++ groff-1.22.4/font/devpdf/devpdf.am
|
||||
@@ -95,9 +95,9 @@ font/devpdf/DESC: $(devpdf_srcdir)/DESC.
|
||||
&& $(RM) $(top_builddir)/font/devpdf/DESC \
|
||||
&& cat $(devpdf_srcdir)/DESC.in >$(top_builddir)/font/devpdf/DESC \
|
||||
--- a/font/devpdf/devpdf.am
|
||||
+++ b/font/devpdf/devpdf.am
|
||||
@@ -92,9 +92,9 @@ font/devpdf/DESC: $(devpdf_srcdir)/DESC.
|
||||
&& cat $(devpdf_srcdir)/DESC.in \
|
||||
>$(top_builddir)/font/devpdf/DESC \
|
||||
&& if test "$(PAGE)" = A4; then \
|
||||
- echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \
|
||||
+ echo "papersize locale a4" >>$(top_builddir)/font/devpdf/DESC; \
|
||||
else \
|
||||
- echo "papersize letter" >>$(top_builddir)/font/devpdf/DESC; \
|
||||
+ echo "papersize locale letter" >>$(top_builddir)/font/devpdf/DESC; \
|
||||
- echo "papersize letter" \
|
||||
+ echo "papersize locale letter" \
|
||||
>>$(top_builddir)/font/devpdf/DESC; \
|
||||
fi
|
||||
|
||||
font/devpdf/Foundry:
|
||||
Index: groff-1.22.4/font/devps/devps.am
|
||||
Index: b/font/devps/devps.am
|
||||
===================================================================
|
||||
--- groff-1.22.4.orig/font/devps/devps.am
|
||||
+++ groff-1.22.4/font/devps/devps.am
|
||||
@@ -143,9 +143,9 @@ font/devps/DESC: $(devps_srcdir)/DESC.in
|
||||
&& cat $(devps_srcdir)/DESC.in >$@ \
|
||||
&& echo broken $(BROKEN_SPOOLER_FLAGS) >>$@ \
|
||||
--- a/font/devps/devps.am
|
||||
+++ b/font/devps/devps.am
|
||||
@@ -144,9 +144,9 @@ font/devps/DESC: $(devps_srcdir)/DESC.in
|
||||
&& cat $(devps_srcdir)/DESC.in >$@.tmp \
|
||||
&& echo broken $(BROKEN_SPOOLER_FLAGS) >>$@.tmp \
|
||||
&& if test "$(PAGE)" = A4; then \
|
||||
- echo "papersize a4" >>$@; \
|
||||
+ echo "papersize locale a4" >>$@; \
|
||||
- echo "papersize a4" >>$@.tmp; \
|
||||
+ echo "papersize locale a4" >>$@.tmp; \
|
||||
else \
|
||||
- echo "papersize letter" >>$@; \
|
||||
+ echo "papersize locale letter" >>$@; \
|
||||
- echo "papersize letter" >>$@.tmp; \
|
||||
+ echo "papersize locale letter" >>$@.tmp; \
|
||||
fi \
|
||||
&& (test -z '$(PSPRINT)' \
|
||||
|| echo print '$(PSPRINT)' >>$@)
|
||||
|| echo print '$(PSPRINT)' >>$@.tmp)
|
||||
|
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 29 14:21:17 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update to 1.23.0:
|
||||
* Too many changes, see NEWS file for details.
|
||||
- Refreshed patches:
|
||||
* 0002-documentation-for-the-locale-keyword.patch
|
||||
* 0004-don-t-use-usr-bin-env-in-shebang.patch
|
||||
* groff-1.20.1-deunicode.patch
|
||||
* groff-1.20.1-nroff-empty-LANGUAGE.patch
|
||||
* groff-1.21-CVE-2009-5081.patch
|
||||
* groff-force-locale-usage.patch
|
||||
- Drop sort-perl-hash-keys.patch (upstreamed)
|
||||
- Drop doc-volume-operating-system and doc-default-operating-system
|
||||
changes (doesn't default to BSD anymore)
|
||||
- Configure flag --with-appresdir has been renamed to --with-appdefdir
|
||||
- Update file list with files that were removed from the package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 16 10:04:16 UTC 2023 - pgajdos@suse.com
|
||||
|
||||
|
34
groff.spec
34
groff.spec
@ -25,7 +25,7 @@
|
||||
%bcond_with full_build
|
||||
%endif
|
||||
Name: groff%{name_ext}
|
||||
Version: 1.22.4
|
||||
Version: 1.23.0
|
||||
Release: 0
|
||||
Summary: GNU troff Document Formatting System
|
||||
License: GPL-3.0-or-later
|
||||
@ -51,7 +51,6 @@ Patch6: groff-force-locale-usage.patch
|
||||
Patch7: 0004-don-t-use-usr-bin-env-in-shebang.patch
|
||||
# Patches from debian
|
||||
Patch100: https://salsa.debian.org/debian/groff/raw/master/debian/patches/bash-scripts.patch
|
||||
Patch101: https://salsa.debian.org/debian/groff/raw/master/debian/patches/sort-perl-hash-keys.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
@ -135,17 +134,13 @@ sed -i \
|
||||
Makefile.am
|
||||
|
||||
%build
|
||||
# bsc#1185613
|
||||
sed -i "s:\(doc-volume-operating-system\) BSD:\1 SUSE:" tmac/doc-common-u
|
||||
sed -i "s:\(doc-default-operating-system\) BSD:\1 SUSE:" tmac/doc-common-u
|
||||
# -----------
|
||||
autoreconf -fvi
|
||||
# libdir redefined as it is just bunch of perl scripts
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
--docdir=%{_defaultdocdir}/groff \
|
||||
--libdir=%{_libexecdir} \
|
||||
--with-appresdir=%{_datadir}/X11/app-defaults \
|
||||
--with-appdefdir=%{_datadir}/X11/app-defaults \
|
||||
--with-grofferdir=%{_libexecdir}/groff/groffer
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -171,13 +166,13 @@ rm -f %{buildroot}%{_bindir}/tbl
|
||||
rm -f %{buildroot}%{_bindir}/troff
|
||||
rm -f %{buildroot}%{_libexecdir}/groff/grog/subs.pl
|
||||
rm -f %{buildroot}%{_datadir}/groff/current
|
||||
rm -f %{buildroot}%{_datadir}/groff/1.22.4/eign
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.22.4/font/devascii
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.22.4/font/devlatin1
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.22.4/font/devps
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.22.4/font/devutf8
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.22.4/pic
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.22.4/tmac
|
||||
rm -f %{buildroot}%{_datadir}/groff/1.23.0/eign
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.23.0/font/devascii
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.23.0/font/devlatin1
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.23.0/font/devps
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.23.0/font/devutf8
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.23.0/pic
|
||||
rm -rf %{buildroot}%{_datadir}/groff/1.23.0/tmac
|
||||
rm -rf %{buildroot}%{_datadir}/groff/site-tmac
|
||||
rm -rf %{buildroot}%{_datadir}/groff/site-font
|
||||
rm -f %{buildroot}%{_mandir}/man1/eqn.1*
|
||||
@ -303,8 +298,6 @@ fi
|
||||
%config %{_sysconfdir}/profile.d/zzz-%{name}.*sh
|
||||
%{_datadir}/%{name}
|
||||
%dir %{_libexecdir}/groff
|
||||
%dir %{_libexecdir}/groff/grog
|
||||
%{_libexecdir}/groff/grog/subs.pl
|
||||
%{_datadir}/groff/current
|
||||
|
||||
%else #groff_base_only
|
||||
@ -314,14 +307,6 @@ fi
|
||||
%dir %{_libexecdir}/groff
|
||||
%doc %{_docdir}/groff
|
||||
%dir %{_libexecdir}/groff
|
||||
%dir %{_libexecdir}/groff/glilypond
|
||||
%{_libexecdir}/groff/glilypond/args.pl
|
||||
%{_libexecdir}/groff/glilypond/oop_fh.pl
|
||||
%{_libexecdir}/groff/glilypond/subs.pl
|
||||
%dir %{_libexecdir}/groff/gpinyin
|
||||
%{_libexecdir}/groff/gpinyin/subs.pl
|
||||
%{_libexecdir}/groff/groff_opts_no_arg.txt
|
||||
%{_libexecdir}/groff/groff_opts_with_arg.txt
|
||||
%exclude %{_docdir}/groff/html
|
||||
%exclude %{_docdir}/groff/examples
|
||||
%exclude %{_docdir}/groff/pdf
|
||||
@ -336,7 +321,6 @@ fi
|
||||
%dir %{_datadir}/groff
|
||||
%{_datadir}/groff/%{version}/font
|
||||
%{_datadir}/groff/%{version}/oldfont
|
||||
%{_libexecdir}/groff/groffer
|
||||
|
||||
%files -n groff-doc
|
||||
%dir %{_docdir}/groff
|
||||
|
@ -1,103 +0,0 @@
|
||||
From 3c7075d5a846ff178c8fe83f8479f5f98e98f32d Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Fri, 6 Nov 2015 11:53:02 +0000
|
||||
Subject: Sort Perl hash keys
|
||||
|
||||
Hash iteration order may differ between runs, which makes builds harder
|
||||
to reproduce. Sort hash keys in gropdf and afmtodit output to avoid
|
||||
this.
|
||||
|
||||
Forwarded: https://lists.gnu.org/archive/html/groff/2018-03/msg00009.html
|
||||
Last-Update: 2018-03-05
|
||||
|
||||
Patch-Name: sort-perl-hash-keys.patch
|
||||
---
|
||||
src/devices/gropdf/gropdf.pl | 8 ++++----
|
||||
src/utils/afmtodit/afmtodit.pl | 12 ++++++------
|
||||
2 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
|
||||
index 134b0962..9b624c33 100644
|
||||
--- a/src/devices/gropdf/gropdf.pl
|
||||
+++ b/src/devices/gropdf/gropdf.pl
|
||||
@@ -377,7 +377,7 @@ my $info=BuildObj(++$objct,\%info);
|
||||
|
||||
PutObj($objct);
|
||||
|
||||
-foreach my $fontno (keys %fontlst)
|
||||
+foreach my $fontno (sort keys %fontlst)
|
||||
{
|
||||
my $o=$fontlst{$fontno}->{FNT};
|
||||
|
||||
@@ -846,7 +846,7 @@ sub do_x
|
||||
my @xwds=split(' ',"<< $1 >>");
|
||||
my $docinfo=ParsePDFValue(\@xwds);
|
||||
|
||||
- foreach my $k (keys %{$docinfo})
|
||||
+ foreach my $k (sort keys %{$docinfo})
|
||||
{
|
||||
$info{$k}=$docinfo->{$k} if $k ne 'Producer';
|
||||
}
|
||||
@@ -856,7 +856,7 @@ sub do_x
|
||||
my @xwds=split(' ',"<< $1 >>");
|
||||
my $docview=ParsePDFValue(\@xwds);
|
||||
|
||||
- foreach my $k (keys %{$docview})
|
||||
+ foreach my $k (sort keys %{$docview})
|
||||
{
|
||||
$cat->{$k}=$docview->{$k} if !exists($cat->{$k});
|
||||
}
|
||||
@@ -1707,7 +1707,7 @@ sub MapInsHash
|
||||
my $val=shift;
|
||||
|
||||
|
||||
- foreach my $k (keys(%{$val}))
|
||||
+ foreach my $k (sort keys(%{$val}))
|
||||
{
|
||||
MapInsValue($pdf,$o,$k,$insmap,$parent,$val->{$k}) if $k ne 'Contents';
|
||||
}
|
||||
diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
|
||||
index 954c58e7..59d871fc 100644
|
||||
--- a/src/utils/afmtodit/afmtodit.pl
|
||||
+++ b/src/utils/afmtodit/afmtodit.pl
|
||||
@@ -164,8 +164,8 @@ while (<AFM>) {
|
||||
$depth{$n} = -$lly;
|
||||
$left_side_bearing{$n} = -$llx;
|
||||
$right_side_bearing{$n} = $urx - $w;
|
||||
-# while ((my $lig, my $glyph2) = each %ligs) {
|
||||
-# $ligatures{$lig} = $n . " " . $glyph2;
|
||||
+# foreach my $lig (sort keys %ligs) {
|
||||
+# $ligatures{$lig} = $n . " " . $ligs{$lig};
|
||||
# }
|
||||
}
|
||||
}
|
||||
@@ -267,7 +267,7 @@ $italic_angle = $opt_a if $opt_a;
|
||||
if (!$opt_x) {
|
||||
my %mapped;
|
||||
my $i = ($#encoding > 256) ? ($#encoding + 1) : 256;
|
||||
- while (my $ch = each %width) {
|
||||
+ foreach my $ch (sort keys %width) {
|
||||
# add unencoded characters
|
||||
if (!$in_encoding{$ch}) {
|
||||
$encoding[$i] = $ch;
|
||||
@@ -407,9 +407,9 @@ my %default_ligatures = (
|
||||
"ffl", "ff l",
|
||||
);
|
||||
|
||||
-while (my ($lig, $components) = each %default_ligatures) {
|
||||
+foreach my $lig (sort keys %default_ligatures) {
|
||||
if (defined $width{$lig} && !defined $ligatures{$lig}) {
|
||||
- $ligatures{$lig} = $components;
|
||||
+ $ligatures{$lig} = $default_ligatures{$lig};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -456,7 +456,7 @@ if ($opt_e) {
|
||||
|
||||
if (!$opt_n && %ligatures) {
|
||||
print("ligatures");
|
||||
- while (my $lig = each %ligatures) {
|
||||
+ foreach my $lig (sort keys %ligatures) {
|
||||
print(" $lig");
|
||||
}
|
||||
print(" 0\n");
|
Loading…
Reference in New Issue
Block a user