Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

texinfo: Update to 6.0

Browse Source
This commit is contained in:
Alexpux
2015-06-28 12:52:23 +03:00
parent 5f93f3e90d
commit 3fd03a5657
5 changed files with 8 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
texinfo/0001-texinfo-5.1-msys2.patch
View File

@@ -80,45 +80,6 @@ diff -Naur texinfo-5.1-orig/build-aux/config.rpath texinfo-5.1/build-aux/config.
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur texinfo-5.1-orig/configure texinfo-5.1/configure
--- texinfo-5.1-orig/configure 2013-03-12 22:56:45.000000000 +0000
+++ texinfo-5.1/configure 2013-03-26 11:13:54.098632800 +0000
@@ -9632,7 +9632,7 @@
case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
@@ -12348,7 +12348,7 @@
$as_echo_n "(cached) " >&6
else
case $host_os in #(
- *cygwin*)
+ *cygwin* | *msys*)
lt_cv_sys_argz_works=no
if test "$cross_compiling" != no; then
lt_cv_sys_argz_works="guessing no"
@@ -12435,7 +12435,7 @@
case "$host_os" in
# Guess no on Cygwin.
- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
# Guess yes otherwise.
*) gl_cv_func_btowc_nul="guessing yes" ;;
esac
@@ -13811,7 +13811,7 @@
case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
diff -Naur texinfo-5.1-orig/gnulib/lib/Makefile.am texinfo-5.1/gnulib/lib/Makefile.am
--- texinfo-5.1-orig/gnulib/lib/Makefile.am 2013-03-03 00:01:13.000000000 +0000
+++ texinfo-5.1/gnulib/lib/Makefile.am 2013-03-25 16:52:51.547851600 +0000

2
texinfo/0004-no-w32-stuff.msys2.patch
View File

@@ -3,7 +3,7 @@
@@ -18,9 +18,6 @@
nodist_noinst_SCRIPTS = txixml2texi
w32_bat = makeinfo.bat pod2texi.bat texi2any.bat
w32_bat = makeinfo.bat pod2texi.bat texi2any.bat texindex.bat
-if HOST_IS_WINDOWS
- bin_SCRIPTS += $(w32_bat)
-endif

17
texinfo/PKGBUILD
View File

@@ -1,32 +1,29 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=('texinfo' 'info' 'texinfo-tex')
pkgver=5.2
pkgrel=5
pkgver=6.0
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="http://www.gnu.org/software/texinfo/"
license=('GPL3')
makedepends=('ncurses-devel' 'gettext-devel' 'findutils' 'gzip' 'perl')
source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
texinfo-5.2-C-n-fix.patch
0001-texinfo-5.1-msys2.patch
0002-manifest.all.patch
0003-be-content-with-older-gettext.msys2.patch
0004-no-w32-stuff.msys2.patch
0005-fix-makeinfo-exeext.msys2.patch)
md5sums=('cb489df8a7ee9d10a236197aefdb32c5'
md5sums=('02818e62a5b8ae0213a7ff572991bb50'
'SKIP'
'89724bac1ecbd1a57b1ea81e87f96f44'
'4a52896ae32f7ee1d9d56e1cd318ca96'
'96ac50ef1e9c0d65c7f567da7a414ab8'
'7f4e9eced1af0abfbbf92d64d358c0b4'
'2c498e6fda118db6cd13727b32ba5bf3'
'8f1474fb6c56dbdc11010adefd5dcf1e'
'743746cd114e42f85fa6b74b017d4921'
'ac23191cd53eb9326657573c020ca6ef')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 -i ${srcdir}/texinfo-5.2-C-n-fix.patch
patch -p1 -i ${srcdir}/0001-texinfo-5.1-msys2.patch
patch -p1 -i ${srcdir}/0002-manifest.all.patch
#patch -p1 -i ${srcdir}/0003-be-content-with-older-gettext.msys2.patch
@@ -79,7 +76,7 @@ package_info() {
mkdir -p ${pkgdir}/usr/{bin,share}
mkdir -p ${pkgdir}/usr/share/info
mkdir -p ${pkgdir}/usr/share/man/man{1,5}
for ff in info infokey install-info; do
for ff in info install-info; do
cp -f ${srcdir}/dest/usr/bin/${ff}.exe ${pkgdir}/usr/bin/${ff}.exe
cp -f ${srcdir}/dest/usr/share/man/man1/${ff}.1 ${pkgdir}/usr/share/man/man1/${ff}.1
done
@@ -94,7 +91,7 @@ package_texinfo-tex() {
mkdir -p ${pkgdir}/usr/{bin,share}
mkdir -p ${pkgdir}/usr/share/man/man1
for ff in texindex.exe texi2dvi texi2pdf pdftexi2dvi; do
for ff in texindex texi2dvi texi2pdf pdftexi2dvi; do
cp -f ${srcdir}/dest/usr/bin/${ff} ${pkgdir}/usr/bin/${ff}
cp -f ${srcdir}/dest/usr/share/man/man1/${ff%.*}.1 ${pkgdir}/usr/share/man/man1/${ff%.*}.1
done

32
texinfo/texinfo-4.13a-data_types.patch
View File

@@ -1,32 +0,0 @@
diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
const char *carried_over_ptr;
size_t carried_over_len, carried_over_count;
const char *cur_ptr = mbi_cur_ptr (iter);
- int cur_len = mb_len (mbi_cur (iter));
+ size_t cur_len = mb_len (mbi_cur (iter));
int replen;
int delim = 0;
int rc;
@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
mbi_advance (iter))
{
const char *cur_ptr = mbi_cur_ptr (iter);
- int cur_len = mb_len (mbi_cur (iter));
+ size_t cur_len = mb_len (mbi_cur (iter));
if (cur_len == 1)
{
@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
mbi_advance (iter))
{
const char *cur_ptr = mbi_cur_ptr (iter);
- int cur_len = mb_len (mbi_cur (iter));
- int replen;
+ size_t cur_len = mb_len (mbi_cur (iter));
+ size_t replen;
if (cur_ptr >= endp)
break;

10
texinfo/texinfo-5.2-C-n-fix.patch
View File

@@ -1,10 +0,0 @@
--- info/infomap.c (revision 5386)
+++ info/infomap.c (working copy)
@@ -297,6 +297,7 @@
CONTROL('f'), NUL, A_info_forward_char,
CONTROL('h'), NUL, A_info_get_help_window,
CONTROL('l'), NUL, A_info_redraw_display,
+ CONTROL('n'), NUL, A_info_next_line,
CONTROL('p'), NUL, A_info_prev_line,
CONTROL('r'), NUL, A_isearch_backward,
CONTROL('s'), NUL, A_isearch_forward,