| 1 |
commit: 929748ec0cc50a36dca9b64fe1a06eca15818fef |
| 2 |
Author: Sobhan Mohammadpour <www.sobhan.mohammadpour <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 20 02:47:26 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 1 20:41:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929748ec |
| 7 |
|
| 8 |
games-puzzle/numptyphysics: fix patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5485 |
| 11 |
|
| 12 |
.../files/numptyphysics-9999-gentoo.patch | 52 +++++++--------------- |
| 13 |
1 file changed, 16 insertions(+), 36 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch |
| 16 |
index 22b5798fc5f..e1276a86edd 100644 |
| 17 |
--- a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch |
| 18 |
+++ b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch |
| 19 |
@@ -1,18 +1,7 @@ |
| 20 |
-diff -ru numptyphysics-9999.orig/external/Box2D/Source/Makefile numptyphysics-9999/external/Box2D/Source/Makefile |
| 21 |
---- numptyphysics-9999.orig/external/Box2D/Source/Makefile 2015-11-25 22:27:36.155865064 -0500 |
| 22 |
-+++ numptyphysics-9999/external/Box2D/Source/Makefile 2015-11-25 22:28:12.924578877 -0500 |
| 23 |
-@@ -6,8 +6,6 @@ |
| 24 |
- TARGETS += Gen/nds-float/lib/libbox2d.a Gen/nds-fixed/lib/libbox2d.a |
| 25 |
- endif |
| 26 |
- |
| 27 |
--CXXFLAGS= -g -O2 |
| 28 |
-- |
| 29 |
- SOURCES = \ |
| 30 |
- ./Dynamics/b2Body.cpp \ |
| 31 |
- ./Dynamics/b2Island.cpp \ |
| 32 |
-diff -ru numptyphysics-9999.orig/external/glaserl/makefile numptyphysics-9999/external/glaserl/makefile |
| 33 |
---- numptyphysics-9999.orig/external/glaserl/makefile 2015-11-25 22:27:36.156865029 -0500 |
| 34 |
-+++ numptyphysics-9999/external/glaserl/makefile 2015-11-25 22:28:12.924578877 -0500 |
| 35 |
+diff --git a/external/glaserl/makefile b/external/glaserl/makefile |
| 36 |
+index 4120459..f49d9e7 100644 |
| 37 |
+--- a/external/glaserl/makefile |
| 38 |
++++ b/external/glaserl/makefile |
| 39 |
@@ -1,7 +1,5 @@ |
| 40 |
TARGET := libglaserl.a |
| 41 |
|
| 42 |
@@ -21,9 +10,10 @@ diff -ru numptyphysics-9999.orig/external/glaserl/makefile numptyphysics-9999/ex |
| 43 |
SOURCES := $(wildcard *.c) |
| 44 |
OBJECTS := $(SOURCES:.c=.o) |
| 45 |
|
| 46 |
-diff -ru numptyphysics-9999.orig/makefile numptyphysics-9999/makefile |
| 47 |
---- numptyphysics-9999.orig/makefile 2015-11-25 22:27:36.167864644 -0500 |
| 48 |
-+++ numptyphysics-9999/makefile 2015-11-25 22:28:12.925578842 -0500 |
| 49 |
+diff --git a/makefile b/makefile |
| 50 |
+index 0f9a9b6..292b759 100644 |
| 51 |
+--- a/makefile |
| 52 |
++++ b/makefile |
| 53 |
@@ -1,7 +1,6 @@ |
| 54 |
APP := numptyphysics |
| 55 |
|
| 56 |
@@ -32,30 +22,20 @@ diff -ru numptyphysics-9999.orig/makefile numptyphysics-9999/makefile |
| 57 |
|
| 58 |
all: app |
| 59 |
|
| 60 |
-@@ -13,7 +12,7 @@ |
| 61 |
+@@ -13,7 +12,7 @@ app: $(TARGET) |
| 62 |
|
| 63 |
$(TARGET): $(OBJECTS) $(LOCAL_LIBS) |
| 64 |
- $(SILENTMSG) "\tLD\t$@" |
| 65 |
+ $(SILENTMSG) "\tLD\t$@\n" |
| 66 |
- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS) |
| 67 |
+ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS) |
| 68 |
|
| 69 |
clean: $(ADDITIONAL_CLEAN_TARGETS) |
| 70 |
- $(SILENTMSG) "\tCLEAN" |
| 71 |
-diff -ru numptyphysics-9999.orig/mk/silent.mk numptyphysics-9999/mk/silent.mk |
| 72 |
---- numptyphysics-9999.orig/mk/silent.mk 2015-11-25 22:27:36.168864609 -0500 |
| 73 |
-+++ numptyphysics-9999/mk/silent.mk 2015-11-25 22:28:12.925578842 -0500 |
| 74 |
-@@ -2,6 +2,6 @@ |
| 75 |
- SILENTMSG := @true |
| 76 |
- SILENTCMD := |
| 77 |
- else |
| 78 |
-- SILENTMSG := @echo |
| 79 |
-+ SILENTMSG := @echo -e |
| 80 |
- SILENTCMD := @ |
| 81 |
- endif |
| 82 |
-diff -ru numptyphysics-9999.orig/src/Os.cpp numptyphysics-9999/src/Os.cpp |
| 83 |
---- numptyphysics-9999.orig/src/Os.cpp 2015-11-25 22:27:36.183864084 -0500 |
| 84 |
-+++ numptyphysics-9999/src/Os.cpp 2015-11-25 22:29:17.177331313 -0500 |
| 85 |
-@@ -262,5 +262,5 @@ |
| 86 |
+ $(SILENTMSG) "\tCLEAN\n" |
| 87 |
+diff --git a/src/Os.cpp b/src/Os.cpp |
| 88 |
+index b5d7fb9..6a0ccf4 100644 |
| 89 |
+--- a/src/Os.cpp |
| 90 |
++++ b/src/Os.cpp |
| 91 |
+@@ -262,5 +262,5 @@ Os::globalDataDir() |
| 92 |
} |
| 93 |
|
| 94 |
// System-wide installation |
Archives