rpms/numptyphysics/devel import.log, NONE, 1.1 numptyphysics-0.3-doublefree.patch, NONE, 1.1 numptyphysics-0.3-gcc43.patch, NONE, 1.1 numptyphysics.desktop, NONE, 1.1 numptyphysics.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log numptyphysics-0.3-doublefree.patch 
	numptyphysics-0.3-gcc43.patch numptyphysics.desktop 
	numptyphysics.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
numptyphysics-0_3-0_2_20080925svn_el5:HEAD:numptyphysics-0.3-0.2.20080925svn.el5.src.rpm:1222760785

numptyphysics-0.3-doublefree.patch:

--- NEW FILE numptyphysics-0.3-doublefree.patch ---
Fix a double-free on exit.

Lubomir Rintel <lkundrak at v3.sk>

--- numptyphysics/Game.cpp.doublefree	2008-09-27 15:01:43.000000000 +0200
+++ numptyphysics/Game.cpp	2008-09-27 15:01:04.000000000 +0200
@@ -661,10 +661,13 @@
       m_strokes.erase(0);
     }
     if ( m_world ) {
+// Haven't seen a leftover body ever, and this causes a doble free()
+#if 0
       while ( m_world->GetBodyList() ) {
 	printf("body left over %p\n",m_world->GetBodyList());
 	m_world->DestroyBody( m_world->GetBodyList() );	       
       }
+#endif
       //step is required to actually destroy bodies and joints
       m_world->Step( ITERATION_TIMESTEPf, SOLVER_ITERATIONS );
     }

numptyphysics-0.3-gcc43.patch:

--- NEW FILE numptyphysics-0.3-gcc43.patch ---
Fix build of Box2D with gcc4.3.
Still applies against current Box2D upstream.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp
--- numptyphysics.orig/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Collision/b2BroadPhase.cpp	2008-09-25 16:16:39.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include "b2BroadPhase.h"
 #include <algorithm>
+#include <cstring>
 
 // Notes:
 // - we use bound arrays instead of linked lists for cache coherence.
diff -urp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp
--- numptyphysics.orig/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Common/b2BlockAllocator.cpp	2008-09-25 16:17:46.000000000 +0200
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <memory>
 #include <climits>
+#include <cstring>
 
 int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-09-25 16:17:57.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2CircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-09-25 16:17:48.000000000 +0200
@@ -22,6 +22,7 @@
 #include "../../Common/b2BlockAllocator.h"
 
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolyAndCircleContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp
--- numptyphysics.orig/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-09-25 16:17:49.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include <memory>
 #include <new>
+#include <cstring>
 
 b2Contact* b2PolygonContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
 {
diff -urp numptyphysics/Http.cpp numptyphysics/Http.cpp
--- numptyphysics.orig/Http.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Http.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -14,6 +14,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff -urp numptyphysics/Levels.cpp numptyphysics/Levels.cpp
--- numptyphysics.orig/Levels.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Levels.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
 
diff -urp numptyphysics/Path.cpp numptyphysics/Path.cpp
--- numptyphysics.orig/Path.cpp	2008-09-25 14:40:28.000000000 +0200
+++ numptyphysics/Path.cpp	2008-09-25 16:13:39.000000000 +0200
@@ -15,6 +15,7 @@
  */
 
 
+#include <string.h>
 #include "Path.h"
 
 


--- NEW FILE numptyphysics.desktop ---
[Desktop Entry]
Type=Application
Name=Numpty Physics
Exec=numptyphysics
Icon=numptyphysics
Categories=Game;LogicGame;KidsGame;Simulation;
Terminal=false


--- NEW FILE numptyphysics.spec ---
Name:           numptyphysics
Version:        0.3
Release:        0.2.20080925svn%{?dist}
Summary:        A crayon-drawing based physics puzzle game 

Group:          Amusements/Games
License:        GPLv3+
URL:            http://numptyphysics.garage.maemo.org/
# svn co -r81 https://garage.maemo.org/svn/numptyphysics/trunk numptyphysics
# tar czf numptyphysics.tar.gz numptyphysics --exclude .svn
Source0:        numptyphysics.tar.gz
Source1:        numptyphysics.desktop
Patch0:         numptyphysics-0.3-gcc43.patch
Patch1:         numptyphysics-0.3-doublefree.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL_image-devel
BuildRequires:  desktop-file-utils

%description
Harness gravity with your crayon and set about creating blocks, ramps,
levers, pulleys and whatever else you fancy to get the little red thing to
the little yellow thing.


%prep
%setup -q -n %{name}
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .doublefree


%build
# Note the ARCH variable doesn't denote real arch. It's just used to hit a
# conditional that we're not compiling with mingw
make %{?_smp_mflags}    \
        ARCH=i686       \
        CCOPTS="%{optflags} -IBox2D/Include"


%install
rm -rf $RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps

# Files
install -pm 644 *.png *.nph *.jpg $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -pm 755 i686/Game $RPM_BUILD_ROOT%{_bindir}/numptyphysics
install -pm 644 debian/numptyphysics64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png

# Icon
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/numptyphysics
%{_datadir}/numptyphysics
%{_datadir}/pixmaps/numptyphysics.png
%{_datadir}/applications/fedora-numptyphysics.desktop


%changelog
* Mon Sep 29 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.2.20080925svn
- Review, small tidy-ups

* Thu Sep 25 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3-0.1.20080925svn
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:31:03 -0000	1.1
+++ .cvsignore	30 Sep 2008 07:46:43 -0000	1.2
@@ -0,0 +1 @@
+numptyphysics.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/numptyphysics/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:31:03 -0000	1.1
+++ sources	30 Sep 2008 07:46:43 -0000	1.2
@@ -0,0 +1 @@
+168d11194b355f75857a135258445035  numptyphysics.tar.gz