From ebd89a6fea6f7528fba27a132ed5c101208fb19e Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Fri, 13 Jun 2003 11:09:44 +0000
Subject: [PATCH] fix gcc 3.3 incompatibility

---
 integrit/integrit.patch | 18 +++++++++++++++---
 integrit/integrit.spec  |  4 ++--
 sdl/sdl.patch           | 14 ++++++++++++++
 sdl/sdl.spec            |  4 +++-
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 sdl/sdl.patch

diff --git a/integrit/integrit.patch b/integrit/integrit.patch
index 15815d2763..b360a75f80 100644
--- a/integrit/integrit.patch
+++ b/integrit/integrit.patch
@@ -1,6 +1,5 @@
-diff -Naur integrit-3.02.orig/doc/Makefile.in integrit-3.02/doc/Makefile.in
---- integrit-3.02.orig/doc/Makefile.in	Tue Aug 27 05:55:12 2002
-+++ integrit-3.02/doc/Makefile.in	Fri Sep 27 14:44:55 2002
+--- doc/Makefile.in	Tue Aug 27 05:55:12 2002
++++ doc/Makefile.in	Fri Sep 27 14:44:55 2002
 @@ -66,7 +66,8 @@
  	  $(INSTALL) -m 644 $(srcdir)/$$f $(infodir); \
  	done
@@ -11,3 +10,16 @@ diff -Naur integrit-3.02.orig/doc/Makefile.in integrit-3.02/doc/Makefile.in
  	  iistatus=1; \
  	elif test ! -z "`$(INSTALL_INFO) --version 2>&1 | grep texinfo`"; then \
  	  (set -xe; \
+--- gnupg/md5.c.orig	Sat Jan  5 18:53:31 2002
++++ gnupg/md5.c	Fri Jun 13 13:00:46 2003
+@@ -330,8 +330,8 @@
+ 
+     p = hd->buf;
+   #ifdef BIG_ENDIAN_HOST
+-    #define X(a) do { *p++ = hd->##a	  ; *p++ = hd->##a >> 8;      \
+-		      *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0)
++    #define X(a) do { *p++ = hd->a	  ; *p++ = hd->a >> 8;      \
++		      *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
+   #else /* little endian */
+     /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/
+     /* Unixware's cpp doesn't like the above construct so we do it his way:
diff --git a/integrit/integrit.spec b/integrit/integrit.spec
index a91dcabfe5..2dbb78ab1c 100644
--- a/integrit/integrit.spec
+++ b/integrit/integrit.spec
@@ -37,7 +37,7 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20030117
+Release:      20030613
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/integrit/integrit-%{version}.tar.gz
@@ -73,7 +73,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n integrit-%{V_major}
-    %patch -p1
+    %patch -p0
 
 %build
     CC="%{l_cc}" \
diff --git a/sdl/sdl.patch b/sdl/sdl.patch
new file mode 100644
index 0000000000..491aaae12c
--- /dev/null
+++ b/sdl/sdl.patch
@@ -0,0 +1,14 @@
+--- src/video/SDL_stretch.c.orig	Wed Mar  6 12:23:03 2002
++++ src/video/SDL_stretch.c	Fri Jun 13 13:08:28 2003
+@@ -261,9 +261,8 @@
+ 			break;
+ 		    default:
+ #ifdef __GNUC__
+-			__asm__ __volatile__ ("
+-				call _copy_row
+-			"
++			__asm__ __volatile__ (
++            " call _copy_row "
+ 			: "=&D" (u1), "=&S" (u2)
+ 			: "0" (dstp), "1" (srcp)
+ 			: "memory" );
diff --git a/sdl/sdl.spec b/sdl/sdl.spec
index 6ae63a84f3..d1e008a5a8 100644
--- a/sdl/sdl.spec
+++ b/sdl/sdl.spec
@@ -33,10 +33,11 @@ Distribution: OpenPKG [PLUS]
 Group:        XWindow
 License:      LGPL
 Version:      1.2.5
-Release:      20030117
+Release:      20030613
 
 #   list of sources
 Source0:      http://www.libsdl.org/release/SDL-%{version}.tar.gz
+Patch0:       sdl.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -54,6 +55,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n SDL-%{version}
+    %patch -p0
 
 %build
     CC="%{l_cc}" \