Date: Tuesday, December 13, 2011 @ 18:40:32
Author: allan
Revision: 145004
db-move: moved texinfo from [testing] to [core] (x86_64)
Added:
texinfo/repos/core-x86_64/PKGBUILD
(from rev 145002, texinfo/repos/testing-x86_64/PKGBUILD)
texinfo/repos/core-x86_64/texinfo-4.13a-data_types.patch
(from rev 145002,
texinfo/repos/testing-x86_64/texinfo-4.13a-data_types.patch)
texinfo/repos/core-x86_64/texinfo.install
(from rev 145002, texinfo/repos/testing-x86_64/texinfo.install)
Deleted:
texinfo/repos/core-x86_64/PKGBUILD
texinfo/repos/core-x86_64/texinfo.install
texinfo/repos/testing-x86_64/
--------------------------------+
PKGBUILD | 65 ++++++++++++++++++++-------------------
texinfo-4.13a-data_types.patch | 32 +++++++++++++++++++
texinfo.install | 42 ++++++++++++-------------
3 files changed, 87 insertions(+), 52 deletions(-)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2011-12-13 23:40:31 UTC (rev 145003)
+++ core-x86_64/PKGBUILD 2011-12-13 23:40:32 UTC (rev 145004)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
-
-pkgname=texinfo
-pkgver=4.13a
-pkgrel=6
-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')
-groups=('base')
-depends=('ncurses' 'findutils' 'gzip')
-install=texinfo.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('71ba711519209b5fb583fed2b3d86fcb'
- 'db2ca82c831684cd7cef181234017c46')
-
-build() {
- cd ${srcdir}/${pkgname}-4.13
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-4.13
- make DESTDIR=${pkgdir} install
-
- # fix this here as it prevents make from trying to rebuild manual pages
- sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi
-}
Copied: texinfo/repos/core-x86_64/PKGBUILD (from rev 145002,
texinfo/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2011-12-13 23:40:32 UTC (rev 145004)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae <al...@archlinux.org>
+# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
+
+pkgname=texinfo
+pkgver=4.13a
+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')
+url="http://www.gnu.org/software/texinfo/";
+license=('GPL3')
+groups=('base')
+depends=('ncurses' 'findutils' 'gzip')
+install=texinfo.install
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
+ texinfo-4.13a-data_types.patch)
+md5sums=('71ba711519209b5fb583fed2b3d86fcb'
+ 'db2ca82c831684cd7cef181234017c46'
+ 'd8574782ff7def1e2dc5c291dbeaec18')
+
+build() {
+ cd ${srcdir}/${pkgname}-4.13
+ patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-4.13
+ make DESTDIR=${pkgdir} install
+
+ # fix this here as it prevents make from trying to rebuild manual pages
+ sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi
+}
Copied: texinfo/repos/core-x86_64/texinfo-4.13a-data_types.patch (from rev
145002, texinfo/repos/testing-x86_64/texinfo-4.13a-data_types.patch)
===================================================================
--- core-x86_64/texinfo-4.13a-data_types.patch (rev 0)
+++ core-x86_64/texinfo-4.13a-data_types.patch 2011-12-13 23:40:32 UTC (rev
145004)
@@ -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;
Deleted: core-x86_64/texinfo.install
===================================================================
--- core-x86_64/texinfo.install 2011-12-13 23:40:31 UTC (rev 145003)
+++ core-x86_64/texinfo.install 2011-12-13 23:40:32 UTC (rev 145004)
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
-
-post_install() {
- # Scan *all* info files on install
- for file in $(find $infodir -type f ! -name dir); do
- install-info $file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
Copied: texinfo/repos/core-x86_64/texinfo.install (from rev 145002,
texinfo/repos/testing-x86_64/texinfo.install)
===================================================================
--- core-x86_64/texinfo.install (rev 0)
+++ core-x86_64/texinfo.install 2011-12-13 23:40:32 UTC (rev 145004)
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
+
+post_install() {
+ # Scan *all* info files on install
+ for file in $(find $infodir -type f ! -name dir); do
+ install-info $file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
