rpms/ice/devel Ice-3.3.0-gcc-4.4.patch,NONE,1.1 ice.spec,1.24,1.25

Mary Ellen Foster mef at fedoraproject.org
Fri Feb 6 08:57:01 UTC 2009


Author: mef

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

Modified Files:
	ice.spec 
Added Files:
	Ice-3.3.0-gcc-4.4.patch 
Log Message:
Add patch for GCC 4.4

Ice-3.3.0-gcc-4.4.patch:

--- NEW FILE Ice-3.3.0-gcc-4.4.patch ---
Bug#505594: FTBFS with GCC 4.4: missing #include
Patch by Martin Michlmayr

diff -Nur -x '*.orig' -x '*~' zeroc-ice/cpp/src/Slice/SignalHandler.cpp zeroc-ice.new/cpp/src/Slice/SignalHandler.cpp
--- zeroc-ice/cpp/src/Slice/SignalHandler.cpp	2008-05-16 19:24:01.000000000 +0200
+++ zeroc-ice.new/cpp/src/Slice/SignalHandler.cpp	2008-11-20 23:02:03.537272058 +0100
@@ -10,6 +10,7 @@
 #include <IceUtil/DisableWarnings.h>
 #include <Slice/SignalHandler.h>
 #include <vector>
+#include <cstdio>
 #include <cstdlib>
 
 #ifndef _WIN32


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ice.spec	17 Jan 2009 10:56:07 -0000	1.24
+++ ice.spec	6 Feb 2009 08:56:30 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -43,6 +43,8 @@
 Patch11:        Ice-3.3.0-icepatch-non-ascii.patch
 # From http://www.zeroc.com/forums/patches/4076-patch-9-ice-3-3-0-icegrid-fixes-assert-when-application-synced-concurrently.html
 Patch12:        Ice-3.3.0-icegrid-assert.patch
+# From http://www.zeroc.com/forums/patches/4092-missing-include-fails-build-gcc-4-4-a.html
+Patch13:        Ice-3.3.0-gcc-4.4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -194,6 +196,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %setup -q -n Ice-%{version}-man-pages -T -b 2
 
@@ -555,6 +558,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Fri Feb  6 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-12
+- Include Debian patch for GCC 4.4
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-11
 - rebuild with new openssl
 




More information about the scm-commits mailing list