[csw-devel] SF.net SVN: gar:[15306] csw/mgar/pkg/wiggle/trunk

[opk at users.sourceforge.net]

Revision: 15306
          http://gar.svn.sourceforge.net/gar/?rev=15306&view=rev
Author:   opk
Date:     2011-08-11 10:18:37 +0000 (Thu, 11 Aug 2011)

Log Message:
-----------
further patch needed as the GCC extension to support an ellipsis in a case
statement (apparently supported by ss12u2) is not supported in ss12

Modified Paths:
--------------
    csw/mgar/pkg/wiggle/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch

Modified: csw/mgar/pkg/wiggle/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wiggle/trunk/Makefile	2011-08-11 01:12:45 UTC (rev 15305)
+++ csw/mgar/pkg/wiggle/trunk/Makefile	2011-08-11 10:18:37 UTC (rev 15306)
@@ -24,7 +24,8 @@
 PATCHFILES += 0001-remove-gcc-options.patch \
     0002-fix-for-building-with-solstudio.patch \
     0003-fix-installation-target.patch \
-    0004-skip-time-in-test-script.patch
+    0004-skip-time-in-test-script.patch \
+    0005-replace-GCC-extension.patch
 BUILD_ARGS = wiggle wiggle.man
 TEST_TARGET = test
 

Added: csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch
===================================================================
--- csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch	                        (rev 0)
+++ csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch	2011-08-11 10:18:37 UTC (rev 15306)
@@ -0,0 +1,101 @@
+From 8627bfc7f6dca6f2ba793c843813b404281a7bd2 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <oliver.kiddle at esa.int>
+Date: Thu, 11 Aug 2011 11:05:32 +0200
+Subject: [PATCH] replace GCC extension
+
+---
+ vpatch.c |   64 +++++++++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 37 insertions(+), 27 deletions(-)
+
+diff --git a/vpatch.c b/vpatch.c
+index 5f76ee8..1e48538 100644
+--- a/vpatch.c
++++ b/vpatch.c
+@@ -1541,7 +1541,16 @@ void merge_window(struct plist *p, FILE *f, int reverse)
+ 			if (row >= rows)
+ 				row = rows;
+ 			break;
+-		case '0' ... '9':
++                case '0':
++                case '1':
++                case '2':
++                case '3':
++                case '4':
++                case '5':
++                case '6':
++                case '7':
++                case '8':
++                case '9':
+ 			if (tnum < 0) tnum = 0;
+ 			num = tnum*10 + (c-'0');
+ 			break;
+@@ -1600,32 +1609,6 @@ void merge_window(struct plist *p, FILE *f, int reverse)
+ 				refresh = 1;
+ 			}
+ 			break;
+-		case SEARCH(' ') ... SEARCH('~'):
+-		case SEARCH('\t'):
+-			meta = SEARCH(0);
+-			if (searchlen < sizeof(search)-1)
+-				search[searchlen++] = c & (0x7f);
+-			search[searchlen] = 0;
+-			tpos = pos; trow = row;
+-		search_again:
+-			search_notfound = 1;
+-			do {
+-				if (mcontains(tpos, fm,fb,fa,ci.merger,mode,search)) {
+-					pos = tpos;
+-					row = trow;
+-					search_notfound = 0;
+-					break;
+-				}
+-				if (searchdir) {
+-					trow--;
+-					prev_mline(&tpos, fm,fb,fa,ci.merger,mode);
+-				} else {
+-					trow++;
+-					next_mline(&tpos, fm,fb,fa,ci.merger,mode);
+-				}
+-			} while (tpos.p.m >= 0 && ci.merger[tpos.p.m].type != End);
+-
+-			break;
+ 		case 'L'-64:
+ 			refresh = 2;
+ 			if (toprow >= 1) row -= (toprow+1);
+@@ -1771,6 +1754,33 @@ void merge_window(struct plist *p, FILE *f, int reverse)
+ #endif
+ 		}
+ 
++if (((c | tmeta) >= SEARCH(' ') && (c | tmeta) <= SEARCH('~')) ||
++ (c | tmeta) == SEARCH('\t')) {
++ 			meta = SEARCH(0);
++			if (searchlen < sizeof(search)-1)
++				search[searchlen++] = c & (0x7f);
++			search[searchlen] = 0;
++			tpos = pos; trow = row;
++		search_again:
++			search_notfound = 1;
++			do {
++				if (mcontains(tpos, fm,fb,fa,ci.merger,mode,search)) {
++					pos = tpos;
++					row = trow;
++					search_notfound = 0;
++					break;
++				}
++				if (searchdir) {
++					trow--;
++					prev_mline(&tpos, fm,fb,fa,ci.merger,mode);
++				} else {
++					trow++;
++					next_mline(&tpos, fm,fb,fa,ci.merger,mode);
++				}
++			} while (tpos.p.m >= 0 && ci.merger[tpos.p.m].type != End);
++
++}
++
+ 		if (meta == SEARCH(0)) {
+ 			if (anchor == NULL ||
+ 			    !same_mpos(anchor->pos, pos) ||
+-- 
+1.7.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.