1 |
commit: 8117e2672f9679006338e1d77f9e2a2f749b5510 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 21 14:01:36 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 21 14:01:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8117e267 |
7 |
|
8 |
games-misc/yadex: Remove last-rited package |
9 |
|
10 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
11 |
|
12 |
games-misc/yadex/Manifest | 4 - |
13 |
games-misc/yadex/files/yadex-1.7.0-64bit.patch | 161 --------------------- |
14 |
.../yadex/files/yadex-1.7.0-NULL-is-not-zero.patch | 11 -- |
15 |
games-misc/yadex/files/yadex-1.7.0-datadir.patch | 55 ------- |
16 |
games-misc/yadex/files/yadex-1.7.0-destdir.patch | 36 ----- |
17 |
games-misc/yadex/files/yadex-1.7.0-elif.patch | 11 -- |
18 |
.../yadex/files/yadex_170-obj-overflow.patch | 22 --- |
19 |
games-misc/yadex/files/yadex_170_O2.patch | 14 -- |
20 |
games-misc/yadex/files/yadex_170_wm.patch | 49 ------- |
21 |
games-misc/yadex/metadata.xml | 8 - |
22 |
games-misc/yadex/yadex-1.7.0-r1.ebuild | 61 -------- |
23 |
profiles/package.mask | 5 - |
24 |
12 files changed, 437 deletions(-) |
25 |
|
26 |
diff --git a/games-misc/yadex/Manifest b/games-misc/yadex/Manifest |
27 |
deleted file mode 100644 |
28 |
index ddee652d22c..00000000000 |
29 |
--- a/games-misc/yadex/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,4 +0,0 @@ |
32 |
-DIST Yadex_170_ALL.diff 73652 BLAKE2B dfead81153d0674d70d6e27b27e5abf0f4834c1e10d874d2c6148b4715539646b1cdf7d65f669413f4814f65e838e1f7031f221ba0baa3f7b248305e3fbe0598 SHA512 0879fa5f62e395d53ee9a004b116fbc0180178f41099876d7fea159c9ced25a54218be787d155895e74707e70a2c2e48f752dcf86aec4d1a8f41f96e2bcbe279 |
33 |
-DIST yadex-1.7.0-mrmeval-differential-patch.patch 128529 BLAKE2B 500df2ed4173f39313416728a70e6fe2823ec604c8ab63076058944cfe83ba8a584276a77ee87a0ac46e635484a2215c96c068e0ee231698b683cb0c65c0f391 SHA512 4ec1d9c452db88dd42c145c04e2ec3f9958e7a462eaa14512cffb57ede1f263d375105917845f52e76e7eb171476d4f44bd95dd8615131ca9fdaf6e229cb53fc |
34 |
-DIST yadex-1.7.0.tar.gz 551318 BLAKE2B c5655c190466419505691762bb6b6641a61f68d80bc8a06f0e600a1e4a562b4989179400a2185104994971eeb55105e5f3691d6286c7431147b97cef0d00b3a2 SHA512 017f0ffc21b7b49e25e81a16c5badc3159f0b34954e278d658175da51b7ecf1e15e12579a244530afb10e133c890761d78c1f1a209a800887c145c5c1af5d317 |
35 |
-DIST yadex.png 2229 BLAKE2B 4559d8b134b58231b062e18b0e151a952a42748c7b2ddc9db64fa6456a37b0f4839d92eae92dec66085b1ad5f46f3d50082cd9398cc68713fec431d3e3ee946c SHA512 290cee14dea91ca4fb618f00575351b77b7c63ec155256274f83707d1f457cf4e7a921803203c75b371dc688d2ee90890f943ce3744987840aa1c5e0b5d977ee |
36 |
|
37 |
diff --git a/games-misc/yadex/files/yadex-1.7.0-64bit.patch b/games-misc/yadex/files/yadex-1.7.0-64bit.patch |
38 |
deleted file mode 100644 |
39 |
index 7f6b84216e5..00000000000 |
40 |
--- a/games-misc/yadex/files/yadex-1.7.0-64bit.patch |
41 |
+++ /dev/null |
42 |
@@ -1,161 +0,0 @@ |
43 |
-diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile |
44 |
---- yadex-1.7.0/GNUmakefile 2006-03-16 20:33:36.000000000 -0800 |
45 |
-+++ yadex-1.7.0.new/GNUmakefile 2006-03-16 18:37:50.000000000 -0800 |
46 |
-@@ -53,6 +53,7 @@ |
47 |
- |
48 |
- # Which OS ? |
49 |
- OS := $(shell uname -s | tr A-Z a-z) |
50 |
-+ARCH := $(shell uname -i | tr A-Z a-z) |
51 |
- |
52 |
- # Where your X11 libraries and headers reside. |
53 |
- # Current rule: |
54 |
-@@ -67,7 +68,11 @@ |
55 |
- X11LIBDIR = /usr/openwin/lib |
56 |
- X11INCLUDEDIR = /usr/openwin/include |
57 |
- else |
58 |
-- X11LIBDIR = /usr/X11R6/lib |
59 |
-+ ifeq ($(findstring $(ARCH), x86_64), $(ARCH)) |
60 |
-+ X11LIBDIR = /usr/X11R6/lib64 |
61 |
-+ else |
62 |
-+ X11LIBDIR = /usr/X11R6/lib |
63 |
-+ endif |
64 |
- X11INCLUDEDIR = /usr/X11R6/include |
65 |
- endif |
66 |
- endif |
67 |
-diff -Naur yadex-1.7.0/src/levels.cc yadex-1.7.0.new/src/levels.cc |
68 |
---- yadex-1.7.0/src/levels.cc 2003-03-28 04:37:32.000000000 -0800 |
69 |
-+++ yadex-1.7.0.new/src/levels.cc 2006-03-16 20:38:01.000000000 -0800 |
70 |
-@@ -1387,7 +1387,7 @@ |
71 |
- } |
72 |
- NumWTexture = (int) val + 1; |
73 |
- /* read in the offsets for texture1 names */ |
74 |
-- offsets = (i32 *) GetMemory ((long) NumWTexture * 4); |
75 |
-+ offsets = (i32 *) GetMemory ((long) NumWTexture * (sizeof(i32))); |
76 |
- wf->read_i32 (offsets + 1, NumWTexture - 1); |
77 |
- if (wf->error ()) |
78 |
- { |
79 |
-@@ -1445,7 +1445,7 @@ |
80 |
- } |
81 |
- NumWTexture = (int) val + 1; |
82 |
- /* read in the offsets for texture1 names */ |
83 |
-- offsets = (i32 *) GetMemory ((long) NumWTexture * 4); |
84 |
-+ offsets = (i32 *) GetMemory ((long) NumWTexture * sizeof(i32)); |
85 |
- wf->read_i32 (offsets + 1, NumWTexture - 1); |
86 |
- { |
87 |
- // FIXME |
88 |
-@@ -1489,7 +1489,7 @@ |
89 |
- // FIXME |
90 |
- } |
91 |
- /* read in the offsets for texture2 names */ |
92 |
-- offsets = (i32 *) GetMemory ((long) val * 4); |
93 |
-+ offsets = (i32 *) GetMemory ((long) val * sizeof(i32)); |
94 |
- wf->read_i32 (offsets, val); |
95 |
- if (wf->error ()) |
96 |
- { |
97 |
-diff -Naur yadex-1.7.0/src/pic2img.cc yadex-1.7.0.new/src/pic2img.cc |
98 |
---- yadex-1.7.0/src/pic2img.cc 2003-03-28 04:37:32.000000000 -0800 |
99 |
-+++ yadex-1.7.0.new/src/pic2img.cc 2006-03-16 20:30:40.000000000 -0800 |
100 |
-@@ -192,7 +192,7 @@ |
101 |
- |
102 |
- ColumnData = (u8 *) GetMemory (TEX_COLUMNBUFFERSIZE); |
103 |
- /* FIXME DOS and pic_width_ > 16000 */ |
104 |
--NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * 4); |
105 |
-+NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * (sizeof(i32))); |
106 |
- |
107 |
- if (long_offsets) |
108 |
- dir->wadfile->read_i32 (NeededOffsets, pic_width_); |
109 |
-diff -Naur yadex-1.7.0/src/r_images.cc yadex-1.7.0.new/src/r_images.cc |
110 |
---- yadex-1.7.0/src/r_images.cc 2006-03-16 20:33:12.000000000 -0800 |
111 |
-+++ yadex-1.7.0.new/src/r_images.cc 2006-03-16 20:39:17.000000000 -0800 |
112 |
-@@ -182,7 +182,7 @@ |
113 |
- dir->wadfile->seek (dir->dir.start); |
114 |
- dir->wadfile->read_i32 (&numtex); |
115 |
- /* read in the offsets for texture1 names and info. */ |
116 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
117 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
118 |
- dir->wadfile->read_i32 (offsets, numtex); |
119 |
- for (n = 0; n < numtex && !texofs; n++) |
120 |
- { |
121 |
-@@ -205,7 +205,7 @@ |
122 |
- dir->wadfile->seek (dir->dir.start); |
123 |
- dir->wadfile->read_i32 (&numtex); |
124 |
- /* read in the offsets for texture1 names and info. */ |
125 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
126 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
127 |
- dir->wadfile->read_i32 (offsets, numtex); |
128 |
- for (n = 0; n < numtex && !texofs; n++) |
129 |
- { |
130 |
-@@ -225,7 +225,7 @@ |
131 |
- dir->wadfile->seek (dir->dir.start); |
132 |
- dir->wadfile->read_i32 (&numtex); |
133 |
- /* read in the offsets for texture2 names */ |
134 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
135 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
136 |
- dir->wadfile->read_i32 (offsets, numtex); |
137 |
- for (n = 0; n < numtex && !texofs; n++) |
138 |
- { |
139 |
-diff -Naur yadex-1.7.0/src/textures.cc yadex-1.7.0.new/src/textures.cc |
140 |
---- yadex-1.7.0/src/textures.cc 2003-04-24 13:50:36.000000000 -0700 |
141 |
-+++ yadex-1.7.0.new/src/textures.cc 2006-03-16 20:38:44.000000000 -0800 |
142 |
-@@ -177,7 +177,7 @@ |
143 |
- goto textures_done; |
144 |
- } |
145 |
- // Read in the offsets for texture1 names and info |
146 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
147 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
148 |
- wf->read_i32 (offsets, numtex); |
149 |
- if (wf->error ()) |
150 |
- { |
151 |
-@@ -233,7 +233,7 @@ |
152 |
- goto texture1_done; |
153 |
- } |
154 |
- // Read in the offsets for texture1 names and info |
155 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
156 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
157 |
- wf->read_i32 (offsets, numtex); |
158 |
- if (wf->error ()) |
159 |
- { |
160 |
-@@ -286,7 +286,7 @@ |
161 |
- goto texture2_done; |
162 |
- } |
163 |
- // Read in the offsets for TEXTURE2 names |
164 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
165 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
166 |
- wf->read_i32 (offsets, numtex); |
167 |
- if (wf->error ()) |
168 |
- { |
169 |
-@@ -514,7 +514,7 @@ |
170 |
- dir->wadfile->seek (dir->dir.start); |
171 |
- dir->wadfile->read_i32 (&numtex); |
172 |
- // Read in the offsets for texture1 names and info |
173 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
174 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
175 |
- dir->wadfile->read_i32 (offsets, numtex); |
176 |
- for (n = 0; n < numtex && !texofs; n++) |
177 |
- { |
178 |
-@@ -534,7 +534,7 @@ |
179 |
- dir->wadfile->seek (dir->dir.start); |
180 |
- dir->wadfile->read_i32 (&numtex); |
181 |
- // Read in the offsets for texture2 names |
182 |
-- offsets = (i32 *) GetMemory ((long) numtex * 4); |
183 |
-+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32)); |
184 |
- dir->wadfile->read_i32 (offsets); |
185 |
- for (n = 0; n < numtex && !texofs; n++) |
186 |
- { |
187 |
-diff -Naur yadex-1.7.0/src/yadex.h yadex-1.7.0.new/src/yadex.h |
188 |
---- yadex-1.7.0/src/yadex.h 2006-03-16 20:33:12.000000000 -0800 |
189 |
-+++ yadex-1.7.0.new/src/yadex.h 2006-03-16 20:29:15.000000000 -0800 |
190 |
-@@ -98,11 +98,11 @@ |
191 |
- #define F_I16_D "hd" |
192 |
- #define F_I16_H "hX" |
193 |
- |
194 |
--typedef unsigned long u32; |
195 |
-+typedef unsigned int u32; |
196 |
- #define F_U32_D "lu" |
197 |
- #define F_U32_H "lX" |
198 |
- |
199 |
--typedef signed long i32; |
200 |
-+typedef signed int i32; |
201 |
- #define F_I32_D "ld" |
202 |
- #define F_I32_H "lX" |
203 |
- |
204 |
|
205 |
diff --git a/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch b/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch |
206 |
deleted file mode 100644 |
207 |
index 7ceb7a55887..00000000000 |
208 |
--- a/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch |
209 |
+++ /dev/null |
210 |
@@ -1,11 +0,0 @@ |
211 |
---- yadex-1.7.0/src/wadlist.cc.old 2003-01-29 14:45:19.000000000 -0700 |
212 |
-+++ yadex-1.7.0/src/wadlist.cc 2003-01-29 14:45:56.000000000 -0700 |
213 |
-@@ -175,7 +175,7 @@ |
214 |
- priv->iter = priv->list.erase (i); |
215 |
- if (priv->iter == priv->list.begin ()) |
216 |
- { |
217 |
-- priv->iter = 0; // Catch bugs |
218 |
-+ priv->iter = (std::_List_iterator<boost::shared_ptr<Wad_file> >)NULL; // Catch bugs |
219 |
- priv->rewound = true; |
220 |
- } |
221 |
- } |
222 |
|
223 |
diff --git a/games-misc/yadex/files/yadex-1.7.0-datadir.patch b/games-misc/yadex/files/yadex-1.7.0-datadir.patch |
224 |
deleted file mode 100644 |
225 |
index f7b2ab5fb7e..00000000000 |
226 |
--- a/games-misc/yadex/files/yadex-1.7.0-datadir.patch |
227 |
+++ /dev/null |
228 |
@@ -1,55 +0,0 @@ |
229 |
-diff -Naur yadex-1.7.0/configure yadex-1.7.0.new/configure |
230 |
---- yadex-1.7.0/configure 2006-03-16 18:49:20.000000000 -0800 |
231 |
-+++ yadex-1.7.0.new/configure 2006-03-16 16:36:21.000000000 -0800 |
232 |
-@@ -408,16 +408,16 @@ |
233 |
- ETCDIR=/etc/$APPNAME/%v |
234 |
- ETCDIRNV=/etc/$APPNAME |
235 |
- MANDIR=/usr/share/man |
236 |
-- SHAREDIR=/usr/share/games/$APPNAME/%v |
237 |
-- SHAREDIRNV=/usr/share/games/$APPNAME |
238 |
-+ SHAREDIR=/usr/share/$APPNAME/%v |
239 |
-+ SHAREDIRNV=/usr/share/$APPNAME |
240 |
- elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null |
241 |
- then |
242 |
- BINDIR=/usr/local/bin # FHS-ly correct is /usr/local/games |
243 |
- ETCDIR=/etc/$APPNAME/%v |
244 |
- ETCDIRNV=/etc/$APPNAME |
245 |
- MANDIR=/usr/local/man |
246 |
-- SHAREDIR=/usr/local/share/games/$APPNAME/%v |
247 |
-- SHAREDIRNV=/usr/local/share/games/$APPNAME |
248 |
-+ SHAREDIR=/usr/local/share/$APPNAME/%v |
249 |
-+ SHAREDIRNV=/usr/local/share/$APPNAME |
250 |
- elif expr "$PREFIX" : '//*opt/*$' >/dev/null |
251 |
- then |
252 |
- echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2 |
253 |
-diff -Naur yadex-1.7.0/yadex.cfg yadex-1.7.0.new/yadex.cfg |
254 |
---- yadex-1.7.0/yadex.cfg 2006-03-16 18:49:20.000000000 -0800 |
255 |
-+++ yadex-1.7.0.new/yadex.cfg 2006-03-16 18:49:43.000000000 -0800 |
256 |
-@@ -20,16 +20,17 @@ |
257 |
- # 9 doompr Doom press release pre-beta (/pub/idgames/historic/doomprbt.zip) |
258 |
- # 10 strife10 Strife 1.0 (demo or commercial) |
259 |
- |
260 |
-- iwad1 = /usr/local/share/games/doom/doom.wad |
261 |
-- iwad2 = /usr/local/share/games/doom2/doom2.wad |
262 |
-- iwad3 = /usr/local/share/games/heretic/heretic.wad |
263 |
-- iwad4 = /usr/local/share/games/hexen/hexen.wad |
264 |
-- iwad5 = /usr/local/share/games/strife/strife1.wad |
265 |
-- iwad6 = /usr/local/share/games/doom02/doom.wad |
266 |
-- iwad7 = /usr/local/share/games/doom04/doom.wad |
267 |
-- iwad8 = /usr/local/share/games/doom05/doom.wad |
268 |
-- iwad9 = /usr/local/share/games/doompr/doompres.wad |
269 |
-- iwad10 = /usr/local/share/games/strife10/strife1.wad |
270 |
-+ iwad1 = /usr/share/doom/doom.wad |
271 |
-+# iwad2 = /usr/share/doom/doom2.wad |
272 |
-+ iwad2 = /usr/share/doom/freedoom.wad |
273 |
-+ iwad3 = /usr/share/doom/heretic.wad |
274 |
-+ iwad4 = /usr/share/doom/hexen.wad |
275 |
-+ iwad5 = /usr/share/doom/strife1.wad |
276 |
-+ iwad6 = /usr/share/doom/doom.wad |
277 |
-+ iwad7 = /usr/share/doom/doom.wad |
278 |
-+ iwad8 = /usr/share/doom/doom.wad |
279 |
-+ iwad9 = /usr/share/doom/doompres.wad |
280 |
-+ iwad10 = /usr/share/doom/strife1.wad |
281 |
- |
282 |
- # Name of the patch wads you want to load. None by default. |
283 |
- |
284 |
|
285 |
diff --git a/games-misc/yadex/files/yadex-1.7.0-destdir.patch b/games-misc/yadex/files/yadex-1.7.0-destdir.patch |
286 |
deleted file mode 100644 |
287 |
index a1f430c4bd9..00000000000 |
288 |
--- a/games-misc/yadex/files/yadex-1.7.0-destdir.patch |
289 |
+++ /dev/null |
290 |
@@ -1,36 +0,0 @@ |
291 |
-diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile |
292 |
---- yadex-1.7.0/GNUmakefile 2006-03-16 16:08:10.000000000 -0800 |
293 |
-+++ yadex-1.7.0.new/GNUmakefile 2006-03-16 16:11:32.000000000 -0800 |
294 |
-@@ -392,19 +392,19 @@ |
295 |
- |
296 |
- .PHONY: install |
297 |
- install: $(OBJDIR)/install |
298 |
-- @scripts/mkinstalldirs $(BINDIR) |
299 |
-- @scripts/mkinstalldirs $(ETCDIR) |
300 |
-- @scripts/mkinstalldirs $(MANDIR) |
301 |
-- @scripts/mkinstalldirs $(MANDIR)/man6 |
302 |
-- @scripts/mkinstalldirs $(SHAREDIR) |
303 |
-- $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION) |
304 |
-- rm -f $(BINDIR)/yadex |
305 |
-- ln -s yadex-$(VERSION) $(BINDIR)/yadex |
306 |
-- $(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6 |
307 |
-- rm -f $(MANDIR)/man6/yadex.6 |
308 |
-- ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6 |
309 |
-- $(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD) |
310 |
-- $(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg |
311 |
-+ @scripts/mkinstalldirs $(DESTDIR)$(BINDIR) |
312 |
-+ @scripts/mkinstalldirs $(DESTDIR)$(ETCDIR) |
313 |
-+ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR) |
314 |
-+ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6 |
315 |
-+ @scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR) |
316 |
-+ $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(DESTDIR)$(BINDIR)/yadex-$(VERSION) |
317 |
-+ rm -f $(DESTDIR)$(BINDIR)/yadex |
318 |
-+ ln -s yadex-$(VERSION) $(DESTDIR)$(BINDIR)/yadex |
319 |
-+ $(OBJDIR)/install -m 644 doc/yadex.6 $(DESTDIR)$(MANDIR)/man6/yadex-$(VERSION).6 |
320 |
-+ rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6 |
321 |
-+ ln -s yadex-$(VERSION).6 $(DESTDIR)$(MANDIR)/man6/yadex.6 |
322 |
-+ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD) |
323 |
-+ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg |
324 |
- @echo "---------------------------------------------------------------" |
325 |
- @echo " Yadex is now installed." |
326 |
- @echo |
327 |
|
328 |
diff --git a/games-misc/yadex/files/yadex-1.7.0-elif.patch b/games-misc/yadex/files/yadex-1.7.0-elif.patch |
329 |
deleted file mode 100644 |
330 |
index 6674d5becdc..00000000000 |
331 |
--- a/games-misc/yadex/files/yadex-1.7.0-elif.patch |
332 |
+++ /dev/null |
333 |
@@ -1,11 +0,0 @@ |
334 |
---- a/src/gfx.cc.old 2009-08-01 18:47:46.000000000 +0200 |
335 |
-+++ b/src/gfx.cc 2009-08-01 18:46:03.000000000 +0200 |
336 |
-@@ -310,7 +310,7 @@ |
337 |
- win_vis_id = vis_info->visualid; |
338 |
- #if defined _cplusplus || defined __cplusplus |
339 |
- win_vis_class = vis_info->c_class; |
340 |
--#elif |
341 |
-+#else |
342 |
- win_vis_class = vis_info->class; |
343 |
- #endif |
344 |
- win_ncolours = vis_info->colormap_size; |
345 |
|
346 |
diff --git a/games-misc/yadex/files/yadex_170-obj-overflow.patch b/games-misc/yadex/files/yadex_170-obj-overflow.patch |
347 |
deleted file mode 100644 |
348 |
index aba86f1e0e0..00000000000 |
349 |
--- a/games-misc/yadex/files/yadex_170-obj-overflow.patch |
350 |
+++ /dev/null |
351 |
@@ -1,22 +0,0 @@ |
352 |
---- yadex-1.7.0/src/objects.cc 2003-03-28 06:37:32.000000000 -0600 |
353 |
-+++ yadex-1.7.0/src/objects.cc 2010-05-06 11:42:36.824661556 -0500 |
354 |
-@@ -543,7 +543,7 @@ |
355 |
- SideDefs[last].yoff = 0; |
356 |
- strcpy (SideDefs[last].tex1, "-"); |
357 |
- strcpy (SideDefs[last].tex2, "-"); |
358 |
-- strcpy (SideDefs[last].tex3, default_middle_texture); |
359 |
-+ strncpy (SideDefs[last].tex3, default_middle_texture, sizeof(SideDefs[last].tex3)); |
360 |
- SideDefs[last].sector = NumSectors - 1; |
361 |
- } |
362 |
- MadeMapChanges = 1; |
363 |
---- yadex-1.7.0/src/editobj.cc 2003-04-24 15:32:39.000000000 -0500 |
364 |
-+++ yadex-1.7.0/src/editobj.cc 2010-05-07 16:36:49.825412601 -0500 |
365 |
-@@ -937,7 +937,7 @@ |
366 |
- struct SideDef *s = SideDefs + l->sidedef1; |
367 |
- strcpy (s->tex1, "-"); |
368 |
- strcpy (s->tex2, "-"); |
369 |
-- strcpy (s->tex3, default_middle_texture); |
370 |
-+ strncpy (s->tex3, default_middle_texture, sizeof(s->tex3)); |
371 |
- } |
372 |
- /* Don't delete the 2nd sidedef, it could be used |
373 |
- by another linedef. And if it isn't, the next |
374 |
|
375 |
diff --git a/games-misc/yadex/files/yadex_170_O2.patch b/games-misc/yadex/files/yadex_170_O2.patch |
376 |
deleted file mode 100644 |
377 |
index 5ef90ca9425..00000000000 |
378 |
--- a/games-misc/yadex/files/yadex_170_O2.patch |
379 |
+++ /dev/null |
380 |
@@ -1,14 +0,0 @@ |
381 |
-diff -dupr yadex-1.7.901-patched/src/pic2img.cc yadex-1.7.901/src/pic2img.cc |
382 |
---- yadex-1.7.901-patched/src/pic2img.cc 2006-11-06 17:35:03.000000000 +0100 |
383 |
-+++ yadex-1.7.901/src/pic2img.cc 2015-11-24 09:54:25.578048649 +0100 |
384 |
-@@ -92,9 +92,9 @@ uint8_t *buf; /* This variable is s |
385 |
- should be pasted. It can be off the image buffer! */ |
386 |
- |
387 |
- // Locate the lump where the picture is |
388 |
-+ MasterDirectory dirbuf; |
389 |
- if (picloc.wad != 0) |
390 |
- { |
391 |
-- MasterDirectory dirbuf; |
392 |
- dirbuf.wadfile = picloc.wad; |
393 |
- dirbuf.dir.start = picloc.ofs; |
394 |
- dirbuf.dir.size = picloc.len; |
395 |
|
396 |
diff --git a/games-misc/yadex/files/yadex_170_wm.patch b/games-misc/yadex/files/yadex_170_wm.patch |
397 |
deleted file mode 100644 |
398 |
index 88006a28a2d..00000000000 |
399 |
--- a/games-misc/yadex/files/yadex_170_wm.patch |
400 |
+++ /dev/null |
401 |
@@ -1,49 +0,0 @@ |
402 |
-diff -dupr yadex-1.7.901-patched/src/gfx.cc yadex-1.7.901/src/gfx.cc |
403 |
---- yadex-1.7.901-patched/src/gfx.cc 2015-11-23 15:53:56.087783740 +0100 |
404 |
-+++ yadex-1.7.901/src/gfx.cc 2015-11-23 22:17:45.876127582 +0100 |
405 |
-@@ -114,6 +114,7 @@ int win_depth; // The depth of win |
406 |
- int x_server_big_endian = 0; // Is the X server big endian ? |
407 |
- int ximage_bpp; // Number of bytes per pixels in XImages |
408 |
- int ximage_quantum;// Pad XImages lines to a multiple of that many bytes |
409 |
-+Atom wm_delete; |
410 |
- static pcolour_t *app_colour = 0; // Pixel values for the app. colours |
411 |
- static int DrawingMode = 0; // 0 = copy, 1 = xor |
412 |
- static int LineThickness = 0; // 0 = thin, 1 = thick |
413 |
-@@ -471,6 +472,10 @@ int InitGfx (void) |
414 |
- | ExposureMask |
415 |
- | StructureNotifyMask); |
416 |
- |
417 |
-+ // register for message from window manager if the window is closed |
418 |
-+ wm_delete = XInternAtom(dpy, "WM_DELETE_WINDOW", False); |
419 |
-+ XSetWMProtocols(dpy, win, &wm_delete, 1); |
420 |
-+ |
421 |
- /* |
422 |
- * Possibly load and query the font |
423 |
- */ |
424 |
-diff -dupr yadex-1.7.901-patched/src/gfx.h yadex-1.7.901/src/gfx.h |
425 |
---- yadex-1.7.901-patched/src/gfx.h 2005-02-06 10:45:21.000000000 +0100 |
426 |
-+++ yadex-1.7.901/src/gfx.h 2015-11-23 22:16:10.674721105 +0100 |
427 |
-@@ -96,6 +96,7 @@ extern int win_bpp; // The depth of |
428 |
- extern int x_server_big_endian; // Is the X server big-endian ? |
429 |
- extern int ximage_bpp; // Number of bytes per pixels in XImages |
430 |
- extern int ximage_quantum; // Pad XImage lines to a mult of that many B. |
431 |
-+extern Atom wm_delete; |
432 |
- #endif // ifdef X_PROTOCOL |
433 |
- #endif // ifdef Y_X11 |
434 |
- extern int text_dot; // DrawScreenText()/DrawScreenString() debug flag |
435 |
-diff -dupr yadex-1.7.901-patched/src/input.cc yadex-1.7.901/src/input.cc |
436 |
---- yadex-1.7.901-patched/src/input.cc 2006-11-03 14:49:01.000000000 +0100 |
437 |
-+++ yadex-1.7.901/src/input.cc 2015-11-23 22:15:21.398133938 +0100 |
438 |
-@@ -413,6 +413,12 @@ switch (ev.type) |
439 |
- } |
440 |
- #endif |
441 |
- break; |
442 |
-+ |
443 |
-+ case ClientMessage: |
444 |
-+ if ((Atom)ev.xclient.data.l[0] == wm_delete) |
445 |
-+ // window has been closed, simulate ESC keypress |
446 |
-+ is.key = YK_ESC; |
447 |
-+ break; |
448 |
- } |
449 |
- } /* switch (ev.type) */ |
450 |
- } |
451 |
|
452 |
diff --git a/games-misc/yadex/metadata.xml b/games-misc/yadex/metadata.xml |
453 |
deleted file mode 100644 |
454 |
index 78274e0fa55..00000000000 |
455 |
--- a/games-misc/yadex/metadata.xml |
456 |
+++ /dev/null |
457 |
@@ -1,8 +0,0 @@ |
458 |
-<?xml version="1.0" encoding="UTF-8"?> |
459 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
460 |
-<pkgmetadata> |
461 |
-<maintainer type="project"> |
462 |
- <email>games@g.o</email> |
463 |
- <name>Gentoo Games Project</name> |
464 |
-</maintainer> |
465 |
-</pkgmetadata> |
466 |
|
467 |
diff --git a/games-misc/yadex/yadex-1.7.0-r1.ebuild b/games-misc/yadex/yadex-1.7.0-r1.ebuild |
468 |
deleted file mode 100644 |
469 |
index 6cbfd87a8ed..00000000000 |
470 |
--- a/games-misc/yadex/yadex-1.7.0-r1.ebuild |
471 |
+++ /dev/null |
472 |
@@ -1,61 +0,0 @@ |
473 |
-# Copyright 1999-2018 Gentoo Foundation |
474 |
-# Distributed under the terms of the GNU General Public License v2 |
475 |
- |
476 |
-EAPI=6 |
477 |
-inherit desktop toolchain-funcs |
478 |
- |
479 |
-DESCRIPTION="A Doom level (wad) editor" |
480 |
-HOMEPAGE="http://www.teaser.fr/~amajorel/yadex/" |
481 |
-SRC_URI="http://www.teaser.fr/~amajorel/yadex/${P}.tar.gz |
482 |
- http://www.teaser.fr/~amajorel/yadex/logo_small.png -> ${PN}.png |
483 |
- http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff |
484 |
- https://dev.gentoo.org/~pacho/${PN}/${P}-mrmeval-differential-patch.patch |
485 |
-" |
486 |
- |
487 |
-LICENSE="GPL-2" |
488 |
-SLOT="0" |
489 |
-KEYWORDS="~amd64 ~x86" |
490 |
-IUSE="" |
491 |
-RESTRICT="test" |
492 |
- |
493 |
-DEPEND="x11-libs/libX11" |
494 |
-RDEPEND="${DEPEND} |
495 |
- games-fps/freedoom |
496 |
-" |
497 |
- |
498 |
-src_prepare() { |
499 |
- default |
500 |
- |
501 |
- eapply "${DISTDIR}"/Yadex_170_ALL.diff |
502 |
- eapply "${DISTDIR}"/${P}-mrmeval-differential-patch.patch |
503 |
- eapply "${FILESDIR}"/*.patch |
504 |
- |
505 |
- # Remove bundled boost |
506 |
- rm -rf boost/ |
507 |
- # Force the patched file to be old, otherwise the compile fails |
508 |
- touch -t 197010101010 "${S}"/src/wadlist.cc |
509 |
- touch -t 197010101010 "${S}"/src/gfx.cc |
510 |
-} |
511 |
- |
512 |
-src_configure() { |
513 |
- tc-export CC CXX LD AR RANLIB |
514 |
- # not an autoconf script |
515 |
- ./configure --prefix="/usr" || die "configure failed" |
516 |
-} |
517 |
- |
518 |
-src_compile() { |
519 |
- emake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -std=gnu++03" |
520 |
-} |
521 |
- |
522 |
-src_install() { |
523 |
- dobin obj/0/yadex |
524 |
- insinto "/usr/share/${PN}/${PV}" |
525 |
- doins ygd/* |
526 |
- doman doc/yadex.6 |
527 |
- HTML_DOCS="docsrc/" einstalldocs |
528 |
- insinto /etc/yadex/${PV} |
529 |
- doins yadex.cfg |
530 |
- |
531 |
- make_desktop_entry "yadex -i2 /usr/share/doom-data/freedoom/freedm.wad" |
532 |
- doicon "${DISTDIR}"/${PN}.png |
533 |
-} |
534 |
|
535 |
diff --git a/profiles/package.mask b/profiles/package.mask |
536 |
index af0ebba22d8..232a7760ecc 100644 |
537 |
--- a/profiles/package.mask |
538 |
+++ b/profiles/package.mask |
539 |
@@ -201,11 +201,6 @@ sci-biology/allpathslg |
540 |
# and it no longer makes sense ship this as standalone pkg |
541 |
dev-util/rustfmt |
542 |
|
543 |
-# James Le Cuirot <chewi@g.o> (2019-06-18) |
544 |
-# Web site and SRC_URI dead. Has required heavy patching. Superseded |
545 |
-# by games-util/deutex. Removal in 30 days. |
546 |
-games-misc/yadex |
547 |
- |
548 |
# Mikle Kolyada <zlogene@g.o> (2019-06-15) |
549 |
# Part of dev-texlive/texlive-latexextra |
550 |
# does not work with utf-8 (bug #688096) |