[arch-commits] Commit in texinfo/trunk (4 files)

[Bartłomiej Piotrowski]

    Date: Wednesday, October 21, 2015 @ 23:46:35
  Author: bpiotrowski
Revision: 249606

upgpkg: texinfo 6.0-1

new upstream release

Added:
  texinfo/trunk/texinfo-6.0-disable-failing-info-test.patch
Modified:
  texinfo/trunk/PKGBUILD
Deleted:
  texinfo/trunk/texinfo-4.13a-data_types.patch
  texinfo/trunk/texinfo-5.2-C-n-fix.patch

---------------------------------------------+
 PKGBUILD                                    |   14 +++++------
 texinfo-4.13a-data_types.patch              |   32 --------------------------
 texinfo-5.2-C-n-fix.patch                   |   10 --------
 texinfo-6.0-disable-failing-info-test.patch |   11 ++++++++
 4 files changed, 18 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-21 21:25:02 UTC (rev 249605)
+++ PKGBUILD	2015-10-21 21:46:35 UTC (rev 249606)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=texinfo
-pkgver=5.2
-pkgrel=4
+pkgver=6.0
+pkgrel=1
 pkgdesc='GNU documentation system for on-line information and printed output'
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/texinfo/'
@@ -14,15 +14,15 @@
 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'
+        texinfo-6.0-disable-failing-info-test.patch)
+md5sums=('02818e62a5b8ae0213a7ff572991bb50'
          'SKIP'
-         '89724bac1ecbd1a57b1ea81e87f96f44')
-validpgpkeys=('17D3311B14BC0F248267BF020716748A30D155AD') # Karl Berry
+         '8bfaa21315a8a6184811de8478005d22')
+validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p0 -i ../texinfo-5.2-C-n-fix.patch
+  patch -p1 -i ../texinfo-6.0-disable-failing-info-test.patch
 }
 
 build() {

Deleted: texinfo-4.13a-data_types.patch
===================================================================
--- texinfo-4.13a-data_types.patch	2015-10-21 21:25:02 UTC (rev 249605)
+++ texinfo-4.13a-data_types.patch	2015-10-21 21:46:35 UTC (rev 249606)
@@ -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;

Deleted: texinfo-5.2-C-n-fix.patch
===================================================================
--- texinfo-5.2-C-n-fix.patch	2015-10-21 21:25:02 UTC (rev 249605)
+++ texinfo-5.2-C-n-fix.patch	2015-10-21 21:46:35 UTC (rev 249606)
@@ -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,

Added: texinfo-6.0-disable-failing-info-test.patch
===================================================================
--- texinfo-6.0-disable-failing-info-test.patch	                        (rev 0)
+++ texinfo-6.0-disable-failing-info-test.patch	2015-10-21 21:46:35 UTC (rev 249606)
@@ -0,0 +1,11 @@
+diff -up texinfo-6.0/info/Makefile.in.orig texinfo-6.0/info/Makefile.in
+--- texinfo-6.0/info/Makefile.in.orig	2015-07-14 13:17:44.298882856 +0200
++++ texinfo-6.0/info/Makefile.in	2015-07-14 13:18:13.082004108 +0200
+@@ -1695,7 +1695,6 @@ TESTS = \
+ 	t/end-of-line.sh \
+ 	t/goal-column.sh \
+ 	t/star-note-non-whitespace.sh \
+-	t/c-u-m-x-scroll-forward.sh \
+ 	t/last-no-history.sh \
+ 	t/split-footnotes.sh \
+ 	t/window-split-dir.sh \