[ClanLib06] - Fix building with gcc 4.6
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Feb 8 13:04:26 UTC 2011
commit 76142a8aead48ca401e31a7b803dd5c829a18a3f
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Feb 8 14:15:06 2011 +0100
- Fix building with gcc 4.6
ClanLib-0.6.5-gcc4.6.patch | 12 ++++++++++++
ClanLib06.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/ClanLib-0.6.5-gcc4.6.patch b/ClanLib-0.6.5-gcc4.6.patch
new file mode 100644
index 0000000..f4652c9
--- /dev/null
+++ b/ClanLib-0.6.5-gcc4.6.patch
@@ -0,0 +1,12 @@
+diff -up ClanLib-0.6.5/Sources/Network/Generic/network_delivery_impl.h~ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_impl.h
+--- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_impl.h~ 2001-11-01 21:27:57.000000000 +0100
++++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_impl.h 2011-02-08 12:14:13.062932999 +0100
+@@ -32,7 +32,7 @@ public:
+ void *data;
+ //: The packet data.
+
+- CL_ConnectionPacket() { data = NULL; }
++ CL_ConnectionPacket() { data = (void *)0; }
+ //: Default constructor
+
+ CL_ConnectionPacket(void *data, int size)
diff --git a/ClanLib06.spec b/ClanLib06.spec
index 7009279..574f9d9 100644
--- a/ClanLib06.spec
+++ b/ClanLib06.spec
@@ -1,7 +1,7 @@
Summary: Version 0.6 of this Cross platform C++ game library
Name: ClanLib06
Version: 0.6.5
-Release: 17%{?dist}
+Release: 18%{?dist}
Group: System Environment/Libraries
License: LGPLv2
URL: http://www.clanlib.org/
@@ -20,6 +20,7 @@ Patch6: ClanLib-0.6.5-alsa.patch
Patch7: ClanLib-0.6.5-extra-keys.patch
Patch8: ClanLib-0.6.5-xev-keycodes.patch
Patch9: ClanLib-0.6.5-iterator-abuse.patch
+Patch10: ClanLib-0.6.5-gcc4.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel libXext-devel libXt-devel libGLU-devel
BuildRequires: libICE-devel libXxf86vm-devel xorg-x11-proto-devel
@@ -56,6 +57,7 @@ ClanLib 0.6 development headers and libraries
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
# mark asm files as NOT needing execstack
for i in `find Sources -name '*.s'`; do
echo '.section .note.GNU-stack,"", at progbits' >> $i
@@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 08 2011 Hans de Goede <hdegoede at redhat.com> - 0.6.5-18
+- Fix building with gcc 4.6
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list