[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 0952cc09f0e72f266e49ce465ac03ef4d7fd24e5 Author: Amy Winston gentoo org> AuthorDate: Fri Sep 18 13:52:15 2015 + Commit: Amy Winston gentoo org> CommitDate: Fri Sep 18 13:55:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0952cc09 app-editors/nedit: Version bump bug #560344. .../files/nedit-5.6-40_Pointer_to_Integer.patch| 261 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 17 ++ app-editors/nedit/nedit-5.6.ebuild | 74 ++ 3 files changed, 352 insertions(+) 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 new file mode 100644 index 000..9081ea3 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch @@ -0,0 +1,261 @@ +#! /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.c2009-09-15 21:27:12.0 +0200 nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #include "SlideCP.h" + +@@ -116,14 +117,14 @@ + /* notify that initialize calledXtArgsProc*/ NULL, + /* NULL XtProc*/ NULL, + /* NULL XtPointer */ NULL, +-/* NULL Cardinal */ (Cardinal)NULL, ++/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, + /* resources for subclass fieldsXtResourceList*/ resources, + /* number of entries in resources Cardinal */ XtNumber(resources), + /* resource class quarkifiedXrmClass */ 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.0 +0200 nedit-5.6~cvs20081118/source/file.c2009-09-15 22:06:42.0 +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.0 +0200 nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.0 +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.0 +0200 nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.0 +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); +
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 0952cc09f0e72f266e49ce465ac03ef4d7fd24e5 Author: Amy Winston gentoo org> AuthorDate: Fri Sep 18 13:52:15 2015 + Commit: Amy Winston gentoo org> CommitDate: Fri Sep 18 13:55:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0952cc09 app-editors/nedit: Version bump bug #560344. .../files/nedit-5.6-40_Pointer_to_Integer.patch| 261 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 17 ++ app-editors/nedit/nedit-5.6.ebuild | 74 ++ 3 files changed, 352 insertions(+) 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 new file mode 100644 index 000..9081ea3 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch @@ -0,0 +1,261 @@ +#! /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.c2009-09-15 21:27:12.0 +0200 nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #include "SlideCP.h" + +@@ -116,14 +117,14 @@ + /* notify that initialize calledXtArgsProc*/ NULL, + /* NULL XtProc*/ NULL, + /* NULL XtPointer */ NULL, +-/* NULL Cardinal */ (Cardinal)NULL, ++/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, + /* resources for subclass fieldsXtResourceList*/ resources, + /* number of entries in resources Cardinal */ XtNumber(resources), + /* resource class quarkifiedXrmClass */ 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.0 +0200 nedit-5.6~cvs20081118/source/file.c2009-09-15 22:06:42.0 +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.0 +0200 nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.0 +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.0 +0200 nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.0 +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); +
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 0952cc09f0e72f266e49ce465ac03ef4d7fd24e5 Author: Amy Winston gentoo org> AuthorDate: Fri Sep 18 13:52:15 2015 + Commit: Amy Winston gentoo org> CommitDate: Fri Sep 18 13:55:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0952cc09 app-editors/nedit: Version bump bug #560344. .../files/nedit-5.6-40_Pointer_to_Integer.patch| 261 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 17 ++ app-editors/nedit/nedit-5.6.ebuild | 74 ++ 3 files changed, 352 insertions(+) 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 new file mode 100644 index 000..9081ea3 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch @@ -0,0 +1,261 @@ +#! /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.c2009-09-15 21:27:12.0 +0200 nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #include "SlideCP.h" + +@@ -116,14 +117,14 @@ + /* notify that initialize calledXtArgsProc*/ NULL, + /* NULL XtProc*/ NULL, + /* NULL XtPointer */ NULL, +-/* NULL Cardinal */ (Cardinal)NULL, ++/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, + /* resources for subclass fieldsXtResourceList*/ resources, + /* number of entries in resources Cardinal */ XtNumber(resources), + /* resource class quarkifiedXrmClass */ 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.0 +0200 nedit-5.6~cvs20081118/source/file.c2009-09-15 22:06:42.0 +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.0 +0200 nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.0 +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.0 +0200 nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.0 +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); +
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 0952cc09f0e72f266e49ce465ac03ef4d7fd24e5 Author: Amy Winston gentoo org> AuthorDate: Fri Sep 18 13:52:15 2015 + Commit: Amy Winston gentoo org> CommitDate: Fri Sep 18 13:55:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0952cc09 app-editors/nedit: Version bump bug #560344. .../files/nedit-5.6-40_Pointer_to_Integer.patch| 261 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 17 ++ app-editors/nedit/nedit-5.6.ebuild | 74 ++ 3 files changed, 352 insertions(+) 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 new file mode 100644 index 000..9081ea3 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch @@ -0,0 +1,261 @@ +#! /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.c2009-09-15 21:27:12.0 +0200 nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #include "SlideCP.h" + +@@ -116,14 +117,14 @@ + /* notify that initialize calledXtArgsProc*/ NULL, + /* NULL XtProc*/ NULL, + /* NULL XtPointer */ NULL, +-/* NULL Cardinal */ (Cardinal)NULL, ++/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, + /* resources for subclass fieldsXtResourceList*/ resources, + /* number of entries in resources Cardinal */ XtNumber(resources), + /* resource class quarkifiedXrmClass */ 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.0 +0200 nedit-5.6~cvs20081118/source/file.c2009-09-15 22:06:42.0 +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.0 +0200 nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.0 +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.0 +0200 nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.0 +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); +
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 0952cc09f0e72f266e49ce465ac03ef4d7fd24e5 Author: Amy Winston gentoo org> AuthorDate: Fri Sep 18 13:52:15 2015 + Commit: Amy Winston gentoo org> CommitDate: Fri Sep 18 13:55:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0952cc09 app-editors/nedit: Version bump bug #560344. .../files/nedit-5.6-40_Pointer_to_Integer.patch| 261 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 17 ++ app-editors/nedit/nedit-5.6.ebuild | 74 ++ 3 files changed, 352 insertions(+) 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 new file mode 100644 index 000..9081ea3 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch @@ -0,0 +1,261 @@ +#! /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.c2009-09-15 21:27:12.0 +0200 nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #include "SlideCP.h" + +@@ -116,14 +117,14 @@ + /* notify that initialize calledXtArgsProc*/ NULL, + /* NULL XtProc*/ NULL, + /* NULL XtPointer */ NULL, +-/* NULL Cardinal */ (Cardinal)NULL, ++/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, + /* resources for subclass fieldsXtResourceList*/ resources, + /* number of entries in resources Cardinal */ XtNumber(resources), + /* resource class quarkifiedXrmClass */ 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.0 +0200 nedit-5.6~cvs20081118/source/file.c2009-09-15 22:06:42.0 +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.0 +0200 nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.0 +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.0 +0200 nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.0 +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); +
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 0952cc09f0e72f266e49ce465ac03ef4d7fd24e5 Author: Amy Winston gentoo org> AuthorDate: Fri Sep 18 13:52:15 2015 + Commit: Amy Winston gentoo org> CommitDate: Fri Sep 18 13:55:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0952cc09 app-editors/nedit: Version bump bug #560344. .../files/nedit-5.6-40_Pointer_to_Integer.patch| 261 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 17 ++ app-editors/nedit/nedit-5.6.ebuild | 74 ++ 3 files changed, 352 insertions(+) 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 new file mode 100644 index 000..9081ea3 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch @@ -0,0 +1,261 @@ +#! /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.c2009-09-15 21:27:12.0 +0200 nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 +@@ -28,6 +28,7 @@ + #endif + + #include ++#include + + #include "SlideCP.h" + +@@ -116,14 +117,14 @@ + /* notify that initialize calledXtArgsProc*/ NULL, + /* NULL XtProc*/ NULL, + /* NULL XtPointer */ NULL, +-/* NULL Cardinal */ (Cardinal)NULL, ++/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, + /* resources for subclass fieldsXtResourceList*/ resources, + /* number of entries in resources Cardinal */ XtNumber(resources), + /* resource class quarkifiedXrmClass */ 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.0 +0200 nedit-5.6~cvs20081118/source/file.c2009-09-15 22:06:42.0 +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.0 +0200 nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.0 +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.0 +0200 nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.0 +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); +
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: be705aef09e7a6868a05a48aae30a08e283002eb Author: Amy Liffey gentoo org> AuthorDate: Fri May 3 11:43:43 2019 + Commit: Amy Liffey gentoo org> CommitDate: Fri May 3 11:52:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef app-editors/nedit: version bump 5.7 Closes: https://bugs.gentoo.org/675706 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-editors/nedit/Manifest | 1 + app-editors/nedit/files/nedit-5.7-doc.patch | 13 app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++ app-editors/nedit/nedit-5.7.ebuild | 80 + 4 files changed, 111 insertions(+) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index 373266df0be..305b7346869 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000..fceb9e1773c --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000..b529d3327dd --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(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.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000..ba195aaf484 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +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}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 06f8269c38f50f99683311ebb84658cb7a87b865 Author: Amy Liffey gentoo org> AuthorDate: Tue Mar 13 08:57:55 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Mar 13 09:05:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f8269c app-editors/nedit: fix X core font crash Closes: https://bugs.gentoo.org/591912 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 + app-editors/nedit/files/nedit-5.6-ldflags.patch| 4 +- app-editors/nedit/nedit-5.6-r2.ebuild | 78 ++ 3 files changed, 198 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..92b0778e2ab --- /dev/null +++ b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch @@ -0,0 +1,118 @@ +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.c2018-03-13 08:42:40.931188154 +0100 b/source/text.c2018-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); ++ ++
[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/files/, app-editors/nedit/
commit: 2120fb6b4ef6b8cd5638786db0a1132b3fff16d3 Author: Amy Winston gentoo org> AuthorDate: Mon Jun 6 16:14:40 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon Jun 6 16:14:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2120fb6b app-editors/nedit: remove old 5.5* Package-Manager: portage-2.2.28 app-editors/nedit/Manifest | 1 - .../nedit/files/nedit-5.5_p20090914-ldflags.patch | 17 -- ...nedit-5.5_p20110116-40_Pointer_to_Integer.patch | 261 - .../nedit/files/nedit-5.5_p20110116-security.patch | 63 - app-editors/nedit/nedit-5.5_p20110116-r2.ebuild| 76 -- app-editors/nedit/nedit-5.5_p20110116-r3.ebuild| 81 --- 6 files changed, 499 deletions(-) diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d1ca4ce..ab7479c 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -1,3 +1,2 @@ -DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa DIST nedit-5.6a-src.tar.gz 1353454 SHA256 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 WHIRLPOOL 12e8494f23d8c67cdfae9e76bbcd7fb2f0c9a8dd037b2036c0f4a218df4c17c6754a234789a80dda209fdddb6b6e0184600a953a5c758ce5c112013df37103f7 DIST nedit.png.xz 14000 SHA256 7ca585000d4a47872aac1c955b7d6656f41479bd7ead426859304f68ccc862db SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 WHIRLPOOL d689e59d29417272b2f0d6cd8c806c06f7465ff9ca9266b4f2e639775e537d46d8de0f5b47e00ed123b9fcc63db692c20ae6546cece48af6603b0eec570ebede diff --git a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch b/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch deleted file mode 100644 index 4532c62..000 --- a/app-editors/nedit/files/nedit-5.5_p20090914-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ source/Makefile.common 2004-03-21 15:25:56.0 +0100 -+++ source/Makefile.common.new 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/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.5_p20110116-40_Pointer_to_Integer.patch deleted file mode 100644 index 9081ea3..000 --- a/app-editors/nedit/files/nedit-5.5_p20110116-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.c2009-09-15 21:27:12.0 +0200 -+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.0 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - - #include "SlideCP.h" - -@@ -116,14 +117,14 @@ - /* notify that initialize calledXtArgsProc*/ NULL, - /* NULL XtProc*/ NULL, - /* NULL XtPointer */ NULL, --/* NULL Cardinal */ (Cardinal)NULL, -+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL, - /* resources for subclass fieldsXtResourceList*/ resources, - /* number of entries in resources Cardinal */ XtNumber(resources), - /* resource class quarkifiedXrmClass */ NULLQUARK, --/* NULL Boolean */ (Boolean)NULL, --/* NULL XtEnum