Fixes for gcc43

This commit is contained in:
Nicolas Chauvet 2008-01-04 16:43:00 +00:00
commit 30a724c12c
2 changed files with 57 additions and 1 deletions

44
animorph-0.3-gcc43.patch Normal file
View file

@ -0,0 +1,44 @@
diff -up animorph-0.3/include/animorph/Hotspot.h.gcc43 animorph-0.3/include/animorph/Hotspot.h
--- animorph-0.3/include/animorph/Hotspot.h.gcc43 2007-11-25 10:34:57.000000000 +0100
+++ animorph-0.3/include/animorph/Hotspot.h 2008-01-04 17:40:58.000000000 +0100
@@ -36,6 +36,7 @@
#include <vector>
#include <iostream>
#include <fstream>
+#include <cstring>
#include "FileReader.h"
namespace Animorph {
diff -up animorph-0.3/include/animorph/BodySettings.h.gcc43 animorph-0.3/include/animorph/BodySettings.h
--- animorph-0.3/include/animorph/BodySettings.h.gcc43 2007-12-02 23:30:40.000000000 +0100
+++ animorph-0.3/include/animorph/BodySettings.h 2008-01-04 17:40:58.000000000 +0100
@@ -34,6 +34,7 @@
#include <iostream>
#include <fstream>
+#include <cstring>
#include <map>
#include <vector>
#include "FileReader.h"
diff -up animorph-0.3/include/animorph/FaceGroup.h.gcc43 animorph-0.3/include/animorph/FaceGroup.h
--- animorph-0.3/include/animorph/FaceGroup.h.gcc43 2007-12-02 23:30:40.000000000 +0100
+++ animorph-0.3/include/animorph/FaceGroup.h 2008-01-04 17:40:58.000000000 +0100
@@ -29,6 +29,7 @@
#include <map>
#include <ios>
+#include <cstring>
#include "Face.h"
#include "FaceVector.h"
#include "FileWriter.h"
diff -up animorph-0.3/include/animorph/util.h.gcc43 animorph-0.3/include/animorph/util.h
--- animorph-0.3/include/animorph/util.h.gcc43 2007-11-25 10:34:57.000000000 +0100
+++ animorph-0.3/include/animorph/util.h 2008-01-04 17:40:58.000000000 +0100
@@ -37,6 +37,7 @@
#include <iomanip>
#include <vector>
#include <iostream>
+#include <cstdlib>
#include "Vector3.h"
#include "Vertex.h"
#include "VertexVector.h"

View file

@ -1,6 +1,6 @@
Name: animorph
Version: 0.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: 3D Animation and Morph Library
Group: System Environment/Libraries
@ -8,6 +8,7 @@ License: GPLv3+
URL: http://www.dedalo-3d.com
Source0: http://downloads.sourceforge.net/makehuman/%{name}-%{version}.tar.gz
Patch0: animorph-0.2-pkgconfig.patch
Patch1: animorph-0.3-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -35,6 +36,14 @@ for f in animorph*.in AUTHORS COPYING TODO; do
touch -r README $f
done
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .gcc43
# prevent timestramps changes from patch1
pushd include/animorph
for f in util.h BodySettings.h FaceGroup.h Hotspot.h;do
touch -r $f.gcc43 $f
done
popd
%build
%configure --disable-static
@ -70,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jan 4 2008 kwizart < kwizart at gmail.com > - 0.3-2
- Fix for gcc43
* Thu Jan 3 2008 kwizart < kwizart at gmail.com > - 0.3-1
- Update to 0.3
- License is now GPLv3+