From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-editors/nedit/Manifest | 9 +- .../files/nedit-5.6-40_Pointer_to_Integer.patch | 261 --------------------- .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 ---------- app-editors/nedit/files/nedit-5.6-format.patch | 12 - app-editors/nedit/files/nedit-5.6-ldflags.patch | 17 -- app-editors/nedit/nedit-5.6-r1.ebuild | 75 ------ app-editors/nedit/nedit-5.6-r2.ebuild | 76 ------ app-editors/nedit/nedit-5.7.ebuild | 4 +- 8 files changed, 3 insertions(+), 569 deletions(-) delete mode 100644 app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch delete mode 100644 app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch delete mode 100644 app-editors/nedit/files/nedit-5.6-format.patch delete mode 100644 app-editors/nedit/files/nedit-5.6-ldflags.patch delete mode 100644 app-editors/nedit/nedit-5.6-r1.ebuild delete mode 100644 app-editors/nedit/nedit-5.6-r2.ebuild (limited to 'app-editors/nedit') diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index a48b6aedb99b..c9358a2e3bf2 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,14 +1,7 @@ -AUX nedit-5.6-40_Pointer_to_Integer.patch 10379 BLAKE2B d7a855d17ca5744ec3d1a8f6b286911458236b452a98d36fe57e0779e17101786e7c52702dbc20f98b460f3b3ac05093823214adc99eb17399919d2361a60085 SHA512 263fd5109c5fc16ea8328ad7855b8ab74e6e744d89374d68bc7db495a3295888f3599d2e9d6653097b4f7b68bae968a5deb7240a565f8fa1beba451b8b1f1b55 -AUX nedit-5.6-fix-crash-with-noX.patch 4726 BLAKE2B 1378cd446adf148d5a69b772e790c6bbb052ce27c668c4b391f3f08081bc523368a6c4a63eae39c503b4f569c7f374c0b9c5303bf23505acb2f322dcc98f1121 SHA512 38a3292370482b295afa3eb7033061e2837819c519fa1d3215c4d69bdf11871ee193615ecec8a01a102da5e27e3098337db06ab296f3feffac53ed84d660bb90 -AUX nedit-5.6-format.patch 453 BLAKE2B b8a226e93e2c1666caefb5032706d8ac08284af3e2a2658f794b4af6eaae18311db52ed01a49c368d050958e55ef2fbc0893ee3b8bc63418bce676c5c4d7aae1 SHA512 50e93d7f297ae0b10bec34176c707cc61d4c205e1293cb02b94f85359604864df8698bf35725f007b9c9eb585d0cf18c2498b6d7f55960fabb93b3d98bfe02b8 -AUX nedit-5.6-ldflags.patch 800 BLAKE2B ee06dcdd07f7d01c23c943e85382d33d316e85c364b1c3bc243ee3468078e8a47a770191389dd53a94d83b6e896e9dbe15b40d365aab4f3a8ef5c8705941ea9a SHA512 65818ef8b425414bf4c9f0bd9b71b56df5a6ef05f0e2914558733cbc7bbe435199e8c69c66b2f460964d1913bbc6fb8722a77d881ea4efa1be07f8fb55ad66e4 AUX nedit-5.6-security.patch 1944 BLAKE2B 8b3e21d074f274c5ba24f1888d9d13d71ac08f80c0e063a5e0e85794a1677c10f7d6d64298e0588a73e86af1d3dfdacb32a389a53ff7a4e408f9006006adc60e SHA512 437ff658c4ae4918fa73dee97773d9b8bf9b2dbfd4af3752ab3bdb735ded2508e449170e2aeea43d9bfbdb48e75d52154a847cb9a3a59e7f4b6ad0ec9027bfcd AUX nedit-5.7-doc.patch 522 BLAKE2B a52ae4cb7d9e2bb0b629024a0e5caf12e54f56905ee49fd2c1b83596e56aa403b5c1f71207e5f41c839de9070a2208e70e90e16a06119d744c8200a33d4747e0 SHA512 5ba978e599f34c348645d727a307ab9e68e666b3494daf380f177cb2f71aec5da94a8dd5884bf70aeae35ec1da31a7cccfc51812278c72935166fdf909ec9040 AUX nedit-5.7-ldflags.patch 814 BLAKE2B 5d300f5006c41ef378d4cadfa2daa287034338c7e8cb692669873853f1082338af7eb0ef4295c823dfea7eb17f0920a9eace16f04c05dbdb6baa495b21e207de SHA512 2e72fb97f2bad7aec225cea2a86b2f0c40e22b8604bdc0288232df3b304c6a28924bf45425bf0ce3f3c753f7d2fb0133adbe041ff747093e2a6207c86378bd9c -DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 -EBUILD nedit-5.6-r1.ebuild 1977 BLAKE2B ab5c14e099bcaf0573493b6c9f73072427c3b77a876b79b62337b4001a93f0d59fa8139ec2be260f2ff5b8b2f982673ac00de5573241f68413f564760c566bb0 SHA512 6895f39046a30f9e55279622c7d9a1f33369f8a6a2e9244c0a20d11b9e6880c63bc5be1f98ed548c5e841500ec2db81a9b85f6db5c5fec90148ad0ff06e652f5 -EBUILD nedit-5.6-r2.ebuild 2027 BLAKE2B 08aeeb58ab2870a0dc8139b8eb0c7e218f22b46da0bb385185969ccba7808a52cf551a0549701d568be7ad88ad103f02b9507fc810c3cf90d2d73a1cb584c6a7 SHA512 038ef549923cad319852d95a704c4f0e946a3121f920b8d405817cf0bee7dac7ae6c11eb53e09cd9c95de2c665a9ca74d2b4092a518af9ef6b1673519c5ec123 -EBUILD nedit-5.7.ebuild 1983 BLAKE2B d4f3a244277aa4f9da9d5e6eaeb260c61462ea0aa27d89a3bdf4618ab2927f47d9917ade1b3c9a26cc468b66bfcd0b0d315c0c1daf4c93288a96849ec5c8f1e6 SHA512 b06ff9e0984de9b976f77cd64d2f4fccbf12db5542f82da57f23e14b6794a42635776b1067b903537dcb9f7a0ffd9c6e5e8bf9b823558bb5ac94db015d96ecaa +EBUILD nedit-5.7.ebuild 1979 BLAKE2B 036681479e1073513c50afe5f06046481a7444ff6a167a83dadd1dc2bdb7a211d5850f5bceed21c01587d023e66353a956695049fd81c2a3ab97a4da6417dcf5 SHA512 82947270b1fdb7efea14b7de7bfe708ac6b17d7fed37444ac23a9ce79c0b66481cfb41e32c71eaf9746f98827e15829333bf2099920b439ed4b51fa9f9f3ee32 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699 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 deleted file mode 100644 index 9081ea340619..000000000000 --- a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch +++ /dev/null @@ -1,261 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# Description: fix warning: cast from pointer to integer of different size -# Origin: https://sourceforge.net/tracker/download.php?group_id=11005&atid=311005&file_id=340993&aid=2846694 -# Bug: https://sourceforge.net/tracker/?func=detail&atid=311005&aid=2846694&group_id=11005 -# Author: Jack Howarth - -@DPATCH@ -diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c ---- nedit-5.6~cvs20081118~/Xlt/SlideC.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.000000000 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize called XtArgsProc */ NULL, - /* NULL XtProc */ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fields XtResourceList */ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkified XrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum */ (XtEnum)NULL, --/* NULL Boolean */ (Boolean)NULL, --/* NULL Boolean */ (Boolean)NULL, -+/* NULL Boolean */ (Boolean)(uintptr_t)NULL, -+/* NULL XtEnum */ (XtEnum)(uintptr_t)NULL, -+/* NULL Boolean */ (Boolean)(uintptr_t)NULL, -+/* NULL Boolean */ (Boolean)(uintptr_t)NULL, - /* free data for subclass pointers XtWidgetProc */ destroy, - /* NULL XtProc */ NULL, - /* NULL XtProc */ NULL, -diff -urNad nedit-5.6~cvs20081118~/source/file.c nedit-5.6~cvs20081118/source/file.c ---- nedit-5.6~cvs20081118~/source/file.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/source/file.c 2009-09-15 22:06:42.000000000 +0200 -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -1914,7 +1915,7 @@ - if (XmToggleButtonGetState(w)) { - XtPointer userData; - XtVaGetValues(w, XmNuserData, &userData, NULL); -- *(int*) clientData = (int) userData; -+ *(int*) clientData = (int) (uintptr_t) userData; - } - } - -diff -urNad nedit-5.6~cvs20081118~/source/highlight.c nedit-5.6~cvs20081118/source/highlight.c ---- nedit-5.6~cvs20081118~/source/highlight.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.000000000 +0200 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - #include - #ifdef VMS - #include "../util/VMSparam.h" -@@ -512,7 +513,7 @@ - if (!pattern) { - return NULL; - } -- return (void*)pattern->userStyleIndex; -+ return (void*)(uintptr_t)pattern->userStyleIndex; - } - - /* -diff -urNad nedit-5.6~cvs20081118~/source/macro.c nedit-5.6~cvs20081118/source/macro.c ---- nedit-5.6~cvs20081118~/source/macro.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.000000000 +0200 -@@ -60,6 +60,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -2924,7 +2925,7 @@ - readStringArg(argList[i], &btnLabel, btnStorage, errMsg); - btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog, - XmNlabelString, s1=XmStringCreateSimple(btnLabel), -- XmNuserData, (XtPointer)(i+1), NULL); -+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL); - XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window); - XmStringFree(s1); - } -@@ -2965,7 +2966,7 @@ - return; /* shouldn't happen */ - if (XtClass(w) == xmPushButtonWidgetClass) { - XtVaGetValues(w, XmNuserData, &userData, NULL); -- retVal.val.n = (int)userData; -+ retVal.val.n = (int)(uintptr_t)userData; - } else - retVal.val.n = 1; - retVal.tag = INT_TAG; -@@ -3101,7 +3102,7 @@ - readStringArg(argList[i], &btnLabel, btnStorage, errMsg); - btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog, - XmNlabelString, s1=XmStringCreateSimple(btnLabel), -- XmNuserData, (XtPointer)(i+1), NULL); -+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL); - XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window); - XmStringFree(s1); - } -@@ -3155,7 +3156,7 @@ - returned in w. */ - if (XtClass(w) == xmPushButtonWidgetClass) { - XtVaGetValues(w, XmNuserData, &userData, NULL); -- btnNum = (int)userData; -+ btnNum = (int)(uintptr_t)userData; - } else - btnNum = 1; - -@@ -3680,7 +3681,7 @@ - readStringArg(argList[i], &btnLabel, btnStorage, errMsg); - btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog, - XmNlabelString, s1=XmStringCreateSimple(btnLabel), -- XmNuserData, (XtPointer)(i+1), NULL); -+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL); - XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window); - XmStringFree(s1); - } -@@ -3760,7 +3761,7 @@ - returned in w. */ - if (XtClass(w) == xmPushButtonWidgetClass) { - XtVaGetValues(w, XmNuserData, &userData, NULL); -- btnNum = (int)userData; -+ btnNum = (int)(uintptr_t)userData; - } else - btnNum = 1; - -diff -urNad nedit-5.6~cvs20081118~/source/preferences.c nedit-5.6~cvs20081118/source/preferences.c ---- nedit-5.6~cvs20081118~/source/preferences.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/source/preferences.c 2009-09-15 22:07:47.000000000 +0200 -@@ -58,6 +58,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -2296,7 +2297,7 @@ - XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL); - for (n=0; n<(int)nItems; n++) { - XtVaGetValues(items[n], XmNuserData, &userData, NULL); -- XmToggleButtonSetState(items[n], (int)userData == mode, False); -+ XmToggleButtonSetState(items[n], (int)(uintptr_t)userData == mode, False); - } - } - } -@@ -5148,7 +5149,7 @@ - xmToggleButtonGadgetClass, menu, - XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name), - XmNmarginHeight, 0, -- XmNuserData, (void *)i, -+ XmNuserData, (void *)(uintptr_t)i, - XmNset, window->languageMode==i, NULL); - XmStringFree(s1); - XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window); -@@ -5169,14 +5170,14 @@ - XtVaGetValues(w, XmNuserData, &mode, NULL); - - /* If the mode didn't change, do nothing */ -- if (window->languageMode == (int)mode) -+ if (window->languageMode == (int)(uintptr_t)mode) - return; - - /* redo syntax highlighting word delimiters, etc. */ - /* - reapplyLanguageMode(window, (int)mode, False); - */ -- params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name; -+ params[0] = (((int)(uintptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)(uintptr_t)mode]->name; - XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1); - } - -diff -urNad nedit-5.6~cvs20081118~/source/regularExp.c nedit-5.6~cvs20081118/source/regularExp.c ---- nedit-5.6~cvs20081118~/source/regularExp.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/source/regularExp.c 2009-09-15 22:08:16.000000000 +0200 -@@ -88,6 +88,7 @@ - #include - #include - #include -+#include - #include - - #ifdef HAVE_DEBUG_H -@@ -4157,7 +4158,7 @@ - table [*c] = 1; - } - -- table [(int) NULL] = 1; /* These */ -+ table [(int)(uintptr_t) NULL] = 1; /* These */ - table [(int) '\t'] = 1; /* characters */ - table [(int) '\n'] = 1; /* are always */ - table [(int) ' ' ] = 1; /* delimiters. */ -diff -urNad nedit-5.6~cvs20081118~/source/userCmds.c nedit-5.6~cvs20081118/source/userCmds.c ---- nedit-5.6~cvs20081118~/source/userCmds.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/source/userCmds.c 2009-09-15 22:08:47.000000000 +0200 -@@ -49,6 +49,7 @@ - - #include - #include -+#include - #include - #include - #ifdef VMS -@@ -1116,7 +1117,7 @@ - XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL); - dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive); - } else { -- index = (int)userData - 10; -+ index = (int)(uintptr_t)userData - 10; - if (index <0 || index >= nMenuItems) - return; - if (menuList[index]->input == FROM_SELECTION) -@@ -1928,7 +1929,7 @@ - XmNlabelString, st1, - XmNacceleratorText, st2, - XmNmnemonic, f->mnemonic, -- XmNuserData, (XtPointer)(index+10), NULL); -+ XmNuserData, (XtPointer)(uintptr_t)(index+10), NULL); - XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg); - XmStringFree(st1); - XmStringFree(st2); -diff -urNad nedit-5.6~cvs20081118~/util/prefFile.c nedit-5.6~cvs20081118/util/prefFile.c ---- nedit-5.6~cvs20081118~/util/prefFile.c 2009-09-15 21:27:12.000000000 +0200 -+++ nedit-5.6~cvs20081118/util/prefFile.c 2009-09-15 22:04:14.000000000 +0200 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #ifdef VMS - #include "VMSparam.h" - #else -@@ -353,9 +354,9 @@ - *(int *)rsrcDescrip->valueAddr = 0; - return False; - case PREF_STRING: -- if ((int)strlen(string) >= (int)rsrcDescrip->arg) -+ if ((int)strlen(string) >= (int)(uintptr_t)rsrcDescrip->arg) - return False; -- strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg); -+ strncpy(rsrcDescrip->valueAddr, string, (int)(uintptr_t)rsrcDescrip->arg); - return True; - case PREF_ALLOC_STRING: - *(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1); 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 deleted file mode 100644 index 92b0778e2ab2..000000000000 --- a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -urN a/source/highlightData.c b/source/highlightData.c ---- a/source/highlightData.c 2018-03-13 08:42:40.930188154 +0100 -+++ b/source/highlightData.c 2018-03-13 08:44:59.651196431 +0100 -@@ -1280,7 +1280,7 @@ - XFontStruct *font; - - if (styleNo<0) -- return GetDefaultFontStruct(window->fontList); -+ return GetDefaultFontStruct(TheDisplay, window->fontList); - fontNum = HighlightStyles[styleNo]->font; - if (fontNum == BOLD_FONT) - font = window->boldFontStruct; -@@ -1289,10 +1289,10 @@ - else if (fontNum == BOLD_ITALIC_FONT) - font = window->boldItalicFontStruct; - else /* fontNum == PLAIN_FONT */ -- font = GetDefaultFontStruct(window->fontList); -+ font = GetDefaultFontStruct(TheDisplay, window->fontList); - - /* If font isn't loaded, silently substitute primary font */ -- return font == NULL ? GetDefaultFontStruct(window->fontList) : font; -+ return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font; - } - - int FontOfNamedStyleIsBold(char *styleName) -diff -urN a/source/text.c b/source/text.c ---- a/source/text.c 2018-03-13 08:42:40.931188154 +0100 -+++ b/source/text.c 2018-03-13 08:46:37.785202286 +0100 -@@ -778,9 +778,13 @@ - textBuffer *buf; - Pixel white, black; - int textLeft; -- int charWidth = fs->max_bounds.width; -- int marginWidth = new->text.marginWidth; -- int lineNumCols = new->text.lineNumCols; -+ int charWidth; -+ int marginWidth; -+ int lineNumCols; -+ -+ charWidth = fs->max_bounds.width; -+ marginWidth = new->text.marginWidth; -+ lineNumCols = new->text.lineNumCols; - - /* Set the initial window size based on the rows and columns resources */ - if (request->core.width == 0) -diff -urN a/source/window.c b/source/window.c ---- a/source/window.c 2018-03-13 08:42:40.937188155 +0100 -+++ b/source/window.c 2018-03-13 08:48:07.727207652 +0100 -@@ -1839,7 +1839,7 @@ - - /* Change the primary font in all the widgets */ - if (primaryChanged) { -- font = GetDefaultFontStruct(window->fontList); -+ font = GetDefaultFontStruct(TheDisplay, window->fontList); - XtVaSetValues(window->textArea, textNfont, font, NULL); - for (i=0; inPanes; i++) - XtVaSetValues(window->textPanes[i], textNfont, font, NULL); -@@ -1861,7 +1861,7 @@ - size appropriate for the new font, but only do so if there's only - _one_ document in the window, in order to avoid growing-window bug */ - if (NDocuments(window) == 1) { -- fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width; -+ fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width; - fontHeight = textD->ascent + textD->descent; - newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth; - newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight + -@@ -2244,7 +2244,7 @@ - textNrows, rows, textNcolumns, cols, - textNlineNumCols, lineNumCols, - textNemulateTabs, emTabDist, -- textNfont, GetDefaultFontStruct(window->fontList), -+ textNfont, GetDefaultFontStruct(TheDisplay, window->fontList), - textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar, - textNreadOnly, IS_ANY_LOCKED(window->lockReasons), - textNwordDelimiters, delimiters, - ---- a/util/misc.c 2018-03-13 08:50:54.892217626 +0100 -+++ b/util/misc.c 2018-03-13 08:56:50.346238834 +0100 -@@ -1018,7 +1018,7 @@ - ** a Motif font list. Since Motif stores this, it saves us from storing - ** it or querying it from the X server. - */ --XFontStruct *GetDefaultFontStruct(XmFontList font) -+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font) - { - XFontStruct *fs; - XmFontContext context; -@@ -1028,6 +1028,17 @@ - XmFontListGetNextFont(context, &charset, &fs); - XmFontListFreeFontContext(context); - XtFree(charset); -+ -+ /* FontList might be a render table with no only XFT fonts */ -+ if (fs == NULL) { -+ fs = XLoadQueryFont(d, "fixed"); -+ } -+ -+ if (fs == NULL) { -+ fprintf(stderr, "Unabled to load any fallback fonts.\n"); -+ exit(EXIT_FAILURE); -+ } -+ - return fs; - } - -diff -urN a/util/misc.h b/util/misc.h ---- a/util/misc.h 2018-03-13 08:50:54.890217626 +0100 -+++ b/util/misc.h 2018-03-13 08:55:52.790235400 +0100 -@@ -65,7 +65,7 @@ - void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer); - void UpdateAccelLockPatch(Widget topWidget, Widget newButton); - char *GetXmStringText(XmString fromString); --XFontStruct *GetDefaultFontStruct(XmFontList font); -+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font); - XmString* StringTable(int count, ...); - void FreeStringTable(XmString *table); - void SimulateButtonPress(Widget widget); - diff --git a/app-editors/nedit/files/nedit-5.6-format.patch b/app-editors/nedit/files/nedit-5.6-format.patch deleted file mode 100644 index e2d6e17a6470..000000000000 --- a/app-editors/nedit/files/nedit-5.6-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nedit-5.6/source/nc.c.format nedit-5.6/source/nc.c ---- nedit-5.6/source/nc.c.format 2014-12-28 13:56:20.000000000 +0000 -+++ nedit-5.6/source/nc.c 2015-06-17 07:30:25.617032345 +0100 -@@ -503,7 +503,7 @@ static int startServer(const char *messa - - /* prompt user whether to start server */ - if (!Preferences.autoStart) { -- printf(message); -+ printf("%s", message); - do { - c = getc(stdin); - } while (c == ' ' || c == '\t'); diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch deleted file mode 100644 index a549b02490c0..000000000000 --- a/app-editors/nedit/files/nedit-5.6-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/source/Makefile.common 2004-03-21 15:25:56.000000000 +0100 -+++ b/source/Makefile.common 2009-10-24 10:47:03.667835157 +0200 -@@ -21,12 +21,12 @@ - # we only want natural rebuilds to regenerate the link date. - nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) - $(CC) $(CFLAGS) -c linkdate.c -- $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ - $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@ - - # Note LIBS isn't quite right here; it links unnecessarily against Motif - nc: nc.o server_common.o ../util/libNUtil.a -- $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ - - help.o: help.c - $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild deleted file mode 100644 index 53a8b6f139cf..000000000000 --- a/app-editors/nedit/nedit-5.6-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Multi-purpose text editor for the X Window System" -HOMEPAGE="https://sourceforge.net/projects/nedit" -SRC_URI=" - https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=">=x11-libs/motif-2.3:0 - x11-libs/libXt - x11-libs/libX11" -DEPEND="${RDEPEND} - || ( dev-util/yacc sys-devel/bison ) - dev-lang/perl" - -S="${WORKDIR}/${PN}-5.6" - -src_prepare() { - #respecting LDFLAGS, bug #208189 - epatch \ - "${FILESDIR}"/${P}-format.patch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-40_Pointer_to_Integer.patch \ - "${FILESDIR}"/${P}-security.patch - sed \ - -e "s:bin/:${EPREFIX}/bin/:g" \ - -i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die - sed \ - -e "s:nc:neditc:g" -i doc/nc.pod || die - sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \ - makefiles/Makefile.linux || die - sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \ - -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \ - -e "s:-lX11:-lX11 -lXmu -liconv:" \ - -e "s:check_tif_rule::" \ - makefiles/Makefile.macosx || die - - epatch_user -} - -src_compile() { - case "${CHOST}" in - *-darwin*) - emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx - ;; - *-linux*) - emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux - ;; - esac - emake VERSION="NEdit ${PV}" -C doc all -} - -src_install() { - dobin source/nedit - newbin source/nc neditc - - make_desktop_entry "${PN}" - doicon "${WORKDIR}/${PN}.png" - - newman doc/nedit.man nedit.1 - newman doc/nc.man neditc.1 - - dodoc README ReleaseNotes ChangeLog - dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt - dohtml doc/nedit.html -} diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild deleted file mode 100644 index 018a58628a32..000000000000 --- a/app-editors/nedit/nedit-5.6-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop toolchain-funcs - -DESCRIPTION="Multi-purpose text editor for the X Window System" -HOMEPAGE="https://sourceforge.net/projects/nedit" -SRC_URI=" - https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=">=x11-libs/motif-2.3:0 - x11-libs/libXt - x11-libs/libX11" -DEPEND="${RDEPEND} - || ( dev-util/yacc sys-devel/bison ) - dev-lang/perl" - -S="${WORKDIR}/${PN}-${PV}" - -PATCHES=( "${FILESDIR}/${P}-format.patch" - "${FILESDIR}/${P}-ldflags.patch" - "${FILESDIR}/${P}-40_Pointer_to_Integer.patch" - "${FILESDIR}/${P}-security.patch" - "${FILESDIR}/${P}-fix-crash-with-noX.patch" -) - -src_prepare() { - #respecting LDFLAGS, bug #208189 - default - sed \ - -e "s:bin/:${EPREFIX}/bin/:g" \ - -i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die - sed \ - -e "s:nc:neditc:g" -i doc/nc.pod || die - sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \ - makefiles/Makefile.linux || die - sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \ - -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \ - -e "s:-lX11:-lX11 -lXmu -liconv:" \ - -e "s:check_tif_rule::" \ - makefiles/Makefile.macosx || die -} - -src_compile() { - case "${CHOST}" in - *-darwin*) - emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx - ;; - *-linux*) - emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux - ;; - esac - emake VERSION="NEdit ${PV}" -C doc all -} - -src_install() { - dobin source/nedit - newbin source/nc neditc - - make_desktop_entry "${PN}" - doicon "${WORKDIR}/${PN}.png" - - newman doc/nedit.man nedit.1 - newman doc/nc.man neditc.1 - - dodoc README ReleaseNotes ChangeLog - dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt - dohtml doc/nedit.html -} diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild index 25f9ab97f1db..f8a265fc947a 100644 --- a/app-editors/nedit/nedit-5.7.ebuild +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc" RDEPEND=">=x11-libs/motif-2.3:0 -- cgit v1.2.3