rpms/firebird/devel firebird-gcc-icu.patch, NONE, 1.1 firebird.spec, 1.2, 1.3

[Philippe Makowski]

Author: makowski

Update of /cvs/pkgs/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20674

Modified Files:
	firebird.spec 
Added Files:
	firebird-gcc-icu.patch 
Log Message:
patch to fix gcc 4.4.0 and icu 4.2 build error

firebird-gcc-icu.patch:

--- NEW FILE firebird-gcc-icu.patch ---
# Author: Adriano dos Santos Fernandes
#Index: src/common/classes/alloc.h
#===================================================================
#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
#retrieving revision 1.71
diff -u -p -r1.71 alloc.h
--- src/common/classes/alloc.h	26 Sep 2007 17:48:20 -0000	1.71
+++ src/common/classes/alloc.h	20 May 2009 02:20:08 -0000
@@ -47,6 +47,7 @@
 #include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
 					   stdlib.h (EKU) */
 #endif
+#include <new>
 
 #ifdef _MSC_VER
 #define THROW_BAD_ALLOC
@@ -448,15 +449,6 @@ inline void* operator new[](size_t s) TH
 	);
 }
 
-inline void* operator new(size_t, void* ptr) throw() 
-{
-	return ptr;
-}
-inline void* operator new[](size_t, void* ptr) throw() 
-{
-	return ptr;
-}
-
 inline void operator delete(void* mem) throw()
 {
 	Firebird::MemoryPool::globalFree(mem);


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- firebird.spec	12 May 2009 11:01:28 -0000	1.2
+++ firebird.spec	23 May 2009 07:55:39 -0000	1.3
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.2.18118.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -23,6 +23,7 @@ Patch0:		firebird-mcpu-to-mtune.patch
 Patch1:		firebird-2.1.2-doc.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
+Patch4:		firebird-gcc-icu.patch
 
 
 BuildRequires:	autoconf
@@ -131,6 +132,7 @@ iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/RE
 %patch1
 %patch0
 %patch3
+%patch4
 
 %build
 
@@ -485,6 +487,9 @@ rm -Rf	%{_var}/run/%{name}
 
 
 %changelog
+* Tue May 12 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.2.18118.0-8
+- patch to fix gcc 4.4.0 and icu 4.2 build error
+
 * Tue May 12 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.2.18118.0-7
 - patch to change lock files location and avoid %%{fbroot} owned by firebird user (rh #500219)
 - add README.fedora