[arch-commits] Commit in texinfo/repos (10 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Tue Nov 11 12:07:03 UTC 2014


    Date: Tuesday, November 11, 2014 @ 13:07:03
  Author: bpiotrowski
Revision: 226050

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  texinfo/repos/testing-i686/
  texinfo/repos/testing-i686/PKGBUILD
    (from rev 226049, texinfo/trunk/PKGBUILD)
  texinfo/repos/testing-i686/texinfo-4.13a-data_types.patch
    (from rev 226049, texinfo/trunk/texinfo-4.13a-data_types.patch)
  texinfo/repos/testing-i686/texinfo-5.2-C-n-fix.patch
    (from rev 226049, texinfo/trunk/texinfo-5.2-C-n-fix.patch)
  texinfo/repos/testing-i686/texinfo.install
    (from rev 226049, texinfo/trunk/texinfo.install)
  texinfo/repos/testing-x86_64/
  texinfo/repos/testing-x86_64/PKGBUILD
    (from rev 226049, texinfo/trunk/PKGBUILD)
  texinfo/repos/testing-x86_64/texinfo-4.13a-data_types.patch
    (from rev 226049, texinfo/trunk/texinfo-4.13a-data_types.patch)
  texinfo/repos/testing-x86_64/texinfo-5.2-C-n-fix.patch
    (from rev 226049, texinfo/trunk/texinfo-5.2-C-n-fix.patch)
  texinfo/repos/testing-x86_64/texinfo.install
    (from rev 226049, texinfo/trunk/texinfo.install)

-----------------------------------------------+
 testing-i686/PKGBUILD                         |   39 ++++++++++++++++++++++++
 testing-i686/texinfo-4.13a-data_types.patch   |   32 +++++++++++++++++++
 testing-i686/texinfo-5.2-C-n-fix.patch        |   10 ++++++
 testing-i686/texinfo.install                  |   21 ++++++++++++
 testing-x86_64/PKGBUILD                       |   39 ++++++++++++++++++++++++
 testing-x86_64/texinfo-4.13a-data_types.patch |   32 +++++++++++++++++++
 testing-x86_64/texinfo-5.2-C-n-fix.patch      |   10 ++++++
 testing-x86_64/texinfo.install                |   21 ++++++++++++
 8 files changed, 204 insertions(+)

Copied: texinfo/repos/testing-i686/PKGBUILD (from rev 226049, texinfo/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-11-11 12:07:03 UTC (rev 226050)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=texinfo
+pkgver=5.2
+pkgrel=3
+pkgdesc='GNU documentation system for on-line information and printed output'
+arch=('i686' 'x86_64')
+url='http://www.gnu.org/software/texinfo/'
+license=('GPL3')
+groups=('base' 'base-devel')
+depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh')
+install=texinfo.install
+source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+	texinfo-5.2-C-n-fix.patch)
+md5sums=('cb489df8a7ee9d10a236197aefdb32c5'
+         'SKIP'
+         '89724bac1ecbd1a57b1ea81e87f96f44')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p0 -i ../texinfo-5.2-C-n-fix.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+}

Copied: texinfo/repos/testing-i686/texinfo-4.13a-data_types.patch (from rev 226049, texinfo/trunk/texinfo-4.13a-data_types.patch)
===================================================================
--- testing-i686/texinfo-4.13a-data_types.patch	                        (rev 0)
+++ testing-i686/texinfo-4.13a-data_types.patch	2014-11-11 12:07:03 UTC (rev 226050)
@@ -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;

Copied: texinfo/repos/testing-i686/texinfo-5.2-C-n-fix.patch (from rev 226049, texinfo/trunk/texinfo-5.2-C-n-fix.patch)
===================================================================
--- testing-i686/texinfo-5.2-C-n-fix.patch	                        (rev 0)
+++ testing-i686/texinfo-5.2-C-n-fix.patch	2014-11-11 12:07:03 UTC (rev 226050)
@@ -0,0 +1,10 @@
+--- 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,

Copied: texinfo/repos/testing-i686/texinfo.install (from rev 226049, texinfo/trunk/texinfo.install)
===================================================================
--- testing-i686/texinfo.install	                        (rev 0)
+++ testing-i686/texinfo.install	2014-11-11 12:07:03 UTC (rev 226050)
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(info.info info-stnd.info texinfo.info{,-1,-2,-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/testing-x86_64/PKGBUILD (from rev 226049, texinfo/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-11-11 12:07:03 UTC (rev 226050)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=texinfo
+pkgver=5.2
+pkgrel=3
+pkgdesc='GNU documentation system for on-line information and printed output'
+arch=('i686' 'x86_64')
+url='http://www.gnu.org/software/texinfo/'
+license=('GPL3')
+groups=('base' 'base-devel')
+depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh')
+install=texinfo.install
+source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+	texinfo-5.2-C-n-fix.patch)
+md5sums=('cb489df8a7ee9d10a236197aefdb32c5'
+         'SKIP'
+         '89724bac1ecbd1a57b1ea81e87f96f44')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p0 -i ../texinfo-5.2-C-n-fix.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+}

Copied: texinfo/repos/testing-x86_64/texinfo-4.13a-data_types.patch (from rev 226049, texinfo/trunk/texinfo-4.13a-data_types.patch)
===================================================================
--- testing-x86_64/texinfo-4.13a-data_types.patch	                        (rev 0)
+++ testing-x86_64/texinfo-4.13a-data_types.patch	2014-11-11 12:07:03 UTC (rev 226050)
@@ -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;

Copied: texinfo/repos/testing-x86_64/texinfo-5.2-C-n-fix.patch (from rev 226049, texinfo/trunk/texinfo-5.2-C-n-fix.patch)
===================================================================
--- testing-x86_64/texinfo-5.2-C-n-fix.patch	                        (rev 0)
+++ testing-x86_64/texinfo-5.2-C-n-fix.patch	2014-11-11 12:07:03 UTC (rev 226050)
@@ -0,0 +1,10 @@
+--- 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,

Copied: texinfo/repos/testing-x86_64/texinfo.install (from rev 226049, texinfo/trunk/texinfo.install)
===================================================================
--- testing-x86_64/texinfo.install	                        (rev 0)
+++ testing-x86_64/texinfo.install	2014-11-11 12:07:03 UTC (rev 226050)
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(info.info info-stnd.info texinfo.info{,-1,-2,-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
+}


More information about the arch-commits mailing list