Bug 184570 - games/lugaru : fix build with gcc47
Summary: games/lugaru : fix build with gcc47
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rusmir Dusko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-07 17:00 UTC by Christoph Moench-Tegeder
Modified: 2013-12-07 18:10 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Moench-Tegeder freebsd_committer freebsd_triage 2013-12-07 17:00:02 UTC
Hi,

in an effort towards upgrading lang/gcc to gcc 4.7, I'm helping gerald@
in making ports gcc47-safe.
Please consider the following patch to your port. If you approve of the
patch, gerald@ has offered his help in commiting it.
If you're commiting yourself or have someone else commit this (or
another patch to the same effect), can you please add an additional
reference to ports/183342 in the commit message?
In my test environment, the port built successfully with lang/gcc47.

Fix: GCC 4.7 includes fewer header files on it's own than previous versions,
so unistd.h has to be pulled in explicitly.

# add unistd.h
$ svn status
A       files/patch-Source-OpenGL_Windows.cpp



Regards,
Christoph--YmsRyDz20q1G7FB3JSyxXjUik4aJijPubeeNuPe1BZ4Vxk1T
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: files/patch-Source-OpenGL_Windows.cpp
===================================================================
--- files/patch-Source-OpenGL_Windows.cpp	(revision 0)
+++ files/patch-Source-OpenGL_Windows.cpp	(working copy)
@@ -0,0 +1,11 @@
+--- Source/OpenGL_Windows.cpp.orig	2013-11-16 13:53:53.000000000 +0100
++++ Source/OpenGL_Windows.cpp	2013-11-16 13:54:13.000000000 +0100
+@@ -30,6 +30,8 @@
+ #undef boolean
+ #endif
+ 
++#include <unistd.h>
++
+ 
+ 
+ #include "Game.h"
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-07 17:00:54 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Rusmir Dusko freebsd_committer freebsd_triage 2013-12-07 18:06:54 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-12-07 18:07:11 UTC
Author: nemysis
Date: Sat Dec  7 18:07:03 2013
New Revision: 335838
URL: http://svnweb.freebsd.org/changeset/ports/335838

Log:
  - Fix build with gcc47, add patch
  
  PR:		ports/184570
  Submitted by:	Christoph Moench-Tegeder <cmt@burggraben.net>
  Approved by:	pawel / wg (mentors, implicit)

Added:
  head/games/lugaru/files/patch-Source__OpenGL_Windows.cpp   (contents, props changed)
  head/games/lugaru/files/patch-Source__openal_wrapper.cpp   (contents, props changed)
Deleted:
  head/games/lugaru/files/patch-Source-openal_wrapper.cpp

Added: head/games/lugaru/files/patch-Source__OpenGL_Windows.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/lugaru/files/patch-Source__OpenGL_Windows.cpp	Sat Dec  7 18:07:03 2013	(r335838)
@@ -0,0 +1,10 @@
+--- ./Source/OpenGL_Windows.cpp.orig	2010-05-16 06:42:54.000000000 +0200
++++ ./Source/OpenGL_Windows.cpp	2013-12-07 18:36:52.000000000 +0100
+@@ -30,6 +30,7 @@
+ #undef boolean
+ #endif
+ 
++#include <unistd.h>
+ 
+ 
+ #include "Game.h"

Added: head/games/lugaru/files/patch-Source__openal_wrapper.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/lugaru/files/patch-Source__openal_wrapper.cpp	Sat Dec  7 18:07:03 2013	(r335838)
@@ -0,0 +1,11 @@
+--- ./Source/openal_wrapper.cpp.orig	2010-05-16 06:42:54.000000000 +0200
++++ ./Source/openal_wrapper.cpp	2013-12-07 18:33:55.000000000 +0100
+@@ -374,7 +374,7 @@
+     char *fname = (char *) alloca(strlen(_fname) + 16);
+     strcpy(fname, _fname);
+     char *ptr = strchr(fname, '.');
+-    if (ptr) *ptr = NULL;
++    if (ptr) ptr = NULL;
+     strcat(fname, ".ogg");
+ 
+     // just in case...
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"