1 |
commit: cdf85e47c763e8c81cafa24b1c9a0f880cd208cb |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 8 17:39:54 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 8 19:31:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf85e47 |
7 |
|
8 |
games-rpg/egoboo: rebase patch to drop edos2unix |
9 |
|
10 |
edos2unix was only to accomodate a patch with wrong line terminators. |
11 |
|
12 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
13 |
|
14 |
games-rpg/egoboo/egoboo-2.8.1-r1.ebuild | 5 +- |
15 |
games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch | 93 ++++++++++-------------- |
16 |
2 files changed, 38 insertions(+), 60 deletions(-) |
17 |
|
18 |
diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild |
19 |
index f1770edacd1..13cf1806ff6 100644 |
20 |
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild |
21 |
+++ b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild |
22 |
@@ -3,7 +3,7 @@ |
23 |
|
24 |
EAPI=6 |
25 |
|
26 |
-inherit desktop edos2unix |
27 |
+inherit desktop |
28 |
|
29 |
DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack" |
30 |
HOMEPAGE="http://egoboo.sourceforge.net/" |
31 |
@@ -29,9 +29,6 @@ PATCHES=( |
32 |
) |
33 |
|
34 |
src_prepare() { |
35 |
- edos2unix src/game/platform/file_linux.c \ |
36 |
- src/game/network.c \ |
37 |
- src/game/Makefile |
38 |
default |
39 |
sed -i \ |
40 |
-e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \ |
41 |
|
42 |
diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch |
43 |
index 2f1205a4511..36e8adf6dc7 100644 |
44 |
--- a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch |
45 |
+++ b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch |
46 |
@@ -1,56 +1,37 @@ |
47 |
---- a/src/game/platform/file_linux.c 2012-04-29 21:45:29.627419281 +0200 |
48 |
-+++ b/src/game/platform/file_linux.c 2012-04-29 21:45:29.628419211 +0200 |
49 |
-@@ -79,9 +79,9 @@ |
50 |
- strncpy( linux_dataPath, PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) ); |
51 |
- #else |
52 |
- // these are read-only directories |
53 |
-- strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( linux_configPath ) ); |
54 |
-+ strncpy( linux_configPath, "@GENTOO_CONFDIR@", SDL_arraysize( linux_configPath ) ); |
55 |
- strncpy( linux_binaryPath, "/games/", SDL_arraysize( linux_binaryPath ) ); |
56 |
-- strncpy( linux_dataPath, "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) ); |
57 |
-+ strncpy( linux_dataPath, "@GENTOO_DATADIR@", SDL_arraysize( linux_dataPath ) ); |
58 |
- #endif |
59 |
- |
60 |
- // the log file cannot be started until there is a user data path to dump the file into |
61 |
---- a/src/game/network.c 2012-04-29 20:14:31.482179973 +0200 |
62 |
-+++ b/src/game/network.c 2012-04-29 20:14:52.077730184 +0200 |
63 |
-@@ -37,7 +37,7 @@ |
64 |
- #include "egoboo_setup.h" |
65 |
- #include "egoboo.h" |
66 |
- |
67 |
--#include "enet/enet.h" |
68 |
-+#include <enet/enet.h> |
69 |
- #include "file_common.h" |
70 |
- |
71 |
- #include <stdarg.h> |
72 |
---- a/src/game/Makefile 2012-04-29 20:17:09.303070070 +0200 |
73 |
-+++ b/src/game/Makefile 2012-04-29 20:18:21.047023847 +0200 |
74 |
-@@ -33,8 +33,7 @@ |
75 |
- # the compiler options |
76 |
- |
77 |
--CC := gcc |
78 |
--INC := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions -I./file_formats -I./platform |
79 |
--LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet |
80 |
-+INC := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform |
81 |
-+LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet -lm |
82 |
- |
83 |
- # use different options if the environmental variable PREFIX is defined |
84 |
- ifdef ($(PREFIX),"") |
85 |
-@@ -43,7 +43,7 @@ |
86 |
- OPT := -Os -Wall -DPREFIX=\"${PREFIX}\" -D_NIX_PREFIX |
87 |
- endif |
88 |
- |
89 |
--CFLAGS := ${OPT} ${INC} |
90 |
-+CFLAGS += ${INC} -DENET11 |
91 |
- |
92 |
- #------------------------------------ |
93 |
- # definitions of the target projects |
94 |
-@@ -52,7 +52,7 @@ |
95 |
- all: ${EGO_BIN} |
96 |
- |
97 |
- ${EGO_BIN}: ${EGO_OBJ} |
98 |
-- ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} |
99 |
-+ ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS} |
100 |
- |
101 |
- clean: |
102 |
- rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN} |
103 |
+--- a/src/game/Makefile |
104 |
++++ b/src/game/Makefile |
105 |
+@@ -34,5 +34,4 @@ |
106 |
+ |
107 |
+-CC := gcc |
108 |
+-INC := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions -I./file_formats -I./platform |
109 |
+-LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet |
110 |
++INC := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform |
111 |
++LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet -lm |
112 |
+ |
113 |
+@@ -45,3 +44,3 @@ |
114 |
+ |
115 |
+-CFLAGS := ${OPT} ${INC} |
116 |
++CFLAGS += ${INC} -DENET11 |
117 |
+ |
118 |
+@@ -55,3 +54,3 @@ |
119 |
+ ${EGO_BIN}: ${EGO_OBJ} |
120 |
+- ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} |
121 |
++ ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS} |
122 |
+ |
123 |
+--- a/src/game/network.c |
124 |
++++ b/src/game/network.c |
125 |
+@@ -39,3 +39,3 @@ |
126 |
+ |
127 |
+-#include "enet/enet.h" |
128 |
++#include <enet/enet.h> |
129 |
+ #include "file_common.h" |
130 |
+--- a/src/game/platform/file_linux.c |
131 |
++++ b/src/game/platform/file_linux.c |
132 |
+@@ -81,5 +81,5 @@ |
133 |
+ // these are read-only directories |
134 |
+- strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( linux_configPath ) ); |
135 |
++ strncpy( linux_configPath, "@GENTOO_CONFDIR@", SDL_arraysize( linux_configPath ) ); |
136 |
+ strncpy( linux_binaryPath, "/games/", SDL_arraysize( linux_binaryPath ) ); |
137 |
+- strncpy( linux_dataPath, "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) ); |
138 |
++ strncpy( linux_dataPath, "@GENTOO_DATADIR@", SDL_arraysize( linux_dataPath ) ); |
139 |
+ #endif |