Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599

4 files changed, 36 insertions, 18 deletions

diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index e84ea353d6d6..95403f0049ce 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/ctwm
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.5 2004/02/06 06:53:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.6 2004/02/07 06:06:35 usata Exp $
+
+  07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/ctwm-3.6-r1-gentoo.diff, files/ctwm-3.7_alpha4-gentoo.diff:
+  Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599
 
   06 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.6-r1.ebuild:
   Marked as stable
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 823dc6ecc82f..6bad73408160 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,9 +1,9 @@
-MD5 39803699798b9893f3fb54d1787567aa ChangeLog 981
+MD5 7284b1cf53dc82dbcc354574eb7bf415 ChangeLog 1170
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
 MD5 0e772cd9d24c214a3abcc081d541f52e ctwm-3.6-r1.ebuild 1034
 MD5 db9a47531e08a0e2e5d032fffa99e181 ctwm-3.7_alpha4-r1.ebuild 1096
+MD5 0bf2e7481cbc018b3789b2497a8a5de0 files/ctwm-3.7_alpha4-gentoo.diff 1881
 MD5 2bf6805304e3e475eba4dae4818102e4 files/ctwm-3.6-gentoo.diff 1169
-MD5 445863ca82184b289f7800ca4bbf3000 files/ctwm-3.7_alpha4-gentoo.diff 1822
-MD5 0b87f748b55f22da5d702c8826b07e8b files/ctwm-3.6-r1-gentoo.diff 930
+MD5 6752682809aa0c15d7e76cd6013da292 files/ctwm-3.6-r1-gentoo.diff 1329
 MD5 ac93af67c3e0962fa6e53f59e290b6c0 files/digest-ctwm-3.6-r1 123
 MD5 1161ba997a9299f20a3e154ba80fb99e files/digest-ctwm-3.7_alpha4-r1 67
diff --git a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
index b58c09d1f77b..d6f9e5cee3dd 100644
--- a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
+++ b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
@@ -1,14 +1,23 @@
---- gram.y-orig	2001-12-11 16:38:52.000000000 +0100
-+++ gram.y	2003-05-08 13:11:55.000000000 +0200
-@@ -427,6 +427,7 @@
- 
+diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
+--- ctwm-3.6.ORIG/gram.y	2001-12-12 00:38:52.000000000 +0900
++++ ctwm-3.6/gram.y	2004-02-07 06:43:37.067787401 +0900
+@@ -419,14 +419,13 @@
+ 		| WINDOW_RING		{ list = &Scr->WindowRingL; }
+ 		  win_list
+ 		| WINDOW_RING           { Scr->WindowRingAll = TRUE; }
+-		;
+ 		| WINDOW_RING_EXCLUDE    { if (!Scr->WindowRingL)
+ 		                              Scr->WindowRingAll = TRUE;
+ 		                          list = &Scr->WindowRingExcludeL; }
+                   win_list
+-
  		| WINDOW_GEOMETRIES 	 {  }
  		  wingeom_list
 +		;
  
  noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
  					    twmrc_error_prefix();
-@@ -683,8 +684,8 @@
+@@ -683,8 +682,8 @@
  		| wingeom_entries wingeom_entry
  		;
  
@@ -19,7 +28,7 @@
  
  
  squeeze		: SQUEEZE_TITLE { 
-@@ -835,6 +836,7 @@
+@@ -835,6 +834,7 @@
  				AddToClientsList ($1, client);
  			  }
  
@@ -27,7 +36,7 @@
  occupy_window_list	: LB occupy_window_entries RB {}
  			;
  
-@@ -845,7 +847,7 @@
+@@ -845,7 +845,7 @@
  occupy_window_entry	: string {
  				AddToClientsList (workspace, $1);
  			  }
@@ -36,10 +45,11 @@
  icon_list	: LB icon_entries RB {}
  		;
  
-@@ -962,6 +964,7 @@
+@@ -962,6 +962,7 @@
  					  RemoveDQuote(ptr);
  					  $$ = (unsigned char*)ptr;
  					}
 +		;
  number		: NUMBER		{ $$ = $1; }
  		;
+ 
diff --git a/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
index 2334a43423a2..b9b8876ca9b7 100644
--- a/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
+++ b/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
@@ -1,6 +1,6 @@
 diff -urN ctwm-3.7-alpha4.ORIG/Imakefile ctwm-3.7-alpha4/Imakefile
 --- ctwm-3.7-alpha4.ORIG/Imakefile	2003-03-01 01:36:35.000000000 +0900
-+++ ctwm-3.7-alpha4/Imakefile	2003-11-22 22:08:54.000000000 +0900
++++ ctwm-3.7-alpha4/Imakefile	2004-02-07 14:30:25.680991653 +0900
 @@ -161,7 +161,7 @@
  
  AllTarget(ctwm)
@@ -21,8 +21,12 @@ diff -urN ctwm-3.7-alpha4.ORIG/Imakefile ctwm-3.7-alpha4/Imakefile
  	MakeDir($(DESTDIR)$(TWMDIR)/images)
 diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
 --- ctwm-3.7-alpha4.ORIG/gram.y	2003-02-21 04:27:28.000000000 +0900
-+++ ctwm-3.7-alpha4/gram.y	2003-11-22 20:15:52.000000000 +0900
-@@ -433,6 +433,7 @@
++++ ctwm-3.7-alpha4/gram.y	2004-02-07 14:30:43.643214568 +0900
+@@ -429,10 +429,10 @@
+ 
+ 		| WINDOW_GEOMETRIES 	 {  }
+ 		  wingeom_list
+-		  ;
  
  		| VIRTUAL_SCREENS      	{ }
  		  geom_list
@@ -30,7 +34,7 @@ diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
  
  noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
  					    twmrc_error_prefix();
-@@ -700,7 +701,8 @@
+@@ -700,7 +700,8 @@
  geom_entries	: /* Empty */
  		| geom_entries geom_entry
  		;
@@ -40,7 +44,7 @@ diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
  
  squeeze		: SQUEEZE_TITLE { 
  				    if (HasShape) Scr->SqueezeTitle = TRUE;
-@@ -849,8 +851,7 @@
+@@ -849,8 +850,7 @@
  occupy_workspc_entry	: string {
  				AddToClientsList ($1, client);
  			  }
@@ -50,7 +54,7 @@ diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
  occupy_window_list	: LB occupy_window_entries RB {}
  			;
  
-@@ -861,7 +862,7 @@
+@@ -861,7 +861,7 @@
  occupy_window_entry	: string {
  				AddToClientsList (workspace, $1);
  			  }