diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-15 14:36:02 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-15 14:36:02 -0300 |
| commit | 5f5cc752e0a87d0ccd031eaf01ca2b63f303e00c (patch) | |
| tree | d96687d0c40dec64bacc8b82afbd024b781a9591 /core/texinfo | |
| parent | 2a5d7fae98236635f0b42f281b98c7fa878651b2 (diff) | |
| parent | f96b67a7733c348213a216ba6472d43614b44f04 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-x11-xft/PKGBUILD
community/xmobar/PKGBUILD
core/pcre/PKGBUILD
core/texinfo/PKGBUILD
extra/ettercap/PKGBUILD
libre/initscripts/PKGBUILD
Diffstat (limited to 'core/texinfo')
| -rw-r--r-- | core/texinfo/PKGBUILD | 11 | ||||
| -rw-r--r-- | core/texinfo/texinfo-4.13a-data_types.patch | 32 |
2 files changed, 39 insertions, 4 deletions
diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index 18faca132..d4463347d 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142185 2011-11-05 22:42:55Z allan $ +# $Id: PKGBUILD 145004 2011-12-13 23:40:32Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo pkgver=4.13a -pkgrel=6.1 +pkgrel=7 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/texinfo/" @@ -12,12 +12,15 @@ license=('GPL3') groups=('base') depends=('ncurses' 'findutils' 'gzip') install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + texinfo-4.13a-data_types.patch) md5sums=('71ba711519209b5fb583fed2b3d86fcb' - 'db2ca82c831684cd7cef181234017c46') + 'db2ca82c831684cd7cef181234017c46' + 'd8574782ff7def1e2dc5c291dbeaec18') build() { cd ${srcdir}/${pkgname}-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch ./configure --prefix=/usr make } diff --git a/core/texinfo/texinfo-4.13a-data_types.patch b/core/texinfo/texinfo-4.13a-data_types.patch new file mode 100644 index 000000000..2a87c2146 --- /dev/null +++ b/core/texinfo/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +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; |