* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/numptyphysics/files/
@ 2015-11-28 7:38 Michael Sterrett
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett @ 2015-11-28 7:38 UTC (permalink / raw
To: gentoo-commits
commit: fe349ba006d0bbbebceb193900c2f07571cc7692
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 07:37:45 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 07:38:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe349ba0
update patch to mesh with upstream
Package-Manager: portage-2.2.20.1
.../numptyphysics/files/numptyphysics-9999-gentoo.patch | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
index 25b4475..22b5798 100644
--- a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
+++ b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
@@ -52,21 +52,6 @@ diff -ru numptyphysics-9999.orig/mk/silent.mk numptyphysics-9999/mk/silent.mk
+ SILENTMSG := @echo -e
SILENTCMD := @
endif
-diff -ru numptyphysics-9999.orig/platform/gl/gl.mk numptyphysics-9999/platform/gl/gl.mk
---- numptyphysics-9999.orig/platform/gl/gl.mk 2015-11-25 22:27:36.172864469 -0500
-+++ numptyphysics-9999/platform/gl/gl.mk 2015-11-25 22:28:12.925578842 -0500
-@@ -3,9 +3,9 @@
- LIBS += -framework OpenGL
- else
- ifneq ($(wildcard $(patsubst %,%/libGL.so.1,/usr/lib /usr/lib64 /usr/lib/*)),)
--add_pkgconfig(gl)
-+$(eval $(call add_pkgconfig,gl))
- else
--add_pkgconfig(glesv2)
-+$(eval $(call add_pkgconfig,glesv2))
- CFLAGS += -DUSE_OPENGL_ES
- CXXFLAGS += -DUSE_OPENGL_ES
- endif
diff -ru numptyphysics-9999.orig/src/Os.cpp numptyphysics-9999/src/Os.cpp
--- numptyphysics-9999.orig/src/Os.cpp 2015-11-25 22:27:36.183864084 -0500
+++ numptyphysics-9999/src/Os.cpp 2015-11-25 22:29:17.177331313 -0500
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/numptyphysics/files/
@ 2017-11-01 20:41 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2017-11-01 20:41 UTC (permalink / raw
To: gentoo-commits
commit: 929748ec0cc50a36dca9b64fe1a06eca15818fef
Author: Sobhan Mohammadpour <www.sobhan.mohammadpour <AT> gmail <DOT> com>
AuthorDate: Sun Aug 20 02:47:26 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 1 20:41:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929748ec
games-puzzle/numptyphysics: fix patch
Closes: https://github.com/gentoo/gentoo/pull/5485
.../files/numptyphysics-9999-gentoo.patch | 52 +++++++---------------
1 file changed, 16 insertions(+), 36 deletions(-)
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
index 22b5798fc5f..e1276a86edd 100644
--- a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
+++ b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
@@ -1,18 +1,7 @@
-diff -ru numptyphysics-9999.orig/external/Box2D/Source/Makefile numptyphysics-9999/external/Box2D/Source/Makefile
---- numptyphysics-9999.orig/external/Box2D/Source/Makefile 2015-11-25 22:27:36.155865064 -0500
-+++ numptyphysics-9999/external/Box2D/Source/Makefile 2015-11-25 22:28:12.924578877 -0500
-@@ -6,8 +6,6 @@
- TARGETS += Gen/nds-float/lib/libbox2d.a Gen/nds-fixed/lib/libbox2d.a
- endif
-
--CXXFLAGS= -g -O2
--
- SOURCES = \
- ./Dynamics/b2Body.cpp \
- ./Dynamics/b2Island.cpp \
-diff -ru numptyphysics-9999.orig/external/glaserl/makefile numptyphysics-9999/external/glaserl/makefile
---- numptyphysics-9999.orig/external/glaserl/makefile 2015-11-25 22:27:36.156865029 -0500
-+++ numptyphysics-9999/external/glaserl/makefile 2015-11-25 22:28:12.924578877 -0500
+diff --git a/external/glaserl/makefile b/external/glaserl/makefile
+index 4120459..f49d9e7 100644
+--- a/external/glaserl/makefile
++++ b/external/glaserl/makefile
@@ -1,7 +1,5 @@
TARGET := libglaserl.a
@@ -21,9 +10,10 @@ diff -ru numptyphysics-9999.orig/external/glaserl/makefile numptyphysics-9999/ex
SOURCES := $(wildcard *.c)
OBJECTS := $(SOURCES:.c=.o)
-diff -ru numptyphysics-9999.orig/makefile numptyphysics-9999/makefile
---- numptyphysics-9999.orig/makefile 2015-11-25 22:27:36.167864644 -0500
-+++ numptyphysics-9999/makefile 2015-11-25 22:28:12.925578842 -0500
+diff --git a/makefile b/makefile
+index 0f9a9b6..292b759 100644
+--- a/makefile
++++ b/makefile
@@ -1,7 +1,6 @@
APP := numptyphysics
@@ -32,30 +22,20 @@ diff -ru numptyphysics-9999.orig/makefile numptyphysics-9999/makefile
all: app
-@@ -13,7 +12,7 @@
+@@ -13,7 +12,7 @@ app: $(TARGET)
$(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- $(SILENTMSG) "\tLD\t$@"
+ $(SILENTMSG) "\tLD\t$@\n"
- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
+ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
clean: $(ADDITIONAL_CLEAN_TARGETS)
- $(SILENTMSG) "\tCLEAN"
-diff -ru numptyphysics-9999.orig/mk/silent.mk numptyphysics-9999/mk/silent.mk
---- numptyphysics-9999.orig/mk/silent.mk 2015-11-25 22:27:36.168864609 -0500
-+++ numptyphysics-9999/mk/silent.mk 2015-11-25 22:28:12.925578842 -0500
-@@ -2,6 +2,6 @@
- SILENTMSG := @true
- SILENTCMD :=
- else
-- SILENTMSG := @echo
-+ SILENTMSG := @echo -e
- SILENTCMD := @
- endif
-diff -ru numptyphysics-9999.orig/src/Os.cpp numptyphysics-9999/src/Os.cpp
---- numptyphysics-9999.orig/src/Os.cpp 2015-11-25 22:27:36.183864084 -0500
-+++ numptyphysics-9999/src/Os.cpp 2015-11-25 22:29:17.177331313 -0500
-@@ -262,5 +262,5 @@
+ $(SILENTMSG) "\tCLEAN\n"
+diff --git a/src/Os.cpp b/src/Os.cpp
+index b5d7fb9..6a0ccf4 100644
+--- a/src/Os.cpp
++++ b/src/Os.cpp
+@@ -262,5 +262,5 @@ Os::globalDataDir()
}
// System-wide installation
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/numptyphysics/files/
@ 2018-05-27 16:14 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-05-27 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 94e304580d552125d60d6fa5bae97d5a0939c028
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 16:11:50 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:14:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e30458
games-puzzle/numptyphysics: Drop old
Package-Manager: Portage-2.3.38, Repoman-2.3.9
.../files/numptyphysics-9999-gentoo.patch | 44 ----------------------
1 file changed, 44 deletions(-)
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
deleted file mode 100644
index e1276a86edd..00000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/external/glaserl/makefile b/external/glaserl/makefile
-index 4120459..f49d9e7 100644
---- a/external/glaserl/makefile
-+++ b/external/glaserl/makefile
-@@ -1,7 +1,5 @@
- TARGET := libglaserl.a
-
--CFLAGS += -g -O2
--
- SOURCES := $(wildcard *.c)
- OBJECTS := $(SOURCES:.c=.o)
-
-diff --git a/makefile b/makefile
-index 0f9a9b6..292b759 100644
---- a/makefile
-+++ b/makefile
-@@ -1,7 +1,6 @@
- APP := numptyphysics
-
- SOURCES := $(wildcard src/*.cpp)
--CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
-
- all: app
-
-@@ -13,7 +12,7 @@ app: $(TARGET)
-
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- $(SILENTMSG) "\tLD\t$@\n"
-- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
-
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- $(SILENTMSG) "\tCLEAN\n"
-diff --git a/src/Os.cpp b/src/Os.cpp
-index b5d7fb9..6a0ccf4 100644
---- a/src/Os.cpp
-+++ b/src/Os.cpp
-@@ -262,5 +262,5 @@ Os::globalDataDir()
- }
-
- // System-wide installation
-- return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
-+ return "@GENTOO_DATADIR@";
- }
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-27 16:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-27 16:14 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/numptyphysics/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2017-11-01 20:41 James Le Cuirot
2015-11-28 7:38 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox