texinfo: Update to 7.0.1
drop patch applied upstream drop gnulib workaround, newer included gnulib disables weak symbols correctly
This commit is contained in:
parent
2325ff444f
commit
50f7e8751e
@ -1,31 +0,0 @@
|
||||
From df780e22a5898df4a0f52ceb0ae3579ea7c78646 Mon Sep 17 00:00:00 2001
|
||||
From: Gavin Smith <gavinsmith0123@gmail.com>
|
||||
Date: Fri, 8 Apr 2022 17:27:00 +0100
|
||||
Subject: Msys2 OS detection in texi2dvi
|
||||
|
||||
* util/texi2dvi: Do not set MSYSTEM via OSTYPE environment
|
||||
variable before calling uname, as this is not working on
|
||||
Msys2. Reverses change on 2015-09-23. Instead, check the value of
|
||||
OSTYPE directly as well as calling uname.
|
||||
|
||||
Report and testing by Tomas Kalibera <tomas.kalibera@gmail.com>.
|
||||
|
||||
diff --git a/util/texi2dvi b/util/texi2dvi
|
||||
index 1f42b41..84ddde5 100755
|
||||
--- a/util/texi2dvi
|
||||
+++ b/util/texi2dvi
|
||||
@@ -80,12 +80,9 @@ IFS="$space$tab$newline"
|
||||
# directories in TEXINPUTS -- except for Cygwin and Msys, where COMSPEC
|
||||
# might be inherited, but : is used.
|
||||
|
||||
-# In the case of Msys, uname returns a value derived from MSYSTEM, as
|
||||
-# MSYSTEM is user configurable, it is not so safe to use it to detect
|
||||
-# Msys. It is safer to use OSTYPE, this is why we set MSYSTEM to
|
||||
-# $OSTYPE before calling uname
|
||||
if test -n "$COMSPEC$ComSpec" \
|
||||
- && MSYSTEM=$OSTYPE uname | $EGREP -iv 'cygwin|msys' >/dev/null; then
|
||||
+ && uname | $EGREP -iv 'cygwin|msys' >/dev/null \
|
||||
+ && test "$OSTYPE" != msys ; then
|
||||
path_sep=";"
|
||||
else
|
||||
path_sep=":"
|
||||
@ -1,8 +1,8 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('texinfo' 'info' 'texinfo-tex')
|
||||
pkgver=6.8
|
||||
pkgrel=7
|
||||
pkgver=7.0.1
|
||||
pkgrel=1
|
||||
pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.gnu.org/software/texinfo/"
|
||||
@ -14,19 +14,15 @@ source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig
|
||||
0001-texinfo-6.7-msys2.patch
|
||||
0002-manifest.all.patch
|
||||
0004-no-w32-stuff.msys2.patch
|
||||
0005-fix-makeinfo-exeext.msys2.patch
|
||||
0006-msys2-OS-detection-in-texi2dvi.patch
|
||||
gnulib-weak.patch)
|
||||
sha256sums=('8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4'
|
||||
0005-fix-makeinfo-exeext.msys2.patch)
|
||||
sha256sums=('bcd221fdb2d807a8a09938a0f8d5e010ebd2b58fca16075483d6fcb78db2c6b2'
|
||||
'SKIP'
|
||||
'c62f9c072d0c91531a557585c7b6cd6ef92e547de72da918ef3fb399182883fa'
|
||||
'e910ebddab9d3c82300caf1e3449960eb5cae756f6c708efd6ad51fc508feb7b'
|
||||
'8ce031fd118de2a5325ccf63dc21d9dd26dde9a61566dd269a27ea570494e75e'
|
||||
'db2c67546da5f11dc8e374dbf70269227a0df15045dc3456f7a9e74c353083d5'
|
||||
'ccf696f2777ebd2c85c4cb311a4735957ffa40952ecbe50c7031b9f05dc6cdee'
|
||||
'e5b18f11d9a5d99f96f9228266e6204cfb2e076e2d9c336db0eceb72e2252873'
|
||||
'b9fe84553c225d6998aaa7b80381b746428cbc1820ba6f9dbf014a863ff96fd9'
|
||||
'511f2e0dd18244f59ea77985065be585ed572ff6ee9d7357305c64dd4821d062')
|
||||
'e5b18f11d9a5d99f96f9228266e6204cfb2e076e2d9c336db0eceb72e2252873')
|
||||
validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith
|
||||
|
||||
prepare() {
|
||||
@ -35,9 +31,6 @@ prepare() {
|
||||
patch -p1 -i ${srcdir}/0002-manifest.all.patch
|
||||
patch -p1 -i ${srcdir}/0004-no-w32-stuff.msys2.patch
|
||||
patch -p1 -i ${srcdir}/0005-fix-makeinfo-exeext.msys2.patch
|
||||
# https://git.savannah.gnu.org/cgit/texinfo.git/commit/?id=df780e22a5898df4a0f52ceb0ae3579ea7c78646
|
||||
patch -p1 -i ${srcdir}/0006-msys2-OS-detection-in-texi2dvi.patch
|
||||
patch -p1 -i ${srcdir}/gnulib-weak.patch
|
||||
|
||||
autoreconf -fiv
|
||||
pushd tp/Texinfo/XS
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- texinfo-6.7/gnulib/m4/threadlib.m4.orig 2021-12-29 09:21:24.516000000 +0100
|
||||
+++ texinfo-6.7/gnulib/m4/threadlib.m4 2021-12-29 09:21:40.882799400 +0100
|
||||
@@ -101,6 +101,9 @@
|
||||
#pragma weak fputs
|
||||
int main ()
|
||||
{
|
||||
+#ifdef __CYGWIN__
|
||||
+ return 1;
|
||||
+#endif
|
||||
return (fputs == NULL);
|
||||
}]])],
|
||||
[gl_cv_have_weak=yes],
|
||||
Loading…
x
Reference in New Issue
Block a user