summaryrefslogtreecommitdiff
path: root/games-puzzle/numptyphysics/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /games-puzzle/numptyphysics/files
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'games-puzzle/numptyphysics/files')
-rw-r--r--games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch44
-rw-r--r--games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch13
2 files changed, 13 insertions, 44 deletions
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
deleted file mode 100644
index e3a7b2ee372f..000000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-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 "/usr/share/numptyphysics/data";
- }
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
new file mode 100644
index 000000000000..9a739ed5227c
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 8125a48..0ee4942 100644
+--- a/makefile
++++ b/makefile
+@@ -37,7 +37,7 @@ $(OBJECTS): $(GENERATED_HEADERS)
+
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ $(SILENTMSG) "\tLD\t$@\n"
+- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+ $(SILENTMSG) "\tCLEAN\n"