summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-11-28 02:37:45 -0500
committerMichael Sterrett <mr_bones_@gentoo.org>2015-11-28 02:38:13 -0500
commitfe349ba006d0bbbebceb193900c2f07571cc7692 (patch)
treea55e336ae90032ba1c7e8028f2dfc6cf5307fc2b
parentsys-apps/pkgcore: update zsh completions location (diff)
downloadgentoo-fe349ba006d0bbbebceb193900c2f07571cc7692.tar.gz
gentoo-fe349ba006d0bbbebceb193900c2f07571cc7692.tar.bz2
gentoo-fe349ba006d0bbbebceb193900c2f07571cc7692.zip
update patch to mesh with upstream
Package-Manager: portage-2.2.20.1
-rw-r--r--games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch15
1 files changed, 0 insertions, 15 deletions
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-9999-gentoo.patch
index 25b4475d78b0..22b5798fc5f3 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