rpms/ClanLib/devel ClanLib-0.8.0-gcc43.patch, NONE, 1.1 ClanLib.spec, 1.12, 1.13
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Jan 4 21:59:19 UTC 2008
- Previous message (by thread): rpms/kernel/devel linux-2.6-at76.patch, 1.5, 1.6 linux-2.6-ath5k.patch, 1.9, 1.10 linux-2.6-rtl8180.patch, 1.4, 1.5 linux-2.6-wireless-pending.patch, 1.18, 1.19
- Next message (by thread): rpms/libupnp/devel libupnp.spec,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/ClanLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14643
Modified Files:
ClanLib.spec
Added Files:
ClanLib-0.8.0-gcc43.patch
Log Message:
* Fri Jan 4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-8
- Fix building with gcc 4.3
ClanLib-0.8.0-gcc43.patch:
--- NEW FILE ClanLib-0.8.0-gcc43.patch ---
diff -up ClanLib-0.8.0/Sources/Sound/precomp.h~ ClanLib-0.8.0/Sources/Sound/precomp.h
--- ClanLib-0.8.0/Sources/Sound/precomp.h~ 2008-01-04 22:14:27.000000000 +0100
+++ ClanLib-0.8.0/Sources/Sound/precomp.h 2008-01-04 22:14:27.000000000 +0100
@@ -47,6 +47,8 @@
#include <conio.h>
#endif
+#include <string.h>
+
#include "API/signals.h"
#include "API/Core/System/error.h"
diff -up ClanLib-0.8.0/Sources/Core/precomp.h~ ClanLib-0.8.0/Sources/Core/precomp.h
--- ClanLib-0.8.0/Sources/Core/precomp.h~ 2008-01-04 22:15:04.000000000 +0100
+++ ClanLib-0.8.0/Sources/Core/precomp.h 2008-01-04 22:15:04.000000000 +0100
@@ -47,6 +47,8 @@
#include "API/Core/System/error.h"
#include "API/Core/System/clanstring.h"
+#include <string.h>
+
#ifdef __BORLANDC__
#define BAD_MATH
#endif
diff -up ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp~ ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp
--- ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp~ 2008-01-04 22:05:44.000000000 +0100
+++ ClanLib-0.8.0/Sources/Core/IOData/Unix/directory_scanner_unix.cpp 2008-01-04 22:05:44.000000000 +0100
@@ -33,6 +33,7 @@
#endif
#include <fnmatch.h>
#include <unistd.h>
+#include <string.h>
#include "directory_scanner_unix.h"
CL_DirectoryScanner_Unix::CL_DirectoryScanner_Unix ()
diff -up ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp~ ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp
--- ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp~ 2008-01-04 22:41:21.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/Socket/ip_address_getaddr.cpp 2008-01-04 22:41:21.000000000 +0100
@@ -29,6 +29,7 @@
#ifdef USE_GETADDR
+#include <string.h>
#include "ip_address_getaddr.h"
#include "API/Core/System/error.h"
#include "API/Core/System/mutex.h"
diff -up ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp~ ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp
--- ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp~ 2008-01-04 22:42:11.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/Socket/socket_generic.cpp 2008-01-04 22:42:11.000000000 +0100
@@ -38,6 +38,7 @@
#include "socket_generic.h"
#include <stdio.h>
+#include <string.h>
#include "API/Core/System/clanstring.h"
/////////////////////////////////////////////////////////////////////////////
diff -up ClanLib-0.8.0/Sources/Network/Socket/socket.cpp~ ClanLib-0.8.0/Sources/Network/Socket/socket.cpp
--- ClanLib-0.8.0/Sources/Network/Socket/socket.cpp~ 2008-01-04 22:41:45.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/Socket/socket.cpp 2008-01-04 22:41:45.000000000 +0100
@@ -42,6 +42,7 @@
#define INVALID_SOCKET -1
#endif
+#include <string.h>
#include "socket_generic.h"
#include "API/Core/System/error.h"
#include "API/Core/System/log.h"
diff -up ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h~ ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h
--- ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h~ 2008-01-04 22:43:16.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetVariables/netvariables_generic.h 2008-01-04 22:43:16.000000000 +0100
@@ -35,6 +35,7 @@
#endif
#include <list>
+#include <cstring>
#include "API/Core/IOData/inputsource.h"
#include "API/Core/IOData/outputsource.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp~ 2008-01-04 22:39:20.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/netstream.cpp 2008-01-04 22:39:20.000000000 +0100
@@ -27,6 +27,7 @@
** (if your name is missing here, please add it)
*/
+#include <string.h>
#include "API/Network/NetSession/netstream.h"
#include "API/Network/NetSession/netsession.h"
#include "netstream_generic.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp~ 2008-01-04 22:40:28.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/netcomputer_generic.cpp 2008-01-04 22:40:28.000000000 +0100
@@ -27,6 +27,7 @@
** (if your name is missing here, please add it)
*/
+#include <string.h>
#include "netcomputer_generic.h"
#include "netstream_generic.h"
#include "netsession_generic.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp~ 2008-01-04 22:40:01.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/outputsource_netpacket.cpp 2008-01-04 22:40:01.000000000 +0100
@@ -27,6 +27,7 @@
** (if your name is missing here, please add it)
*/
+#include <string.h>
#include "API/Network/NetSession/outputsource_netpacket.h"
#include "API/Network/NetSession/netpacket.h"
#include "outputsource_netpacket_generic.h"
diff -up ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp~ ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp
--- ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp~ 2008-01-04 22:26:18.000000000 +0100
+++ ClanLib-0.8.0/Sources/Network/NetSession/inputsource_netpacket.cpp 2008-01-04 22:26:18.000000000 +0100
@@ -27,6 +27,7 @@
** (if your name is missing here, please add it)
*/
+#include <string.h>
#include "API/Core/System/cl_assert.h"
#include "API/Network/NetSession/inputsource_netpacket.h"
#include "API/Network/NetSession/netpacket.h"
diff -up ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp~ ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp
--- ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp~ 2008-01-04 22:25:14.000000000 +0100
+++ ClanLib-0.8.0/Sources/GUIStyleSilver/inputbox_silver.cpp 2008-01-04 22:25:14.000000000 +0100
@@ -27,6 +27,7 @@
** (if your name is missing here, please add it)
*/
+#include <string.h>
#include "API/Display/font.h"
#include "API/Display/display.h"
#include "API/Core/System/system.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp~ 2008-01-04 22:22:25.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxusbmouse.cpp 2008-01-04 22:22:25.000000000 +0100
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <iostream>
#include <errno.h>
+#include <string.h>
#include "API/Core/System/error.h"
#include "API/Display/keys.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp~ 2008-01-04 22:23:19.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_xinput.cpp 2008-01-04 22:23:19.000000000 +0100
@@ -28,6 +28,7 @@
*/
#include <iostream>
+#include <cstring>
#include "API/Core/System/log.h"
#include "API/Display/input_device.h"
#include "API/Display/input_event.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp~ 2008-01-04 22:22:51.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_x11keyboard.cpp 2008-01-04 22:22:51.000000000 +0100
@@ -28,6 +28,7 @@
*/
#include <cstdio>
+#include <cstring>
#include "API/Display/input_device.h"
#include "API/Display/input_event.h"
#include "API/Display/keys.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp~ 2008-01-04 22:18:55.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxevent.cpp 2008-01-04 22:18:55.000000000 +0100
@@ -34,6 +34,7 @@
#include <unistd.h>
#include <iostream>
#include <errno.h>
+#include <string.h>
#include "API/Core/System/error.h"
#include "API/Core/System/clanstring.h"
diff -up ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp~ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp
--- ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp~ 2008-01-04 22:18:00.000000000 +0100
+++ ClanLib-0.8.0/Sources/GL/GLX/input_device_linuxjoystick.cpp 2008-01-04 22:18:00.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/joystick.h>
#include <iostream>
#include <errno.h>
+#include <string.h>
#include "API/Core/Math/point.h"
#include "API/Core/System/clanstring.h"
diff -up ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h~ ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h
--- ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h~ 2008-01-04 22:07:15.000000000 +0100
+++ ClanLib-0.8.0/Sources/API/GL/opengl_wrap.h 2008-01-04 22:07:15.000000000 +0100
@@ -2530,7 +2530,7 @@ public:
typedef CLuint (CL_GLFUNC *ptr_glCreateShaderObjectARB )(CLenum shaderType);
typedef CLvoid (CL_GLFUNC *ptr_glShaderSourceARB)(CLuint shaderObj, CLsizei count, const CLchar* *string, const CLint *length);
typedef CLvoid (CL_GLFUNC *ptr_glCompileShaderARB)(CLuint shaderObj);
- typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(CLvoid);
+ typedef CLuint (CL_GLFUNC *ptr_glCreateProgramObjectARB)(void);
typedef CLvoid (CL_GLFUNC *ptr_glAttachObjectARB)(CLuint containerObj, CLuint attachedObj);
typedef CLvoid (CL_GLFUNC *ptr_glLinkProgramARB)(CLuint programObj);
typedef CLvoid (CL_GLFUNC *ptr_glUseProgramObjectARB)(CLuint programObj);
diff -up ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h~ ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h
--- ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h~ 2008-01-04 22:12:09.000000000 +0100
+++ ClanLib-0.8.0/Sources/API/Display/Collision/outline_provider_file.h 2008-01-04 22:12:09.000000000 +0100
@@ -48,6 +48,7 @@
#pragma once
#endif
+#include <string>
#include "outline_provider.h"
class CL_OutlineProviderFile_Generic;
diff -up ClanLib-0.8.0/Sources/Display/display_precomp.h~ ClanLib-0.8.0/Sources/Display/display_precomp.h
--- ClanLib-0.8.0/Sources/Display/display_precomp.h~ 2008-01-04 22:09:47.000000000 +0100
+++ ClanLib-0.8.0/Sources/Display/display_precomp.h 2008-01-04 22:09:47.000000000 +0100
@@ -33,5 +33,7 @@
#include <windows.h>
#endif
+#include <string.h>
+
#include "API/Core/System/cl_assert.h"
diff -up ClanLib-0.8.0/Sources/GUI/precomp.h~ ClanLib-0.8.0/Sources/GUI/precomp.h
--- ClanLib-0.8.0/Sources/GUI/precomp.h~ 2008-01-04 22:16:06.000000000 +0100
+++ ClanLib-0.8.0/Sources/GUI/precomp.h 2008-01-04 22:16:06.000000000 +0100
@@ -37,6 +37,8 @@
#ifdef _MSC_VER
#pragma warning (disable:4786)
+#include <string.h>
+
#include "API/core.h"
#include "API/display.h"
diff -up ClanLib-0.8.0/Examples/CTalk/precomp.h~ ClanLib-0.8.0/Examples/CTalk/precomp.h
--- ClanLib-0.8.0/Examples/CTalk/precomp.h~ 2008-01-04 22:15:50.000000000 +0100
+++ ClanLib-0.8.0/Examples/CTalk/precomp.h 2008-01-04 22:15:50.000000000 +0100
@@ -10,4 +10,6 @@
#include <ClanLib/gui.h>
#include <ClanLib/guistylesilver.h>
+#include <string.h>
+
#endif
diff -up ClanLib-0.8.0/Utilities/GUIEditor/precomp.h~ ClanLib-0.8.0/Utilities/GUIEditor/precomp.h
--- ClanLib-0.8.0/Utilities/GUIEditor/precomp.h~ 2008-01-04 22:16:07.000000000 +0100
+++ ClanLib-0.8.0/Utilities/GUIEditor/precomp.h 2008-01-04 22:16:07.000000000 +0100
@@ -9,4 +9,6 @@
#include <ClanLib/display.h>
#include <ClanLib/gl.h>
+#include <string.h>
+
#endif
diff -up ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp~ ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp
--- ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp~ 2008-01-04 21:54:35.000000000 +0100
+++ ClanLib-0.8.0/Sources/Core/IOData/Generic/directory.cpp 2008-01-04 21:54:35.000000000 +0100
@@ -53,6 +53,7 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/param.h> // for PATH_MAX
/////////////////////////////////////////////////////////////////////////////
// Operations
Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ClanLib.spec 21 Oct 2007 11:37:37 -0000 1.12
+++ ClanLib.spec 4 Jan 2008 21:58:40 -0000 1.13
@@ -1,7 +1,7 @@
Summary: Cross platform C++ game library
Name: ClanLib
Version: 0.8.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Group: System Environment/Libraries
License: zlib
URL: http://www.clanlib.org/
@@ -13,6 +13,7 @@
Source1: ClanLib-%{version}-generated-docs.tar.gz
Patch0: ClanLib-0.8.0-fullscreen.patch
Patch1: ClanLib-0.8.0-tex-format.patch
+Patch2: ClanLib-0.8.0-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
BuildRequires: libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -39,6 +40,7 @@
%setup -q -a 1
%patch0 -p1 -z .fs
%patch1 -p1 -z .texfmt
+%patch2 -p1 -z .gcc43
# fixup pc files
sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
sed -i 's|Libs: -L${libdir}|Libs: -L${libdir}/%{name}-0.8|' \
@@ -88,6 +90,9 @@
%changelog
+* Fri Jan 4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-8
+- Fix building with gcc 4.3
+
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-7
- Fix multilib conflicts in generated Reference documentation (bz 340851)
- Previous message (by thread): rpms/kernel/devel linux-2.6-at76.patch, 1.5, 1.6 linux-2.6-ath5k.patch, 1.9, 1.10 linux-2.6-rtl8180.patch, 1.4, 1.5 linux-2.6-wireless-pending.patch, 1.18, 1.19
- Next message (by thread): rpms/libupnp/devel libupnp.spec,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list