Compare commits
No commits in common. "6311b1c417bf9e83611c8d8e77e7a0be9cf816ab" and "cbc47962b7cb44f890aa5de640f31574818f7695" have entirely different histories.
6311b1c417
...
cbc47962b7
@ -1,97 +0,0 @@
|
|||||||
From 2d0f95853fb2662321c2e8b9babbe6410f68ab0e Mon Sep 17 00:00:00 2001
|
|
||||||
From: yueyaoqiang <yueyaoqiang@kylinos.cn>
|
|
||||||
Date: Fri, 28 Mar 2025 13:50:33 +0800
|
|
||||||
Subject: [PATCH] add support sw_64
|
|
||||||
|
|
||||||
---
|
|
||||||
build-aux/config.guess | 3 +++
|
|
||||||
build-aux/config.sub | 1 +
|
|
||||||
gnulib/m4/host-cpu-c-abi.m4 | 3 +++
|
|
||||||
tp/Texinfo/XS/config.guess | 3 +++
|
|
||||||
tp/Texinfo/XS/config.sub | 1 +
|
|
||||||
tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 | 3 +++
|
|
||||||
6 files changed, 14 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/build-aux/config.guess b/build-aux/config.guess
|
|
||||||
index e81d3ae..b053c02 100755
|
|
||||||
--- a/build-aux/config.guess
|
|
||||||
+++ b/build-aux/config.guess
|
|
||||||
@@ -1036,6 +1036,9 @@ EOF
|
|
||||||
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
|
|
||||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
|
||||||
;;
|
|
||||||
+ sw_64:Linux:*:*)
|
|
||||||
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
|
||||||
+ ;;
|
|
||||||
m32r*:Linux:*:*)
|
|
||||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
|
||||||
;;
|
|
||||||
diff --git a/build-aux/config.sub b/build-aux/config.sub
|
|
||||||
index baf1512..60bd925 100755
|
|
||||||
--- a/build-aux/config.sub
|
|
||||||
+++ b/build-aux/config.sub
|
|
||||||
@@ -1208,6 +1208,7 @@ case $cpu-$vendor in
|
|
||||||
| le32 | le64 \
|
|
||||||
| lm32 \
|
|
||||||
| loongarch32 | loongarch64 \
|
|
||||||
+ | sw_64 \
|
|
||||||
| m32c | m32r | m32rle \
|
|
||||||
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
|
|
||||||
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
|
|
||||||
diff --git a/gnulib/m4/host-cpu-c-abi.m4 b/gnulib/m4/host-cpu-c-abi.m4
|
|
||||||
index b922324..9d45f28 100644
|
|
||||||
--- a/gnulib/m4/host-cpu-c-abi.m4
|
|
||||||
+++ b/gnulib/m4/host-cpu-c-abi.m4
|
|
||||||
@@ -385,6 +385,9 @@ EOF
|
|
||||||
#ifndef __loongarch64__
|
|
||||||
#undef __loongarch64__
|
|
||||||
#endif
|
|
||||||
+#ifndef __sw_64__
|
|
||||||
+#undef __sw_64__
|
|
||||||
+#endif
|
|
||||||
#ifndef __m68k__
|
|
||||||
#undef __m68k__
|
|
||||||
#endif
|
|
||||||
diff --git a/tp/Texinfo/XS/config.guess b/tp/Texinfo/XS/config.guess
|
|
||||||
index e81d3ae..b053c02 100755
|
|
||||||
--- a/tp/Texinfo/XS/config.guess
|
|
||||||
+++ b/tp/Texinfo/XS/config.guess
|
|
||||||
@@ -1036,6 +1036,9 @@ EOF
|
|
||||||
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
|
|
||||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
|
||||||
;;
|
|
||||||
+ sw_64:Linux:*:*)
|
|
||||||
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
|
||||||
+ ;;
|
|
||||||
m32r*:Linux:*:*)
|
|
||||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
|
||||||
;;
|
|
||||||
diff --git a/tp/Texinfo/XS/config.sub b/tp/Texinfo/XS/config.sub
|
|
||||||
index d74fb6d..5ffdcdc 100755
|
|
||||||
--- a/tp/Texinfo/XS/config.sub
|
|
||||||
+++ b/tp/Texinfo/XS/config.sub
|
|
||||||
@@ -1203,6 +1203,7 @@ case $cpu-$vendor in
|
|
||||||
| le32 | le64 \
|
|
||||||
| lm32 \
|
|
||||||
| loongarch32 | loongarch64 | loongarchx32 \
|
|
||||||
+ | sw_64 \
|
|
||||||
| m32c | m32r | m32rle \
|
|
||||||
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
|
|
||||||
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
|
|
||||||
diff --git a/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 b/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4
|
|
||||||
index b922324..9d45f28 100644
|
|
||||||
--- a/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4
|
|
||||||
+++ b/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4
|
|
||||||
@@ -385,6 +385,9 @@ EOF
|
|
||||||
#ifndef __loongarch64__
|
|
||||||
#undef __loongarch64__
|
|
||||||
#endif
|
|
||||||
+#ifndef __sw_64__
|
|
||||||
+#undef __sw_64__
|
|
||||||
+#endif
|
|
||||||
#ifndef __m68k__
|
|
||||||
#undef __m68k__
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
0
fix-info-dir
Executable file → Normal file
0
fix-info-dir
Executable file → Normal file
@ -1,7 +1,7 @@
|
|||||||
diff -uNr texinfo-6.5.orig/contrib/fix-info-dir texinfo-6.5/contrib/fix-info-dir
|
diff -uNr texinfo-6.5.orig/contrib/fix-info-dir texinfo-6.5/contrib/fix-info-dir
|
||||||
--- texinfo-6.5.orig/contrib/fix-info-dir 2014-04-22 03:56:56.000000000 +0200
|
--- texinfo-6.5.orig/contrib/fix-info-dir 2014-04-22 03:56:56.000000000 +0200
|
||||||
+++ texinfo-6.5/contrib/fix-info-dir 2018-02-04 13:48:35.979359350 +0100
|
+++ texinfo-6.5/contrib/fix-info-dir 2018-02-04 13:48:35.979359350 +0100
|
||||||
@@ -162,10 +162,6 @@ if test "$CREATE_NODE"; then
|
@@ -163,29 +163,23 @@
|
||||||
{
|
{
|
||||||
|
|
||||||
### output the dir header
|
### output the dir header
|
||||||
@ -11,9 +11,16 @@ diff -uNr texinfo-6.5.orig/contrib/fix-info-dir texinfo-6.5/contrib/fix-info-dir
|
|||||||
- echo "by `whoami`@`hostname` for `pwd`"
|
- echo "by `whoami`@`hostname` for `pwd`"
|
||||||
|
|
||||||
cat<<DIR_FILE_END_OF_FILE
|
cat<<DIR_FILE_END_OF_FILE
|
||||||
This is the file .../info/$DIR_FILE, which contains the topmost node of the
|
-This is the file .../info/$DIR_FILE, which contains the topmost node of the
|
||||||
@@ -176,15 +172,14 @@ looking at that node, which is ($DIR_FILE)Top.
|
-Info hierarchy. The first time you invoke Info you start off
|
||||||
File: $DIR_FILE Node: Top This is the top of the INFO tree
|
-looking at that node, which is ($DIR_FILE)Top.
|
||||||
|
-
|
||||||
|
+This is the file .../info/$DIR_FILE, which contains the
|
||||||
|
+topmost node of the Info hierarchy, called ($DIR_FILE)Top.
|
||||||
|
+The first time you invoke Info you start off looking at this node.
|
||||||
|
|
||||||
|
-File: $DIR_FILE Node: Top This is the top of the INFO tree
|
||||||
|
+File: $DIR_FILE, Node: Top This is the top of the INFO tree
|
||||||
|
|
||||||
This (the Directory node) gives a menu of major topics.
|
This (the Directory node) gives a menu of major topics.
|
||||||
- Typing "q" exits, "?" lists all Info commands, "d" returns here,
|
- Typing "q" exits, "?" lists all Info commands, "d" returns here,
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
This fixes two issues:
|
This fixes two issues:
|
||||||
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1592433
|
https://bugzilla.redhat.com/show_bug.cgi?id=1592433
|
||||||
This is a bug in fix-info-dir --delete
|
This is a bug in fix-info-dir --delete
|
||||||
(Hunk 3)
|
(Hunk 3)
|
||||||
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1614162
|
https://bugzilla.redhat.com/show_bug.cgi?id=1614162
|
||||||
This is a weird infinite loop that happens when fix-info-dir is run with stderr
|
This is a weird infinite loop that happens when fix-info-dir is run with stderr
|
||||||
redirected to /dev/null while /dev/null doesn't exist (or isn't a device)
|
redirected to /dev/null while /dev/null doesn't exist (or isn't a device)
|
||||||
(Hunks 1 and 2)
|
(Hunks 1 and 2)
|
||||||
|
|
||||||
diff --git a/contrib/fix-info-dir b/contrib/fix-info-dir
|
diff --git a/contrib/fix-info-dir b/contrib/fix-info-dir
|
||||||
index 4439ada..9240060 100755
|
index 4439ada..9240060 100755
|
||||||
--- a/contrib/fix-info-dir
|
--- a/contrib/fix-info-dir
|
||||||
@ -39,4 +39,3 @@ index 4439ada..9240060 100755
|
|||||||
Total=`expr "$Total" + "1"`
|
Total=`expr "$Total" + "1"`
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
diff -up texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm
|
|
||||||
--- texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig 2023-01-22 11:42:42.000000000 +0100
|
|
||||||
+++ texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm 2023-02-22 12:22:13.711852621 +0100
|
|
||||||
@@ -4357,6 +4357,7 @@ sub _process_remaining_on_line($$$$)
|
|
||||||
and ($current->{'parent'}->{'type'} eq 'menu_comment'
|
|
||||||
or $current->{'parent'}->{'type'} eq 'menu_entry_description')
|
|
||||||
and $asterisk
|
|
||||||
+ and $current->{'contents'}
|
|
||||||
and @{$current->{'contents'}}
|
|
||||||
and $current->{'contents'}->[-1]->{'type'}
|
|
||||||
and $current->{'contents'}->[-1]->{'type'} eq 'empty_line'
|
|
||||||
BIN
texinfo-7.0.2.tar.xz
Normal file
BIN
texinfo-7.0.2.tar.xz
Normal file
Binary file not shown.
8
texinfo-7.0.2.tar.xz.sig
Normal file
8
texinfo-7.0.2.tar.xz.sig
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCY80lIhkcZ2F2aW5zbWl0
|
||||||
|
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/up+Y4BAMYgWy5ZHwh2qCwiP/vSyKWR
|
||||||
|
Xn9MOfEudt9W0vXg+7c5APwIdUNBkDQUfImlbXaAJ+oEWhPZmtegjkKUPAFUXV7S
|
||||||
|
zA==
|
||||||
|
=MLzb
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCZCA15BkcZ2F2aW5zbWl0
|
|
||||||
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upzwABAI2fLUksBxG7Zs/MXc6nTzFV
|
|
||||||
vM/ujEry9Xc+dXwpD1H7AP99udrll7XijKAMJG0G2/w2RVPu56x5l6UGrLhJB8Wt
|
|
||||||
PQ==
|
|
||||||
=A5eq
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
35
texinfo.spec
35
texinfo.spec
@ -3,23 +3,19 @@
|
|||||||
%global __requires_exclude ^perl\\(.*Texinfo.*\\)$
|
%global __requires_exclude ^perl\\(.*Texinfo.*\\)$
|
||||||
|
|
||||||
Name: texinfo
|
Name: texinfo
|
||||||
Version: 7.0.3
|
Version: 7.0.2
|
||||||
Release: 4
|
Release: 1
|
||||||
Summary: The GNU Documentation System
|
Summary: The GNU Documentation System
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Url: http://www.gnu.org/software/texinfo/
|
Url: http://www.gnu.org/software/texinfo/
|
||||||
Source0: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
|
Source0: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
|
||||||
Source1: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig
|
Source1: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig
|
||||||
#https://git.savannah.gnu.org/cgit/texinfo.git/tree/contrib/fix-info-dir
|
|
||||||
Source2: fix-info-dir
|
Source2: fix-info-dir
|
||||||
|
|
||||||
#patch from :https://src.fedoraproject.org/rpms/texinfo/tee/rawhide
|
Patch0001: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
|
||||||
Patch6000: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
|
Patch0002: info-6.5-sync-fix-info-dir.patch
|
||||||
Patch6001: texinfo-6.5-covscan-fixes.patch
|
Patch0003: texinfo-6.5-fix-info-dir.patch
|
||||||
Patch6002: texinfo-7.0.2-undef-val-array-ref.patch
|
Patch0004: texinfo-6.5-covscan-fixes.patch
|
||||||
Patch6003: info-6.5-sync-fix-info-dir.patch
|
|
||||||
Patch6004: texinfo-6.5-fix-info-dir.patch
|
|
||||||
Patch6005: add-support-sw_64.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc perl-generators zlib-devel ncurses-devel help2man
|
BuildRequires: gcc perl-generators zlib-devel ncurses-devel help2man
|
||||||
BuildRequires: perl(Data::Dumper) perl(Locale::Messages) perl(Unicode::EastAsianWidth) perl(Text::Unidecode) perl(Storable) perl(Unicode::Normalize)
|
BuildRequires: perl(Data::Dumper) perl(Locale::Messages) perl(Unicode::EastAsianWidth) perl(Text::Unidecode) perl(Storable) perl(Unicode::Normalize)
|
||||||
@ -125,13 +121,13 @@ export ALL_TESTS=yes
|
|||||||
/sbin/install-info
|
/sbin/install-info
|
||||||
%ghost %{_infodir}/dir
|
%ghost %{_infodir}/dir
|
||||||
%ghost %{_infodir}/dir.old
|
%ghost %{_infodir}/dir.old
|
||||||
%{_infodir}/texi2any_api.info.gz
|
|
||||||
%{_infodir}/texi2any_internals.info.gz
|
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_infodir}/info-stnd.info*
|
%{_infodir}/info-stnd.info*
|
||||||
%{_infodir}/texinfo*
|
%{_infodir}/texinfo*
|
||||||
|
%{_infodir}/texi2any_api.info.gz
|
||||||
|
%{_infodir}/texi2any_internals.info.gz
|
||||||
%{_mandir}/man1/makeinfo.1*
|
%{_mandir}/man1/makeinfo.1*
|
||||||
%{_mandir}/man1/pdftexi2dvi.1*
|
%{_mandir}/man1/pdftexi2dvi.1*
|
||||||
%{_mandir}/man1/pod2texi.1*
|
%{_mandir}/man1/pod2texi.1*
|
||||||
@ -145,21 +141,6 @@ export ALL_TESTS=yes
|
|||||||
%{_mandir}/man5/texinfo.5*
|
%{_mandir}/man5/texinfo.5*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Mar 28 2025 yueyaoqiang <yueyaoqiang@kylinos.cn> - 7.0.3-4
|
|
||||||
- add support sw_64
|
|
||||||
|
|
||||||
* Tue Aug 29 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 7.0.3-3
|
|
||||||
- add fix-info-dir command
|
|
||||||
|
|
||||||
* Wed Aug 02 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 7.0.3-2
|
|
||||||
- fix undefined value error
|
|
||||||
|
|
||||||
* Fri Jul 21 2023 zhangchenglin <zhanchenglin@kylinos.cn> - 7.0.3-1
|
|
||||||
- update to 7.0.3
|
|
||||||
|
|
||||||
* Mon Feb 13 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 6.8-5
|
|
||||||
- revent "update to 7.0.2"
|
|
||||||
|
|
||||||
* Tue Feb 07 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 7.0.2-1
|
* Tue Feb 07 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 7.0.2-1
|
||||||
- update to 7.0.2
|
- update to 7.0.2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user