From 99303927d7ce87fb4ba7b3c52cf4710cd0a3a7ad Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jan 07 2019 13:01:35 +0000 Subject: update box2D patch --- diff --git a/use-system-box2d.patch b/use-system-box2d.patch index a2d4884..b69f8cf 100644 --- a/use-system-box2d.patch +++ b/use-system-box2d.patch @@ -1,8 +1,6 @@ -diff --git a/myelements/elements.py b/myelements/elements.py -index dca83f1..19b2a3e 100644 ---- a/myelements/elements.py -+++ b/myelements/elements.py -@@ -30,7 +30,7 @@ __contact__ = '' +--- Physics-34/myelements/elements.py.orig 2019-01-07 12:58:33.582599253 +0000 ++++ Physics-34/myelements/elements.py 2019-01-07 12:58:52.631791503 +0000 +@@ -30,7 +30,7 @@ # Load Box2D try: @@ -11,26 +9,22 @@ index dca83f1..19b2a3e 100644 except: print 'Could not load the pybox2d library (Box2D).' print 'Please run "setup.py install" to install the dependencies.' -diff --git a/physics.py b/physics.py -index 15cbf0d..8f11906 100644 ---- a/physics.py -+++ b/physics.py -@@ -36,7 +36,7 @@ from pygame.color import * +--- Physics-34/physics.py.orig 2019-01-07 12:58:52.632791513 +0000 ++++ Physics-34/physics.py 2019-01-07 12:59:16.770035120 +0000 +@@ -33,7 +33,7 @@ + import pygame + from pygame.locals import MOUSEBUTTONUP - # from sugar3.activity import activity - # sys.path.insert(0, os.path.join(activity.get_bundle_path(), 'lib')) -import lib.Box2D as box2d +import Box2D as box2d import myelements as elements import tools -diff --git a/tools.py b/tools.py -index 94fd517..e858050 100644 ---- a/tools.py -+++ b/tools.py -@@ -32,7 +32,7 @@ from gettext import gettext as _ - from pygame.locals import * - from helpers import * +--- Physics-34/tools.py.orig 2018-09-06 04:16:04.000000000 +0100 ++++ Physics-34/tools.py 2019-01-07 12:58:52.632791513 +0000 +@@ -33,7 +33,7 @@ + from helpers import \ + tuple_to_int, distance, constructTriangleFromLine, find_body -import lib.Box2D as box2d +import Box2D as box2d