rpms/ClanLib/devel ClanLib-0.8.0-memset.patch, NONE, 1.1 ClanLib.spec, 1.15, 1.16
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sat Mar 8 15:17:51 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/ClanLib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734
Modified Files:
ClanLib.spec
Added Files:
ClanLib-0.8.0-memset.patch
Log Message:
* Sat Mar 8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-11
- Add a patch from Dave Jones fixing various wrong invocations of memset
ClanLib-0.8.0-memset.patch:
--- NEW FILE ClanLib-0.8.0-memset.patch ---
--- ClanLib-0.8.0/Sources/Core/System/Generic/clanstring.cpp~ 2008-03-07 20:23:48.000000000 -0500
+++ ClanLib-0.8.0/Sources/Core/System/Generic/clanstring.cpp 2008-03-07 20:25:20.000000000 -0500
@@ -87,7 +87,7 @@ void CL_String::arg(std::string &format,
char number[10];
std::string num_string = "%";
- memset(number, 10, 0);
+ memset(number, 0, 10);
snprintf(number, 10, "%d", num);
num_string += number;
@@ -112,7 +112,7 @@ void CL_String::arg(std::string &format,
{
char arg[10];
- memset(arg, 10, 0);
+ memset(arg, 0, 10);
snprintf(arg, 10, "%d", number);
CL_String::arg(format, arg, num);
@@ -122,7 +122,7 @@ void CL_String::arg(std::string &format,
{
char arg[32];
- memset(arg, 32, 0);
+ memset(arg, 0, 32);
snprintf(arg, 32, "%f", number);
CL_String::arg(format, arg, num);
@@ -132,7 +132,7 @@ void CL_String::arg(std::string &format,
{
char arg[32];
- memset(arg, 32, 0);
+ memset(arg, 0, 32);
snprintf(arg, 32, "%#f", number);
CL_String::arg(format, arg, num);
@@ -141,7 +141,7 @@ void CL_String::arg(std::string &format,
std::string CL_String::from_int(int value)
{
char str[32];
- memset(str, 32, 0);
+ memset(str, 0, 32);
snprintf(str, 32, "%d", value);
return std::string(str);
}
@@ -149,7 +149,7 @@ std::string CL_String::from_int(int valu
std::string CL_String::from_float(float value)
{
char str[32];
- memset(str, 32, 0);
+ memset(str, 0, 32);
snprintf(str, 32, "%f", value);
return std::string(str);
}
@@ -157,7 +157,7 @@ std::string CL_String::from_float(float
std::string CL_String::from_double(double value)
{
char str[32];
- memset(str, 32, 0);
+ memset(str, 0, 32);
snprintf(str, 32, "%#f", value);
return std::string(str);
}
Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ClanLib.spec 2 Mar 2008 12:05:44 -0000 1.15
+++ ClanLib.spec 8 Mar 2008 15:17:15 -0000 1.16
@@ -1,7 +1,7 @@
Summary: Cross platform C++ game library
Name: ClanLib
Version: 0.8.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Group: System Environment/Libraries
License: zlib
URL: http://www.clanlib.org/
@@ -15,6 +15,7 @@
Patch1: ClanLib-0.8.0-tex-format.patch
Patch2: ClanLib-0.8.0-gcc43.patch
Patch3: ClanLib-0.8.0-alsa.patch
+Patch4: ClanLib-0.8.0-memset.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
@@ -43,6 +44,7 @@
%patch1 -p1 -z .texfmt
%patch2 -p1 -z .gcc43
%patch3 -p1 -z .alsa
+%patch4 -p1 -z .memset
# 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|' \
@@ -92,6 +94,9 @@
%changelog
+* Sat Mar 8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-11
+- Add a patch from Dave Jones fixing various wrong invocations of memset
+
* Sun Mar 2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-10
- Add support for audio output through alsa (original ClanLib only supports
OSS??), this also adds support for using pulseaudio through alsa
More information about the fedora-extras-commits
mailing list