Juergen Sawinski <george@mpimf-heidelberg.mpg.de>:

michiel/blackbox:
-add gcc33-support.patch
 -inclusion of <assert.h> must be done explicitly
x11/freetype1:
-add gcc33-support.patch
 -in "#define MACRO(field) (struct.##field)",
  the "##" is invalid
rene/libcss:
-add gcc33-hotfix.patch:
 -compiler seems not to understand:
  typedef unsigned long u_long;
  typedef u_long long; <- error: long, short, signed or unsigned used
invalidly for `offset'
blindcoder/libraw1394:
-added patch multi-line-string.patch
 -fix multi-line string usage
rene/mp3info:
-added hotfix.patch:
 -remove if, that does nothing
 -fix multi-line string usage


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1285 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -6,6 +6,7 @@
  - added plastik theme - which is also already included in KDE-3.2 CVS
  - updated xfree86 (mostly due to security fix)
  - updated esound, curl and ncftp
+ - Juergen Sawinski: various gcc33 fixes
 
 *) 2003-08-31 (2.0.0-rc1 - 2.0.0-rc2)
 

package/blindcoder/libraw1394/multi-line-string.patch

@@ -0,0 +1,25 @@
+--- libraw1394-0.9.0/src/testlibraw.c.orig-rock-maint	2003-08-30 23:28:39.000000000 +0200
++++ libraw1394-0.9.0/src/testlibraw.c	2003-08-30 23:29:38.000000000 +0200
+@@ -19,14 +19,14 @@
+ 
+ #define TESTADDR (CSR_REGISTER_BASE + CSR_CYCLE_TIME)
+ 
+-const char not_compatible[] = "\
+-This libraw1394 does not work with your version of Linux. You need a different
+-version that matches your kernel (see kernel help text for the raw1394 option to
+-find out which is the correct version).\n";
+-
+-const char not_loaded[] = "\
+-This probably means that you don't have raw1394 support in the kernel or that
+-you haven't loaded the raw1394 module.\n";
++const char not_compatible[] = 
++"This libraw1394 does not work with your version of Linux. You need a different"
++"version that matches your kernel (see kernel help text for the raw1394 option to"
++"find out which is the correct version).\n";
++
++const char not_loaded[] = 
++"This probably means that you don't have raw1394 support in the kernel or that"
++"you haven't loaded the raw1394 module.\n";
+ 
+ quadlet_t buffer;
+ 

package/michiel/blackbox/gcc33-support.patch

@@ -0,0 +1,16 @@
+diff -urN -x '*~' blackbox-0.65.0/src/Window.cc blackbox-0.65.0-gcc-3.3.1/src/Window.cc
+--- blackbox-0.65.0/src/Window.cc	2002-09-17 17:23:35.000000000 +0200
++++ blackbox-0.65.0-gcc-3.3.1/src/Window.cc	2003-08-14 22:22:57.000000000 +0200
+@@ -44,6 +44,12 @@
+ #endif // HAVE_STDLIB_H
+ }
+ 
++#if defined(__GNUC__)
++#if __GNUC__ == 3
++#include <cassert>
++#endif
++#endif
++
+ #include "i18n.hh"
+ #include "blackbox.hh"
+ #include "GCCache.hh"

package/rene/libcss/gcc33-hotfix.patch

@@ -0,0 +1,21 @@
+diff -urN -x '*~' libcss-0.1.0/src/css_cat.c libcss-0.1.0-gcc-3.3.1/src/css_cat.c
+--- libcss-0.1.0/src/css_cat.c	2001-02-13 22:59:27.000000000 +0100
++++ libcss-0.1.0-gcc-3.3.1/src/css_cat.c	2003-08-19 22:43:44.000000000 +0200
+@@ -60,14 +60,14 @@
+ 
+ #define STCODE(p,a,b,c,d) ((p)[0] == a && (p)[1] == b && (p)[2] == c && (p)[3] == d)
+ 
+-u_long long offset = 0x0;
+-u_long long offset_end = 0x249a4;
++unsigned long long offset = 0x0;
++unsigned long long offset_end = 0x249a4;
+ 
+ /**
+  *
+  */
+ 
+-static void super_seek (int fd, u_long long offset)
++static void super_seek (int fd, unsigned long long offset)
+ {
+ 	int i;
+ 

package/rene/mp3info/hotfix.patch

@@ -0,0 +1,31 @@
+diff -urN -x '*~' mp3info-0.8.4/gmp3info.c mp3info-0.8.4-gcc-3.3.1/gmp3info.c
+--- mp3info-0.8.4/gmp3info.c	2001-07-16 11:17:16.000000000 +0200
++++ mp3info-0.8.4-gcc-3.3.1/gmp3info.c	2003-08-19 22:49:53.000000000 +0200
+@@ -79,8 +79,6 @@
+ 	        mp3.id3.genre[0]=gget_genre(tmp);
+ 	   	strcpy(tmp,gtk_entry_get_text(GTK_ENTRY(id3win_text_track)));
+ 		mp3.id3.track[0]=atoi(tmp);
+-		if (mp3.id3.track[0] > 255)
+-			mp3.id3.track[0]=255;
+ 	        write_tag(&mp3);
+ 	   }
+ 
+@@ -484,12 +482,12 @@
+ }
+ 
+ void about_mp3info(void) {
+-	quick_popup(VERSION,"MP3Info
+-			An ID3 Tag Editor\n\n
+-			Original author: Ricardo Cerqueira <rmc@plug.pt>
+-			Current maintainer: Cedric Tefft <cedric@earthling.net>
+-			GTK Version: Ricardo Cerqueira <rmc@plug.pt>\n\n
+-			Ricardo Cerqueira, Cedric Tefft   1999-2001\n\n");
++	quick_popup(VERSION,"MP3Info\n"
++" 			An ID3 Tag Editor\n\n"
++"			Original author: Ricardo Cerqueira <rmc@plug.pt>\n"
++"			Current maintainer: Cedric Tefft <cedric@earthling.net>\n"
++"			GTK Version: Ricardo Cerqueira <rmc@plug.pt>\n\n"
++"			Ricardo Cerqueira, Cedric Tefft   1999-2001\n\n");
+ }
+ 
+ /* rmcc has left the building */

package/x11/freetype1/gcc33-support.patch

@@ -0,0 +1,21 @@
+diff -urN -x '*~' freetype-1.3.1/test/ftdump.c freetype-1.3.1-gcc-3.3.1/test/ftdump.c
+--- freetype-1.3.1/test/ftdump.c	1999-09-04 09:11:29.000000000 +0200
++++ freetype-1.3.1-gcc-3.3.1/test/ftdump.c	2003-08-14 05:13:41.000000000 +0200
+@@ -140,7 +140,7 @@
+     old_memory += *var;
+   }
+ 
+-#define FOOTPRINT( field )  Save_Memory( &memory_footprint.##field )
++#define FOOTPRINT( field )  Save_Memory( &memory_footprint.field )
+ 
+ 
+   static void
+@@ -153,7 +153,7 @@
+   }
+ 
+ #define PRINT_MEM( field, string ) \
+-          Print_Mem( memory_footprint.##field, string )
++          Print_Mem( memory_footprint.field, string )
+ 
+ 
+   /* Print the memory footprint */