From trasz@pin.if.uz.zgora.pl  Sat Oct  7 14:31:37 2006
Return-Path: <trasz@pin.if.uz.zgora.pl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2CBCA16A40F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Oct 2006 14:31:37 +0000 (UTC)
	(envelope-from trasz@pin.if.uz.zgora.pl)
Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A96A143D46
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Oct 2006 14:31:36 +0000 (GMT)
	(envelope-from trasz@pin.if.uz.zgora.pl)
Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001)
	id 7535739DB8; Sat,  7 Oct 2006 16:31:54 +0200 (CEST)
Message-Id: <20061007143154.7535739DB8@pin.if.uz.zgora.pl>
Date: Sat,  7 Oct 2006 16:31:54 +0200 (CEST)
From: trasz <trasz@pin.if.uz.zgora.pl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] misc/snowflake: fix build with gcc41.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         104110
>Category:       ports
>Synopsis:       [PATCH] misc/snowflake: fix build with gcc41.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 07 14:40:16 GMT 2006
>Closed-Date:    Sat Oct 07 15:24:20 GMT 2006
>Last-Modified:  Sat Oct  7 15:30:19 GMT 2006
>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/snowflake-0.01a_3.log)

Added file(s):
- files/patch-sf_generate.c
- files/patch-sf_view.c

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

--- snowflake-0.01a_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/misc/snowflake/files/patch-sf.c /home/trasz/snowflake/files/patch-sf.c
--- /usr/ports/misc/snowflake/files/patch-sf.c	Mon Nov 10 20:31:11 2003
+++ /home/trasz/snowflake/files/patch-sf.c	Sat Oct  7 16:24:49 2006
@@ -1,6 +1,17 @@
---- sf.c.orig	Mon Dec 21 08:18:55 1998
-+++ sf.c	Sat Nov  8 21:20:24 2003
-@@ -47,6 +47,7 @@
+--- sf.c.orig	Mon Dec 21 00:18:55 1998
++++ sf.c	Sat Oct  7 16:19:50 2006
+@@ -23,9 +23,8 @@
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+ 
+-#include "sf.h"
+-
+ #include "getopt.h"
++#include "sf.h"
+ 
+ /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+ 
+@@ -47,6 +46,7 @@
  
  struct option long_options[] =
  {
@@ -8,7 +19,7 @@
    { "view-geometry",    1, 0, c_VIEW_GEOMETRY    },
    { "control-geometry", 1, 0, c_CONTROL_GEOMETRY },
    { "minimize",         0, 0, c_MINIMIZE         },
-@@ -77,6 +78,8 @@
+@@ -77,6 +77,8 @@
  
  help_info_line help_info[] =
  {
@@ -17,7 +28,7 @@
    { "view-geometry",    c_VIEW_GEOMETRY,    "+x+y",
      "Control window placement" },
    { "control-geometry", c_CONTROL_GEOMETRY, "+x+y",
-@@ -134,7 +137,7 @@
+@@ -134,7 +136,7 @@
  
  /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
  
@@ -26,7 +37,7 @@
  {
    int   i;
    char* shop;
-@@ -175,7 +178,14 @@
+@@ -175,7 +177,14 @@
                   help_info[i].description );
  
        exit( 0 );
diff -ruN --exclude=CVS /usr/ports/misc/snowflake/files/patch-sf_control.c /home/trasz/snowflake/files/patch-sf_control.c
--- /usr/ports/misc/snowflake/files/patch-sf_control.c	Mon Nov 10 20:31:11 2003
+++ /home/trasz/snowflake/files/patch-sf_control.c	Sat Oct  7 16:24:50 2006
@@ -1,6 +1,17 @@
---- sf_control.c.orig	Mon Dec 21 08:18:55 1998
-+++ sf_control.c	Sat Nov  8 21:20:24 2003
-@@ -266,7 +266,7 @@
+--- sf_control.c.orig	Mon Dec 21 00:18:55 1998
++++ sf_control.c	Sat Oct  7 16:20:33 2006
+@@ -15,9 +15,8 @@
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+ 
+-#include "sf.h"
+-
+ #include "getopt.h"
++#include "sf.h"
+ 
+ /* for iconify_window(): */
+ #include <X11/Xlib.h>
+@@ -266,7 +265,7 @@
  static char        xpm_filespec[MAX_FILESPEC+1]    = { 0 };
  
  static char        design_filespec[MAX_FILESPEC+1] = { 0 };
diff -ruN --exclude=CVS /usr/ports/misc/snowflake/files/patch-sf_generate.c /home/trasz/snowflake/files/patch-sf_generate.c
--- /usr/ports/misc/snowflake/files/patch-sf_generate.c	Thu Jan  1 01:00:00 1970
+++ /home/trasz/snowflake/files/patch-sf_generate.c	Sat Oct  7 16:24:50 2006
@@ -0,0 +1,10 @@
+--- sf_generate.c.orig	Sat Oct  7 16:21:57 2006
++++ sf_generate.c	Sat Oct  7 16:21:23 2006
+@@ -16,6 +16,7 @@
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+ 
++#include "getopt.h"
+ #include "sf.h"
+ 
+ /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
diff -ruN --exclude=CVS /usr/ports/misc/snowflake/files/patch-sf_view.c /home/trasz/snowflake/files/patch-sf_view.c
--- /usr/ports/misc/snowflake/files/patch-sf_view.c	Thu Jan  1 01:00:00 1970
+++ /home/trasz/snowflake/files/patch-sf_view.c	Sat Oct  7 16:24:50 2006
@@ -0,0 +1,13 @@
+--- sf_view.c.orig	Sat Oct  7 16:22:31 2006
++++ sf_view.c	Sat Oct  7 16:22:33 2006
+@@ -10,9 +10,8 @@
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+ 
+-#include "sf.h"
+-
+ #include "getopt.h"
++#include "sf.h"
+ 
+ /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+ 
--- snowflake-0.01a_3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Oct 7 14:48:54 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104110 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Oct 7 15:24:18 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104110: commit references a PR
Date: Sat,  7 Oct 2006 15:24:30 +0000 (UTC)

 miwi        2006-10-07 15:24:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/snowflake/files patch-sf.c patch-sf_control.c 
   Added files:
     misc/snowflake/files patch-sf_generate.c patch-sf_view.c 
   Log:
   - Fix build with gcc41
   
   PR:             ports/104110
   Submitted by:   trasz <trasz@pin.if.uz.zgora.pl>
   
   Revision  Changes    Path
   1.2       +17 -6     ports/misc/snowflake/files/patch-sf.c
   1.2       +14 -3     ports/misc/snowflake/files/patch-sf_control.c
   1.1       +10 -0     ports/misc/snowflake/files/patch-sf_generate.c (new)
   1.1       +13 -0     ports/misc/snowflake/files/patch-sf_view.c (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"
 
>Unformatted:
