Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  6 Oct 2006 14:01:00 +0200 (CEST)
From:      trasz <trasz@pin.if.uz.zgora.pl>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/104054: [PATCH] games/xevil: fix build with gcc41
Message-ID:  <20061006120100.9B31139DB8@pin.if.uz.zgora.pl>
Resent-Message-ID: <200610061210.k96CAJmj098371@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         104054
>Category:       ports
>Synopsis:       [PATCH] games/xevil: fix build with gcc41
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 06 12:10:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun  3 01:12:10 CEST
>Description:
Fix build with gcc41.

(http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006100419/xevil-2.02.r2.log)

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- xevil-2.02.r2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/xevil/Makefile /home/trasz/xevil/Makefile
--- /usr/ports/games/xevil/Makefile	Mon Nov 17 13:28:57 2003
+++ /home/trasz/xevil/Makefile	Fri Oct  6 13:53:54 2006
@@ -32,7 +32,7 @@
 	@${MKDIR} ${WRKDIR}/${DISTNAME}
 
 do-extract:
-	@unzip -aqo ${DISTDIR}/${DISTFILES} -d ${WRKSRC}
+	@${UNZIP_CMD} -aqo ${DISTDIR}/${DISTFILES} -d ${WRKSRC}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x11/FREEBSD/xevil ${PREFIX}/bin/xevil
diff -ruN --exclude=CVS /usr/ports/games/xevil/files/patch-cmn::locator.h /home/trasz/xevil/files/patch-cmn::locator.h
--- /usr/ports/games/xevil/files/patch-cmn::locator.h	Mon Nov  3 19:59:15 2003
+++ /home/trasz/xevil/files/patch-cmn::locator.h	Fri Oct  6 13:53:52 2006
@@ -1,5 +1,5 @@
---- cmn/locator.h.dist	Sat Mar 22 20:35:30 2003
-+++ cmn/locator.h	Sat Oct 25 21:42:46 2003
+--- cmn/locator.h.orig	Sat Mar 22 20:35:30 2003
++++ cmn/locator.h	Fri Oct  6 13:44:36 2006
 @@ -47,7 +47,8 @@
  
  
@@ -10,3 +10,18 @@
  
  #include "utils.h"
  #include "coord.h"
+@@ -108,12 +109,12 @@
+ 
+   
+   // Only valid if mapped || flash.
+-  OLgridEntry *gridEntry; 
++  class OLgridEntry *gridEntry; 
+   // Set by OLgridEntry::insert.  Not nec. valid.
+   GLoc gloc; 
+ #if X11
+   // Only valid if mapped || flash.
+-  OLshadowEntry *shadowEntry; 
++  class OLshadowEntry *shadowEntry; 
+   // Set by OLshadowEntry::insert.  Not nec. valid.
+   GLoc shadowGloc; 
+ #endif
diff -ruN --exclude=CVS /usr/ports/games/xevil/files/patch-cmn::utils.cpp /home/trasz/xevil/files/patch-cmn::utils.cpp
--- /usr/ports/games/xevil/files/patch-cmn::utils.cpp	Mon Nov  3 19:59:15 2003
+++ /home/trasz/xevil/files/patch-cmn::utils.cpp	Fri Oct  6 13:53:52 2006
@@ -1,5 +1,5 @@
 --- cmn/utils.cpp.orig	Wed Mar 19 10:05:12 2003
-+++ cmn/utils.cpp	Sat Oct 25 21:45:15 2003
++++ cmn/utils.cpp	Fri Oct  6 13:45:47 2006
 @@ -30,16 +30,17 @@
  
  // Include Files
@@ -24,3 +24,12 @@
  #endif
  
  #ifdef WIN32
+@@ -761,7 +762,7 @@
+ 
+ 
+ private:
+-  Bucket* HashTable::_get(int &index,void* key);
++  Bucket* _get(int &index,void* key);
+   /* MODIFIES: index */
+   /* EFFECTS: Internal helper function.  Return the Bucket containing key
+      or NULL if not found.  Set index to the bucket list for key whether
--- xevil-2.02.r2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061006120100.9B31139DB8>