- Fix build with gcc41

PR:		ports/104110
Submitted by:	trasz <trasz@pin.if.uz.zgora.pl>

4 files changed, 54 insertions, 9 deletions

diff --git a/misc/snowflake/files/patch-sf.c b/misc/snowflake/files/patch-sf.c
index 2731b1a53807..66c9bbd546be 100644
--- a/misc/snowflake/files/patch-sf.c
+++ b/misc/snowflake/files/patch-sf.c
@@ -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 --git a/misc/snowflake/files/patch-sf_control.c b/misc/snowflake/files/patch-sf_control.c
index 364d3dd000b5..d50218d1d0f8 100644
--- a/misc/snowflake/files/patch-sf_control.c
+++ b/misc/snowflake/files/patch-sf_control.c
@@ -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 --git a/misc/snowflake/files/patch-sf_generate.c b/misc/snowflake/files/patch-sf_generate.c
new file mode 100644
index 000000000000..9a7314d8119f
--- /dev/null
+++ b/misc/snowflake/files/patch-sf_generate.c
@@ -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 --git a/misc/snowflake/files/patch-sf_view.c b/misc/snowflake/files/patch-sf_view.c
new file mode 100644
index 000000000000..1fa74d4ea65d
--- /dev/null
+++ b/misc/snowflake/files/patch-sf_view.c
@@ -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"
+ 
+ /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
+