diff options
Diffstat (limited to 'sys-devel/automake/files')
-rw-r--r-- | sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch (renamed from sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch) | 0 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.11.6-perl-5.16.patch (renamed from sys-devel/automake/files/automake-1.10-perl-5.16.patch) | 0 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch (renamed from sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch) | 0 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch | 51 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch (renamed from sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch) | 0 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch (renamed from sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch) | 0 | ||||
-rw-r--r-- | sys-devel/automake/files/automake-1.16.5-py3-compile.patch (renamed from sys-devel/automake/files/automake-1.16.2-py3-compile.patch) | 2 |
7 files changed, 52 insertions, 1 deletions
diff --git a/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch index c435b9004f8d..c435b9004f8d 100644 --- a/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch +++ b/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch diff --git a/sys-devel/automake/files/automake-1.10-perl-5.16.patch b/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch index 19fe249e0c00..19fe249e0c00 100644 --- a/sys-devel/automake/files/automake-1.10-perl-5.16.patch +++ b/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch diff --git a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch b/sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch index bf8819adcf4c..bf8819adcf4c 100644 --- a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch +++ b/sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch diff --git a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch new file mode 100644 index 000000000000..866284dfd185 --- /dev/null +++ b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch @@ -0,0 +1,51 @@ +From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Mon, 12 Dec 2022 14:50:33 -0800 +Subject: test: avoid apostrophe in test document. + +From automake patch https://bugs.gnu.org/59989 +(though a different solution), suggestion by Frederic Berat. + +* t/txinfo-include.sh: avoid apostrophes in test document, +since Texinfo 7.0 turns them into UTF-8 by default. +--- + t/txinfo-include.sh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh +index 8a15f01..10fff07 100644 +--- a/t/txinfo-include.sh ++++ b/t/txinfo-include.sh +@@ -28,6 +28,9 @@ main_TEXINFOS = one.texi two.texi three.texi + sub_more_TEXINFOS = sub/desc.texi sub/hist.texi + END + ++# We avoid apostrophes in the test document since Texinfo ++# turns them into UTF-8, which is not easy to grep. ++# + cat > main.texi << 'END' + \input texinfo + @setfilename main.info +@@ -61,8 +64,8 @@ END + + cat > three.texi << 'END' + @node three +-@chapter Chapter two +-GNU's Not Unix. ++@chapter Chapter three ++Quux quux quux. + END + + mkdir sub +@@ -106,7 +109,7 @@ check_info_contents () + srcdir=${1-.} + $FGREP "Foo bar, baz." $srcdir/main.info + $FGREP "Blah Blah Blah." $srcdir/main.info +- $FGREP "GNU's Not Unix." $srcdir/main.info ++ $FGREP "Quux quux quux." $srcdir/main.info + $FGREP 'It does something, really.' $srcdir/sub/more.info + $FGREP 'It was written somehow.' $srcdir/sub/more.info + } +-- +cgit v1.1 + diff --git a/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch b/sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch index 5cddb4cfb83f..5cddb4cfb83f 100644 --- a/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch +++ b/sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch diff --git a/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch index f49dd253c2d6..f49dd253c2d6 100644 --- a/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch +++ b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch diff --git a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch index 7924f204ad4f..5333520b5db1 100644 --- a/sys-devel/automake/files/automake-1.16.2-py3-compile.patch +++ b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch @@ -68,6 +68,6 @@ index e56d98d6e..5b9ae5d5d 100755 + py_compile.compile(filepath, $import_call(filepath), path) else: py_compile.compile(filepath, filepath + 'o', path) - sys.stdout.write('\n')" 2>/dev/null || : + sys.stdout.write('\n')" 2>/dev/null || exit $? -- 2.25.2 |