From cmangin@arobas.net  Tue Oct 18 20:50:22 2011
Return-Path: <cmangin@arobas.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D92F106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 20:50:22 +0000 (UTC)
	(envelope-from cmangin@arobas.net)
Received: from mx3.b2b2c.ca (mx3.b2b2c.ca [66.158.128.32])
	by mx1.freebsd.org (Postfix) with ESMTP id BD2188FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 20:50:21 +0000 (UTC)
Received: from titan.lan (cable-10-153-142.b2b2c.ca [72.10.153.142])
	by mx3.b2b2c.ca (8.13.8/8.13.8) with SMTP id p9IKfpqY022830
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 16:41:51 -0400
Received: by titan.lan (sSMTP sendmail emulation); Tue, 18 Oct 2011 16:41:51 -0400
Message-Id: <201110182041.p9IKfpqY022830@mx3.b2b2c.ca>
Date: Tue, 18 Oct 2011 16:41:51 -0400
From: "Christian Mangin" <cmangin@arobas.net>
Reply-To: Christian Mangin <cmangin@arobas.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] emulators/dosbox: Fix build with gcc46
X-Send-Pr-Version: 3.113
X-GNATS-Notify: knyght@gmail.com

>Number:         161782
>Category:       ports
>Synopsis:       [PATCH] emulators/dosbox: Fix build with gcc46
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 18 21:00:18 UTC 2011
>Closed-Date:    Fri Oct 21 16:10:32 UTC 2011
>Last-Modified:  Fri Oct 21 16:10:32 UTC 2011
>Originator:     Christian Mangin
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD titan 8.2-STABLE FreeBSD 8.2-STABLE #5: Thu Oct 6 12:36:11 EDT 2011 cmangin@titan:/usr/obj/usr/src/sys/TITAN amd64


>Description:
	This port fails to build with USE_GCC=4.6
>How-To-Repeat:
>Fix:

	Patch attached with submission.	

--- patch.dosbox begins here ---
diff -ruN dosbox.orig/files/patch-include-dos_inc.h dosbox/files/patch-include-dos_inc.h
--- dosbox.orig/files/patch-include-dos_inc.h	1969-12-31 19:00:00.000000000 -0500
+++ dosbox/files/patch-include-dos_inc.h	2011-10-18 12:07:45.085017000 -0400
@@ -0,0 +1,11 @@
+--- include/dos_inc.h.orig	2010-05-10 13:43:54.000000000 -0400
++++ include/dos_inc.h	2011-10-18 12:05:51.186449095 -0400
+@@ -28,6 +28,8 @@
+ #include "mem.h"
+ #endif
+ 
++#include <stddef.h>
++
+ #ifdef _MSC_VER
+ #pragma pack (1)
+ #endif
diff -ruN dosbox.orig/files/patch-include-setup.h dosbox/files/patch-include-setup.h
--- dosbox.orig/files/patch-include-setup.h	1969-12-31 19:00:00.000000000 -0500
+++ dosbox/files/patch-include-setup.h	2011-10-18 12:07:45.085017000 -0400
@@ -0,0 +1,11 @@
+--- include/setup.h.orig	2011-10-18 12:06:07.227092555 -0400
++++ include/setup.h	2011-10-18 12:06:26.200853712 -0400
+@@ -21,6 +21,8 @@
+ #ifndef DOSBOX_SETUP_H
+ #define DOSBOX_SETUP_H
+ 
++#include <stdio.h>
++
+ #ifdef _MSC_VER
+ #pragma warning ( disable : 4786 )
+ #pragma warning ( disable : 4290 )
--- patch.dosbox ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Oct 18 21:00:29 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161782 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: knyght@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/161782: [PATCH] emulators/dosbox: Fix build with gcc46
Date: Tue, 18 Oct 2011 21:00:26 UT

 Maintainer of emulators/dosbox,
 
 Please note that PR ports/161782 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/161782
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Tom Carrick <knyght@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/161782: [PATCH] emulators/dosbox: Fix build with gcc46
Date: Tue, 18 Oct 2011 22:31:58 +0100

 Will this also work for GCC 4.7 and etc., assuming it already fails to
 compile on 4.7 as is?
 
 Also have you tested that this doesn't break it for other versions of
 GCC? Not that I see how it would.
 
 --
 Tom

From: Christian Mangin <cmangin@arobas.net>
To: bug-followup@FreeBSD.org, cmangin@arobas.net
Cc:  
Subject: Re: ports/161782: [PATCH] emulators/dosbox: Fix build with gcc46
Date: Tue, 18 Oct 2011 19:47:58 -0400

 Hello,
 
 The patch has been tested against the system gcc (4.2.2) and gcc 4.6.1 in the ports. (The official 4.6.1 release, not the weekly snapshot.)
 If it helps you sleep better, it does work against this week's snapshot of gcc 4.7 but I'm not making any promise about next week,
 let alone when 4.7 is released.
 
 Regards,
 
 -- 
 Christian Mangin <cmangin@arobas.net>

From: Tom Carrick <knyght@gmail.com>
To: bug-followup@freebsd.org, cmangin@arobas.net
Cc:  
Subject: Re: ports/161782: [PATCH] emulators/dosbox: Fix build with gcc46
Date: Wed, 19 Oct 2011 16:13:39 +0100

 Well it doesn't seem to break anything for either of us so I approve.
 
 --
 Tom
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu Oct 20 00:36:15 UTC 2011 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161782 
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Oct 21 15:26:15 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161782 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161782: commit references a PR
Date: Fri, 21 Oct 2011 16:02:44 +0000 (UTC)

 pawel       2011-10-21 16:02:31 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/dosbox     Makefile 
   Added files:
     emulators/dosbox/files patch-include-dos_inc.h 
                            patch-include-setup.h 
   Log:
   Fix build with gcc 4.6
   
   PR:             ports/161782
   Submitted by:   Christian Mangin <cmangin@arobas.net>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.27      +1 -0      ports/emulators/dosbox/Makefile
   1.3       +11 -0     ports/emulators/dosbox/files/patch-include-dos_inc.h (new)
   1.1       +11 -0     ports/emulators/dosbox/files/patch-include-setup.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Fri Oct 21 16:10:30 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161782 
>Unformatted:
