Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/
Date: Thu, 22 Apr 2021 12:27:44
Message-Id: 1619094450.539ad6225bc6950eb4c30145c3acea9e91de9e19.sam@gentoo
1 commit: 539ad6225bc6950eb4c30145c3acea9e91de9e19
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 22 12:26:27 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 22 12:27:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539ad622
7
8 app-editors/nedit: drop 5.6-r2 (EAPI 5)
9
10 Closes: https://bugs.gentoo.org/783627
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-editors/nedit/Manifest | 1 -
14 .../files/nedit-5.6-40_Pointer_to_Integer.patch | 261 ---------------------
15 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 ----------
16 app-editors/nedit/files/nedit-5.6-format.patch | 12 -
17 app-editors/nedit/files/nedit-5.6-ldflags.patch | 17 --
18 app-editors/nedit/nedit-5.6-r2.ebuild | 76 ------
19 6 files changed, 485 deletions(-)
20
21 diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
22 index 305b7346869..80d3274dd60 100644
23 --- a/app-editors/nedit/Manifest
24 +++ b/app-editors/nedit/Manifest
25 @@ -1,3 +1,2 @@
26 -DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0
27 DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932
28 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3
29
30 diff --git a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
31 deleted file mode 100644
32 index 9081ea34061..00000000000
33 --- a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
34 +++ /dev/null
35 @@ -1,261 +0,0 @@
36 -#! /bin/sh /usr/share/dpatch/dpatch-run
37 -# Description: fix warning: cast from pointer to integer of different size
38 -# Origin: https://sourceforge.net/tracker/download.php?group_id=11005&atid=311005&file_id=340993&aid=2846694
39 -# Bug: https://sourceforge.net/tracker/?func=detail&atid=311005&aid=2846694&group_id=11005
40 -# Author: Jack Howarth <jwhowarth@×××××××××××××××××.net>
41 -
42 -@DPATCH@
43 -diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c
44 ---- nedit-5.6~cvs20081118~/Xlt/SlideC.c 2009-09-15 21:27:12.000000000 +0200
45 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.000000000 +0200
46 -@@ -28,6 +28,7 @@
47 - #endif
48 -
49 - #include <Xm/XmP.h>
50 -+#include <stdint.h>
51 -
52 - #include "SlideCP.h"
53 -
54 -@@ -116,14 +117,14 @@
55 - /* notify that initialize called XtArgsProc */ NULL,
56 - /* NULL XtProc */ NULL,
57 - /* NULL XtPointer */ NULL,
58 --/* NULL Cardinal */ (Cardinal)NULL,
59 -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL,
60 - /* resources for subclass fields XtResourceList */ resources,
61 - /* number of entries in resources Cardinal */ XtNumber(resources),
62 - /* resource class quarkified XrmClass */ NULLQUARK,
63 --/* NULL Boolean */ (Boolean)NULL,
64 --/* NULL XtEnum */ (XtEnum)NULL,
65 --/* NULL Boolean */ (Boolean)NULL,
66 --/* NULL Boolean */ (Boolean)NULL,
67 -+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
68 -+/* NULL XtEnum */ (XtEnum)(uintptr_t)NULL,
69 -+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
70 -+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
71 - /* free data for subclass pointers XtWidgetProc */ destroy,
72 - /* NULL XtProc */ NULL,
73 - /* NULL XtProc */ NULL,
74 -diff -urNad nedit-5.6~cvs20081118~/source/file.c nedit-5.6~cvs20081118/source/file.c
75 ---- nedit-5.6~cvs20081118~/source/file.c 2009-09-15 21:27:12.000000000 +0200
76 -+++ nedit-5.6~cvs20081118/source/file.c 2009-09-15 22:06:42.000000000 +0200
77 -@@ -52,6 +52,7 @@
78 - #include <limits.h>
79 - #include <stdio.h>
80 - #include <stdlib.h>
81 -+#include <stdint.h>
82 - #include <string.h>
83 - #include <unistd.h>
84 -
85 -@@ -1914,7 +1915,7 @@
86 - if (XmToggleButtonGetState(w)) {
87 - XtPointer userData;
88 - XtVaGetValues(w, XmNuserData, &userData, NULL);
89 -- *(int*) clientData = (int) userData;
90 -+ *(int*) clientData = (int) (uintptr_t) userData;
91 - }
92 - }
93 -
94 -diff -urNad nedit-5.6~cvs20081118~/source/highlight.c nedit-5.6~cvs20081118/source/highlight.c
95 ---- nedit-5.6~cvs20081118~/source/highlight.c 2009-09-15 21:27:12.000000000 +0200
96 -+++ nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.000000000 +0200
97 -@@ -49,6 +49,7 @@
98 - #include <limits.h>
99 - #include <math.h>
100 - #include <stdlib.h>
101 -+#include <stdint.h>
102 - #include <string.h>
103 - #ifdef VMS
104 - #include "../util/VMSparam.h"
105 -@@ -512,7 +513,7 @@
106 - if (!pattern) {
107 - return NULL;
108 - }
109 -- return (void*)pattern->userStyleIndex;
110 -+ return (void*)(uintptr_t)pattern->userStyleIndex;
111 - }
112 -
113 - /*
114 -diff -urNad nedit-5.6~cvs20081118~/source/macro.c nedit-5.6~cvs20081118/source/macro.c
115 ---- nedit-5.6~cvs20081118~/source/macro.c 2009-09-15 21:27:12.000000000 +0200
116 -+++ nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.000000000 +0200
117 -@@ -60,6 +60,7 @@
118 -
119 - #include <stdio.h>
120 - #include <stdlib.h>
121 -+#include <stdint.h>
122 - #include <string.h>
123 - #include <ctype.h>
124 - #include <errno.h>
125 -@@ -2924,7 +2925,7 @@
126 - readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
127 - btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
128 - XmNlabelString, s1=XmStringCreateSimple(btnLabel),
129 -- XmNuserData, (XtPointer)(i+1), NULL);
130 -+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
131 - XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
132 - XmStringFree(s1);
133 - }
134 -@@ -2965,7 +2966,7 @@
135 - return; /* shouldn't happen */
136 - if (XtClass(w) == xmPushButtonWidgetClass) {
137 - XtVaGetValues(w, XmNuserData, &userData, NULL);
138 -- retVal.val.n = (int)userData;
139 -+ retVal.val.n = (int)(uintptr_t)userData;
140 - } else
141 - retVal.val.n = 1;
142 - retVal.tag = INT_TAG;
143 -@@ -3101,7 +3102,7 @@
144 - readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
145 - btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
146 - XmNlabelString, s1=XmStringCreateSimple(btnLabel),
147 -- XmNuserData, (XtPointer)(i+1), NULL);
148 -+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
149 - XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
150 - XmStringFree(s1);
151 - }
152 -@@ -3155,7 +3156,7 @@
153 - returned in w. */
154 - if (XtClass(w) == xmPushButtonWidgetClass) {
155 - XtVaGetValues(w, XmNuserData, &userData, NULL);
156 -- btnNum = (int)userData;
157 -+ btnNum = (int)(uintptr_t)userData;
158 - } else
159 - btnNum = 1;
160 -
161 -@@ -3680,7 +3681,7 @@
162 - readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
163 - btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
164 - XmNlabelString, s1=XmStringCreateSimple(btnLabel),
165 -- XmNuserData, (XtPointer)(i+1), NULL);
166 -+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
167 - XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
168 - XmStringFree(s1);
169 - }
170 -@@ -3760,7 +3761,7 @@
171 - returned in w. */
172 - if (XtClass(w) == xmPushButtonWidgetClass) {
173 - XtVaGetValues(w, XmNuserData, &userData, NULL);
174 -- btnNum = (int)userData;
175 -+ btnNum = (int)(uintptr_t)userData;
176 - } else
177 - btnNum = 1;
178 -
179 -diff -urNad nedit-5.6~cvs20081118~/source/preferences.c nedit-5.6~cvs20081118/source/preferences.c
180 ---- nedit-5.6~cvs20081118~/source/preferences.c 2009-09-15 21:27:12.000000000 +0200
181 -+++ nedit-5.6~cvs20081118/source/preferences.c 2009-09-15 22:07:47.000000000 +0200
182 -@@ -58,6 +58,7 @@
183 - #include <ctype.h>
184 - #include <pwd.h>
185 - #include <stdlib.h>
186 -+#include <stdint.h>
187 - #include <string.h>
188 - #include <stdio.h>
189 - #include <unistd.h>
190 -@@ -2296,7 +2297,7 @@
191 - XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
192 - for (n=0; n<(int)nItems; n++) {
193 - XtVaGetValues(items[n], XmNuserData, &userData, NULL);
194 -- XmToggleButtonSetState(items[n], (int)userData == mode, False);
195 -+ XmToggleButtonSetState(items[n], (int)(uintptr_t)userData == mode, False);
196 - }
197 - }
198 - }
199 -@@ -5148,7 +5149,7 @@
200 - xmToggleButtonGadgetClass, menu,
201 - XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
202 - XmNmarginHeight, 0,
203 -- XmNuserData, (void *)i,
204 -+ XmNuserData, (void *)(uintptr_t)i,
205 - XmNset, window->languageMode==i, NULL);
206 - XmStringFree(s1);
207 - XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
208 -@@ -5169,14 +5170,14 @@
209 - XtVaGetValues(w, XmNuserData, &mode, NULL);
210 -
211 - /* If the mode didn't change, do nothing */
212 -- if (window->languageMode == (int)mode)
213 -+ if (window->languageMode == (int)(uintptr_t)mode)
214 - return;
215 -
216 - /* redo syntax highlighting word delimiters, etc. */
217 - /*
218 - reapplyLanguageMode(window, (int)mode, False);
219 - */
220 -- params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
221 -+ params[0] = (((int)(uintptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)(uintptr_t)mode]->name;
222 - XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);
223 - }
224 -
225 -diff -urNad nedit-5.6~cvs20081118~/source/regularExp.c nedit-5.6~cvs20081118/source/regularExp.c
226 ---- nedit-5.6~cvs20081118~/source/regularExp.c 2009-09-15 21:27:12.000000000 +0200
227 -+++ nedit-5.6~cvs20081118/source/regularExp.c 2009-09-15 22:08:16.000000000 +0200
228 -@@ -88,6 +88,7 @@
229 - #include <limits.h>
230 - #include <stdio.h>
231 - #include <stdlib.h>
232 -+#include <stdint.h>
233 - #include <string.h>
234 -
235 - #ifdef HAVE_DEBUG_H
236 -@@ -4157,7 +4158,7 @@
237 - table [*c] = 1;
238 - }
239 -
240 -- table [(int) NULL] = 1; /* These */
241 -+ table [(int)(uintptr_t) NULL] = 1; /* These */
242 - table [(int) '\t'] = 1; /* characters */
243 - table [(int) '\n'] = 1; /* are always */
244 - table [(int) ' ' ] = 1; /* delimiters. */
245 -diff -urNad nedit-5.6~cvs20081118~/source/userCmds.c nedit-5.6~cvs20081118/source/userCmds.c
246 ---- nedit-5.6~cvs20081118~/source/userCmds.c 2009-09-15 21:27:12.000000000 +0200
247 -+++ nedit-5.6~cvs20081118/source/userCmds.c 2009-09-15 22:08:47.000000000 +0200
248 -@@ -49,6 +49,7 @@
249 -
250 - #include <stdio.h>
251 - #include <stdlib.h>
252 -+#include <stdint.h>
253 - #include <string.h>
254 - #include <ctype.h>
255 - #ifdef VMS
256 -@@ -1116,7 +1117,7 @@
257 - XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
258 - dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
259 - } else {
260 -- index = (int)userData - 10;
261 -+ index = (int)(uintptr_t)userData - 10;
262 - if (index <0 || index >= nMenuItems)
263 - return;
264 - if (menuList[index]->input == FROM_SELECTION)
265 -@@ -1928,7 +1929,7 @@
266 - XmNlabelString, st1,
267 - XmNacceleratorText, st2,
268 - XmNmnemonic, f->mnemonic,
269 -- XmNuserData, (XtPointer)(index+10), NULL);
270 -+ XmNuserData, (XtPointer)(uintptr_t)(index+10), NULL);
271 - XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg);
272 - XmStringFree(st1);
273 - XmStringFree(st2);
274 -diff -urNad nedit-5.6~cvs20081118~/util/prefFile.c nedit-5.6~cvs20081118/util/prefFile.c
275 ---- nedit-5.6~cvs20081118~/util/prefFile.c 2009-09-15 21:27:12.000000000 +0200
276 -+++ nedit-5.6~cvs20081118/util/prefFile.c 2009-09-15 22:04:14.000000000 +0200
277 -@@ -38,6 +38,7 @@
278 - #include <stdlib.h>
279 - #include <stdio.h>
280 - #include <string.h>
281 -+#include <stdint.h>
282 - #ifdef VMS
283 - #include "VMSparam.h"
284 - #else
285 -@@ -353,9 +354,9 @@
286 - *(int *)rsrcDescrip->valueAddr = 0;
287 - return False;
288 - case PREF_STRING:
289 -- if ((int)strlen(string) >= (int)rsrcDescrip->arg)
290 -+ if ((int)strlen(string) >= (int)(uintptr_t)rsrcDescrip->arg)
291 - return False;
292 -- strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
293 -+ strncpy(rsrcDescrip->valueAddr, string, (int)(uintptr_t)rsrcDescrip->arg);
294 - return True;
295 - case PREF_ALLOC_STRING:
296 - *(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);
297
298 diff --git a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
299 deleted file mode 100644
300 index 92b0778e2ab..00000000000
301 --- a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
302 +++ /dev/null
303 @@ -1,118 +0,0 @@
304 -diff -urN a/source/highlightData.c b/source/highlightData.c
305 ---- a/source/highlightData.c 2018-03-13 08:42:40.930188154 +0100
306 -+++ b/source/highlightData.c 2018-03-13 08:44:59.651196431 +0100
307 -@@ -1280,7 +1280,7 @@
308 - XFontStruct *font;
309 -
310 - if (styleNo<0)
311 -- return GetDefaultFontStruct(window->fontList);
312 -+ return GetDefaultFontStruct(TheDisplay, window->fontList);
313 - fontNum = HighlightStyles[styleNo]->font;
314 - if (fontNum == BOLD_FONT)
315 - font = window->boldFontStruct;
316 -@@ -1289,10 +1289,10 @@
317 - else if (fontNum == BOLD_ITALIC_FONT)
318 - font = window->boldItalicFontStruct;
319 - else /* fontNum == PLAIN_FONT */
320 -- font = GetDefaultFontStruct(window->fontList);
321 -+ font = GetDefaultFontStruct(TheDisplay, window->fontList);
322 -
323 - /* If font isn't loaded, silently substitute primary font */
324 -- return font == NULL ? GetDefaultFontStruct(window->fontList) : font;
325 -+ return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font;
326 - }
327 -
328 - int FontOfNamedStyleIsBold(char *styleName)
329 -diff -urN a/source/text.c b/source/text.c
330 ---- a/source/text.c 2018-03-13 08:42:40.931188154 +0100
331 -+++ b/source/text.c 2018-03-13 08:46:37.785202286 +0100
332 -@@ -778,9 +778,13 @@
333 - textBuffer *buf;
334 - Pixel white, black;
335 - int textLeft;
336 -- int charWidth = fs->max_bounds.width;
337 -- int marginWidth = new->text.marginWidth;
338 -- int lineNumCols = new->text.lineNumCols;
339 -+ int charWidth;
340 -+ int marginWidth;
341 -+ int lineNumCols;
342 -+
343 -+ charWidth = fs->max_bounds.width;
344 -+ marginWidth = new->text.marginWidth;
345 -+ lineNumCols = new->text.lineNumCols;
346 -
347 - /* Set the initial window size based on the rows and columns resources */
348 - if (request->core.width == 0)
349 -diff -urN a/source/window.c b/source/window.c
350 ---- a/source/window.c 2018-03-13 08:42:40.937188155 +0100
351 -+++ b/source/window.c 2018-03-13 08:48:07.727207652 +0100
352 -@@ -1839,7 +1839,7 @@
353 -
354 - /* Change the primary font in all the widgets */
355 - if (primaryChanged) {
356 -- font = GetDefaultFontStruct(window->fontList);
357 -+ font = GetDefaultFontStruct(TheDisplay, window->fontList);
358 - XtVaSetValues(window->textArea, textNfont, font, NULL);
359 - for (i=0; i<window->nPanes; i++)
360 - XtVaSetValues(window->textPanes[i], textNfont, font, NULL);
361 -@@ -1861,7 +1861,7 @@
362 - size appropriate for the new font, but only do so if there's only
363 - _one_ document in the window, in order to avoid growing-window bug */
364 - if (NDocuments(window) == 1) {
365 -- fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width;
366 -+ fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width;
367 - fontHeight = textD->ascent + textD->descent;
368 - newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth;
369 - newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight +
370 -@@ -2244,7 +2244,7 @@
371 - textNrows, rows, textNcolumns, cols,
372 - textNlineNumCols, lineNumCols,
373 - textNemulateTabs, emTabDist,
374 -- textNfont, GetDefaultFontStruct(window->fontList),
375 -+ textNfont, GetDefaultFontStruct(TheDisplay, window->fontList),
376 - textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
377 - textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
378 - textNwordDelimiters, delimiters,
379 -
380 ---- a/util/misc.c 2018-03-13 08:50:54.892217626 +0100
381 -+++ b/util/misc.c 2018-03-13 08:56:50.346238834 +0100
382 -@@ -1018,7 +1018,7 @@
383 - ** a Motif font list. Since Motif stores this, it saves us from storing
384 - ** it or querying it from the X server.
385 - */
386 --XFontStruct *GetDefaultFontStruct(XmFontList font)
387 -+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font)
388 - {
389 - XFontStruct *fs;
390 - XmFontContext context;
391 -@@ -1028,6 +1028,17 @@
392 - XmFontListGetNextFont(context, &charset, &fs);
393 - XmFontListFreeFontContext(context);
394 - XtFree(charset);
395 -+
396 -+ /* FontList might be a render table with no only XFT fonts */
397 -+ if (fs == NULL) {
398 -+ fs = XLoadQueryFont(d, "fixed");
399 -+ }
400 -+
401 -+ if (fs == NULL) {
402 -+ fprintf(stderr, "Unabled to load any fallback fonts.\n");
403 -+ exit(EXIT_FAILURE);
404 -+ }
405 -+
406 - return fs;
407 - }
408 -
409 -diff -urN a/util/misc.h b/util/misc.h
410 ---- a/util/misc.h 2018-03-13 08:50:54.890217626 +0100
411 -+++ b/util/misc.h 2018-03-13 08:55:52.790235400 +0100
412 -@@ -65,7 +65,7 @@
413 - void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer);
414 - void UpdateAccelLockPatch(Widget topWidget, Widget newButton);
415 - char *GetXmStringText(XmString fromString);
416 --XFontStruct *GetDefaultFontStruct(XmFontList font);
417 -+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font);
418 - XmString* StringTable(int count, ...);
419 - void FreeStringTable(XmString *table);
420 - void SimulateButtonPress(Widget widget);
421 -
422
423 diff --git a/app-editors/nedit/files/nedit-5.6-format.patch b/app-editors/nedit/files/nedit-5.6-format.patch
424 deleted file mode 100644
425 index e2d6e17a647..00000000000
426 --- a/app-editors/nedit/files/nedit-5.6-format.patch
427 +++ /dev/null
428 @@ -1,12 +0,0 @@
429 -diff -up nedit-5.6/source/nc.c.format nedit-5.6/source/nc.c
430 ---- nedit-5.6/source/nc.c.format 2014-12-28 13:56:20.000000000 +0000
431 -+++ nedit-5.6/source/nc.c 2015-06-17 07:30:25.617032345 +0100
432 -@@ -503,7 +503,7 @@ static int startServer(const char *messa
433 -
434 - /* prompt user whether to start server */
435 - if (!Preferences.autoStart) {
436 -- printf(message);
437 -+ printf("%s", message);
438 - do {
439 - c = getc(stdin);
440 - } while (c == ' ' || c == '\t');
441
442 diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch
443 deleted file mode 100644
444 index a549b02490c..00000000000
445 --- a/app-editors/nedit/files/nedit-5.6-ldflags.patch
446 +++ /dev/null
447 @@ -1,17 +0,0 @@
448 ---- a/source/Makefile.common 2004-03-21 15:25:56.000000000 +0100
449 -+++ b/source/Makefile.common 2009-10-24 10:47:03.667835157 +0200
450 -@@ -21,12 +21,12 @@
451 - # we only want natural rebuilds to regenerate the link date.
452 - nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
453 - $(CC) $(CFLAGS) -c linkdate.c
454 -- $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
455 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
456 - $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@
457 -
458 - # Note LIBS isn't quite right here; it links unnecessarily against Motif
459 - nc: nc.o server_common.o ../util/libNUtil.a
460 -- $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
461 -+ $(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
462 -
463 - help.o: help.c
464 - $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
465
466 diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
467 deleted file mode 100644
468 index bc781249d83..00000000000
469 --- a/app-editors/nedit/nedit-5.6-r2.ebuild
470 +++ /dev/null
471 @@ -1,76 +0,0 @@
472 -# Copyright 1999-2021 Gentoo Authors
473 -# Distributed under the terms of the GNU General Public License v2
474 -
475 -EAPI=6
476 -
477 -inherit desktop toolchain-funcs
478 -
479 -DESCRIPTION="Multi-purpose text editor for the X Window System"
480 -HOMEPAGE="https://sourceforge.net/projects/nedit"
481 -SRC_URI="
482 - https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
483 - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
484 -
485 -LICENSE="GPL-2"
486 -SLOT="0"
487 -KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
488 -
489 -RDEPEND=">=x11-libs/motif-2.3:0
490 - x11-libs/libXt
491 - x11-libs/libX11"
492 -DEPEND="${RDEPEND}
493 - || ( dev-util/yacc sys-devel/bison )
494 - dev-lang/perl"
495 -
496 -S="${WORKDIR}/${PN}-${PV}"
497 -
498 -PATCHES=( "${FILESDIR}/${P}-format.patch"
499 - "${FILESDIR}/${P}-ldflags.patch"
500 - "${FILESDIR}/${P}-40_Pointer_to_Integer.patch"
501 - "${FILESDIR}/${P}-security.patch"
502 - "${FILESDIR}/${P}-fix-crash-with-noX.patch"
503 -)
504 -
505 -src_prepare() {
506 - #respecting LDFLAGS, bug #208189
507 - default
508 - sed \
509 - -e "s:bin/:${EPREFIX}/bin/:g" \
510 - -i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
511 - sed \
512 - -e "s:nc:neditc:g" -i doc/nc.pod || die
513 - sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
514 - makefiles/Makefile.linux || die
515 - sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \
516 - -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
517 - -e "s:-lX11:-lX11 -lXmu -liconv:" \
518 - -e "s:check_tif_rule::" \
519 - makefiles/Makefile.macosx || die
520 -}
521 -
522 -src_compile() {
523 - case "${CHOST}" in
524 - *-darwin*)
525 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
526 - ;;
527 - *-linux*)
528 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
529 - ;;
530 - esac
531 - emake VERSION="NEdit ${PV}" -C doc all
532 -}
533 -
534 -src_install() {
535 - dobin source/nedit
536 - newbin source/nc neditc
537 -
538 - make_desktop_entry "${PN}"
539 - doicon "${WORKDIR}/${PN}.png"
540 -
541 - newman doc/nedit.man nedit.1
542 - newman doc/nc.man neditc.1
543 -
544 - dodoc README ReleaseNotes ChangeLog
545 - dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
546 - dohtml doc/nedit.html
547 -}