* [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/
@ 2015-09-21 8:27 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-09-21 8:27 UTC (permalink / raw
To: gentoo-commits
commit: e250c2ce3904a745b81fe5835aff8f481740caeb
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 08:27:01 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 08:27:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e250c2ce
app-editors/nedit: Fix for format-security
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-editors/nedit/files/nedit-5.6-format.patch | 12 ++++++++++++
app-editors/nedit/metadata.xml | 6 +++---
app-editors/nedit/nedit-5.6.ebuild | 1 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/app-editors/nedit/files/nedit-5.6-format.patch b/app-editors/nedit/files/nedit-5.6-format.patch
new file mode 100644
index 0000000..e2d6e17
--- /dev/null
+++ b/app-editors/nedit/files/nedit-5.6-format.patch
@@ -0,0 +1,12 @@
+diff -up nedit-5.6/source/nc.c.format nedit-5.6/source/nc.c
+--- nedit-5.6/source/nc.c.format 2014-12-28 13:56:20.000000000 +0000
++++ nedit-5.6/source/nc.c 2015-06-17 07:30:25.617032345 +0100
+@@ -503,7 +503,7 @@ static int startServer(const char *messa
+
+ /* prompt user whether to start server */
+ if (!Preferences.autoStart) {
+- printf(message);
++ printf("%s", message);
+ do {
+ c = getc(stdin);
+ } while (c == ' ' || c == '\t');
diff --git a/app-editors/nedit/metadata.xml b/app-editors/nedit/metadata.xml
index b71a05c..843f88b 100644
--- a/app-editors/nedit/metadata.xml
+++ b/app-editors/nedit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
-<email>amynka@gentoo.org</email>
-</maintainer>
+ <maintainer>
+ <email>amynka@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
diff --git a/app-editors/nedit/nedit-5.6.ebuild b/app-editors/nedit/nedit-5.6.ebuild
index 3c2f414..ac94482 100644
--- a/app-editors/nedit/nedit-5.6.ebuild
+++ b/app-editors/nedit/nedit-5.6.ebuild
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-5.6"
src_prepare() {
#respecting LDFLAGS, bug #208189
epatch \
+ "${FILESDIR}"/${P}-format.patch \
"${FILESDIR}"/${P}-ldflags.patch \
"${FILESDIR}"/${P}-40_Pointer_to_Integer.patch
sed \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/
@ 2016-03-14 17:04 Amy Winston
0 siblings, 0 replies; 5+ messages in thread
From: Amy Winston @ 2016-03-14 17:04 UTC (permalink / raw
To: gentoo-commits
commit: c6d0e01f0d4eb03ce24e5e23adc1d0881df4f8d6
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 16:59:07 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 17:02:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d0e01f
app-editors/nedit: security patch added
Package-Manager: portage-2.2.26
.../nedit/files/nedit-5.5_p20110116-security.patch | 63 ++++++++++++++++++++++
app-editors/nedit/files/nedit-5.6-security.patch | 63 ++++++++++++++++++++++
app-editors/nedit/nedit-5.5_p20110116-r3.ebuild | 3 +-
app-editors/nedit/nedit-5.6-r1.ebuild | 3 +-
4 files changed, 130 insertions(+), 2 deletions(-)
diff --git a/app-editors/nedit/files/nedit-5.5_p20110116-security.patch b/app-editors/nedit/files/nedit-5.5_p20110116-security.patch
new file mode 100644
index 0000000..b24ef23
--- /dev/null
+++ b/app-editors/nedit/files/nedit-5.5_p20110116-security.patch
@@ -0,0 +1,63 @@
+Index: nedit-5.5/source/file.c
+===================================================================
+--- nedit-5.5.orig/source/file.c 2004-08-24 11:37:24.000000000 +0200
++++ nedit-5.5/source/file.c 2010-03-27 18:44:01.000000000 +0100
+@@ -1314,7 +1314,7 @@
+ */
+ void PrintString(const char *string, int length, Widget parent, const char *jobName)
+ {
+- char tmpFileName[L_tmpnam]; /* L_tmpnam defined in stdio.h */
++ char *tmpFileName=strdup("/tmp/neditXXXXXX");
+ FILE *fp;
+ int fd;
+
+@@ -1325,14 +1325,10 @@
+ 1. Create a filename
+ 2. Open the file with the O_CREAT|O_EXCL flags
+ So all an attacker can do is a DoS on the print function. */
+- tmpnam(tmpFileName);
++ fd = mkstemp(tmpFileName);
+
+ /* open the temporary file */
+-#ifdef VMS
+- if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL)
+-#else
+- if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL)
+-#endif /* VMS */
++ if ((fp = fdopen(fd, "w")) == NULL)
+ {
+ DialogF(DF_WARN, parent, 1, "Error while Printing",
+ "Unable to write file for printing:\n%s", "OK",
+@@ -1346,7 +1342,7 @@
+
+ /* write to the file */
+ #ifdef IBM_FWRITE_BUG
+- write(fileno(fp), string, length);
++ write(fd, string, length);
+ #else
+ fwrite(string, sizeof(char), length, fp);
+ #endif
+@@ -1356,6 +1352,7 @@
+ "%s not printed:\n%s", "OK", jobName, errorString());
+ fclose(fp); /* should call close(fd) in turn! */
+ remove(tmpFileName);
++ free(tmpFileName);
+ return;
+ }
+
+@@ -1366,6 +1363,7 @@
+ "Error closing temp. print file:\n%s", "OK",
+ errorString());
+ remove(tmpFileName);
++ free(tmpFileName);
+ return;
+ }
+
+@@ -1377,6 +1375,7 @@
+ PrintFile(parent, tmpFileName, jobName);
+ remove(tmpFileName);
+ #endif /*VMS*/
++ free(tmpFileName);
+ return;
+ }
+
diff --git a/app-editors/nedit/files/nedit-5.6-security.patch b/app-editors/nedit/files/nedit-5.6-security.patch
new file mode 100644
index 0000000..b24ef23
--- /dev/null
+++ b/app-editors/nedit/files/nedit-5.6-security.patch
@@ -0,0 +1,63 @@
+Index: nedit-5.5/source/file.c
+===================================================================
+--- nedit-5.5.orig/source/file.c 2004-08-24 11:37:24.000000000 +0200
++++ nedit-5.5/source/file.c 2010-03-27 18:44:01.000000000 +0100
+@@ -1314,7 +1314,7 @@
+ */
+ void PrintString(const char *string, int length, Widget parent, const char *jobName)
+ {
+- char tmpFileName[L_tmpnam]; /* L_tmpnam defined in stdio.h */
++ char *tmpFileName=strdup("/tmp/neditXXXXXX");
+ FILE *fp;
+ int fd;
+
+@@ -1325,14 +1325,10 @@
+ 1. Create a filename
+ 2. Open the file with the O_CREAT|O_EXCL flags
+ So all an attacker can do is a DoS on the print function. */
+- tmpnam(tmpFileName);
++ fd = mkstemp(tmpFileName);
+
+ /* open the temporary file */
+-#ifdef VMS
+- if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL)
+-#else
+- if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL)
+-#endif /* VMS */
++ if ((fp = fdopen(fd, "w")) == NULL)
+ {
+ DialogF(DF_WARN, parent, 1, "Error while Printing",
+ "Unable to write file for printing:\n%s", "OK",
+@@ -1346,7 +1342,7 @@
+
+ /* write to the file */
+ #ifdef IBM_FWRITE_BUG
+- write(fileno(fp), string, length);
++ write(fd, string, length);
+ #else
+ fwrite(string, sizeof(char), length, fp);
+ #endif
+@@ -1356,6 +1352,7 @@
+ "%s not printed:\n%s", "OK", jobName, errorString());
+ fclose(fp); /* should call close(fd) in turn! */
+ remove(tmpFileName);
++ free(tmpFileName);
+ return;
+ }
+
+@@ -1366,6 +1363,7 @@
+ "Error closing temp. print file:\n%s", "OK",
+ errorString());
+ remove(tmpFileName);
++ free(tmpFileName);
+ return;
+ }
+
+@@ -1377,6 +1375,7 @@
+ PrintFile(parent, tmpFileName, jobName);
+ remove(tmpFileName);
+ #endif /*VMS*/
++ free(tmpFileName);
+ return;
+ }
+
diff --git a/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild b/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
index 0acd378..86ab916 100644
--- a/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
+++ b/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
@@ -29,7 +29,8 @@ src_prepare() {
#respecting LDFLAGS, bug #208189
epatch \
"${FILESDIR}"/nedit-5.5_p20090914-ldflags.patch \
- "${FILESDIR}"/${P}-40_Pointer_to_Integer.patch
+ "${FILESDIR}"/${P}-40_Pointer_to_Integer.patch \
+ "${FILESDIR}"/${P}-security.patch
sed \
-e "s:bin/:${EPREFIX}/bin/:g" \
diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
index c8b0da3..68ebc4b 100644
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ b/app-editors/nedit/nedit-5.6-r1.ebuild
@@ -30,7 +30,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-format.patch \
"${FILESDIR}"/${P}-ldflags.patch \
- "${FILESDIR}"/${P}-40_Pointer_to_Integer.patch
+ "${FILESDIR}"/${P}-40_Pointer_to_Integer.patch \
+ "${FILESDIR}"/${P}-security.patch
sed \
-e "s:bin/:${EPREFIX}/bin/:g" \
-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/
@ 2016-03-14 17:04 Amy Winston
0 siblings, 0 replies; 5+ messages in thread
From: Amy Winston @ 2016-03-14 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 4d3de04619559fd4987c99538674905a21f4b35c
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 16:55:26 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 17:02:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3de046
app-editors/nedit: missing icon repaired bug #568448
Package-Manager: portage-2.2.26
app-editors/nedit/files/nedit.png | Bin 0 -> 13937 bytes
app-editors/nedit/files/nedit.svg | 69 ---------------------
...it-5.6.ebuild => nedit-5.5_p20110116-r3.ebuild} | 18 +++---
.../{nedit-5.6.ebuild => nedit-5.6-r1.ebuild} | 4 +-
4 files changed, 12 insertions(+), 79 deletions(-)
diff --git a/app-editors/nedit/files/nedit.png b/app-editors/nedit/files/nedit.png
new file mode 100644
index 0000000..a7bd18a
Binary files /dev/null and b/app-editors/nedit/files/nedit.png differ
diff --git a/app-editors/nedit/files/nedit.svg b/app-editors/nedit/files/nedit.svg
deleted file mode 100644
index 65ab415..0000000
--- a/app-editors/nedit/files/nedit.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- version="1.1"
- inkscape:version="0.47 r22583"
- width="82"
- height="82"
- sodipodi:docname="nedit_82x82.png">
- <metadata
- id="metadata8">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs6">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- id="perspective10" />
- </defs>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="483"
- id="namedview4"
- showgrid="false"
- inkscape:zoom="2.8780488"
- inkscape:cx="41"
- inkscape:cy="41"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <image
- sodipodi:absref="/home/jstile/nedit_82x82.png"
- xlink:href="nedit_82x82.png"
- y="0"
- x="0"
- id="image12"
- height="82"
- width="82" />
-</svg>
diff --git a/app-editors/nedit/nedit-5.6.ebuild b/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
similarity index 82%
copy from app-editors/nedit/nedit-5.6.ebuild
copy to app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
index ac94482..0acd378 100644
--- a/app-editors/nedit/nedit-5.6.ebuild
+++ b/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,8 +7,8 @@ EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="http://sourceforge.net/projects/nedit"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz"
+HOMEPAGE="http://nedit.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -23,14 +23,14 @@ DEPEND="${RDEPEND}
|| ( dev-util/yacc sys-devel/bison )
dev-lang/perl"
-S="${WORKDIR}/${PN}-5.6"
+S="${WORKDIR}/${PN}"
src_prepare() {
#respecting LDFLAGS, bug #208189
epatch \
- "${FILESDIR}"/${P}-format.patch \
- "${FILESDIR}"/${P}-ldflags.patch \
+ "${FILESDIR}"/nedit-5.5_p20090914-ldflags.patch \
"${FILESDIR}"/${P}-40_Pointer_to_Integer.patch
+
sed \
-e "s:bin/:${EPREFIX}/bin/:g" \
-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
@@ -47,6 +47,8 @@ src_prepare() {
epatch_user
}
+src_configure() { :; }
+
src_compile() {
case "${CHOST}" in
*-darwin*)
@@ -56,7 +58,7 @@ src_compile() {
emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
;;
esac
- emake VERSION="NEdit ${PV}" -C doc all
+ emake VERSION="NEdit ${PV}" -j1 -C doc all
}
src_install() {
@@ -64,7 +66,7 @@ src_install() {
newbin source/nc neditc
make_desktop_entry "${PN}"
- doicon "${FILESDIR}/${PN}.svg"
+ doicon "${FILESDIR}/${PN}.png"
newman doc/nedit.man nedit.1
newman doc/nc.man neditc.1
diff --git a/app-editors/nedit/nedit-5.6.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
similarity index 96%
rename from app-editors/nedit/nedit-5.6.ebuild
rename to app-editors/nedit/nedit-5.6-r1.ebuild
index ac94482..c8b0da3 100644
--- a/app-editors/nedit/nedit-5.6.ebuild
+++ b/app-editors/nedit/nedit-5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -64,7 +64,7 @@ src_install() {
newbin source/nc neditc
make_desktop_entry "${PN}"
- doicon "${FILESDIR}/${PN}.svg"
+ doicon "${FILESDIR}/${PN}.png"
newman doc/nedit.man nedit.1
newman doc/nc.man neditc.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/
@ 2016-04-06 17:11 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2016-04-06 17:11 UTC (permalink / raw
To: gentoo-commits
commit: c5dac0a4404c4b9c1e9ee579fa30615c56d4f0d5
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 3 08:52:12 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 17:11:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dac0a4
app-editors/nedit: Mirror binary files and remove from VCS
Package-Manager: portage-2.2.28
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-editors/nedit/Manifest | 1 +
app-editors/nedit/files/nedit.png | Bin 13937 -> 0 bytes
app-editors/nedit/nedit-5.5_p20110116-r3.ebuild | 7 +++++--
app-editors/nedit/nedit-5.6-r1.ebuild | 6 ++++--
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 9e2a750..d1ca4ce 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,2 +1,3 @@
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.png b/app-editors/nedit/files/nedit.png
deleted file mode 100644
index a7bd18a..0000000
Binary files a/app-editors/nedit/files/nedit.png and /dev/null differ
diff --git a/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild b/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
index 86ab916..3bc158a 100644
--- a/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
+++ b/app-editors/nedit/nedit-5.5_p20110116-r3.ebuild
@@ -8,7 +8,10 @@ inherit eutils toolchain-funcs
DESCRIPTION="Multi-purpose text editor for the X Window System"
HOMEPAGE="http://nedit.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="
+ mirror://gentoo/${P}.tar.bz2
+ https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz
+ "
LICENSE="GPL-2"
SLOT="0"
@@ -67,7 +70,7 @@ src_install() {
newbin source/nc neditc
make_desktop_entry "${PN}"
- doicon "${FILESDIR}/${PN}.png"
+ doicon "${WORKDIR}/${PN}.png"
newman doc/nedit.man nedit.1
newman doc/nc.man neditc.1
diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild
index 68ebc4b..0567fdf 100644
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ b/app-editors/nedit/nedit-5.6-r1.ebuild
@@ -8,7 +8,9 @@ inherit eutils toolchain-funcs
DESCRIPTION="Multi-purpose text editor for the X Window System"
HOMEPAGE="http://sourceforge.net/projects/nedit"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz"
+SRC_URI="
+ http://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
+ https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -65,7 +67,7 @@ src_install() {
newbin source/nc neditc
make_desktop_entry "${PN}"
- doicon "${FILESDIR}/${PN}.png"
+ doicon "${WORKDIR}/${PN}.png"
newman doc/nedit.man nedit.1
newman doc/nc.man neditc.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/
@ 2021-04-22 12:27 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-22 12:27 UTC (permalink / raw
To: gentoo-commits
commit: 539ad6225bc6950eb4c30145c3acea9e91de9e19
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 12:26:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 12:27:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539ad622
app-editors/nedit: drop 5.6-r2 (EAPI 5)
Closes: https://bugs.gentoo.org/783627
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/nedit/Manifest | 1 -
.../files/nedit-5.6-40_Pointer_to_Integer.patch | 261 ---------------------
.../nedit/files/nedit-5.6-fix-crash-with-noX.patch | 118 ----------
app-editors/nedit/files/nedit-5.6-format.patch | 12 -
app-editors/nedit/files/nedit-5.6-ldflags.patch | 17 --
app-editors/nedit/nedit-5.6-r2.ebuild | 76 ------
6 files changed, 485 deletions(-)
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 305b7346869..80d3274dd60 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,3 +1,2 @@
-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.6-40_Pointer_to_Integer.patch b/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
deleted file mode 100644
index 9081ea34061..00000000000
--- a/app-editors/nedit/files/nedit-5.6-40_Pointer_to_Integer.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# Description: fix warning: cast from pointer to integer of different size
-# Origin: https://sourceforge.net/tracker/download.php?group_id=11005&atid=311005&file_id=340993&aid=2846694
-# Bug: https://sourceforge.net/tracker/?func=detail&atid=311005&aid=2846694&group_id=11005
-# Author: Jack Howarth <jwhowarth@users.sourceforge.net>
-
-@DPATCH@
-diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c
---- nedit-5.6~cvs20081118~/Xlt/SlideC.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.000000000 +0200
-@@ -28,6 +28,7 @@
- #endif
-
- #include <Xm/XmP.h>
-+#include <stdint.h>
-
- #include "SlideCP.h"
-
-@@ -116,14 +117,14 @@
- /* notify that initialize called XtArgsProc */ NULL,
- /* NULL XtProc */ NULL,
- /* NULL XtPointer */ NULL,
--/* NULL Cardinal */ (Cardinal)NULL,
-+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL,
- /* resources for subclass fields XtResourceList */ resources,
- /* number of entries in resources Cardinal */ XtNumber(resources),
- /* resource class quarkified XrmClass */ NULLQUARK,
--/* NULL Boolean */ (Boolean)NULL,
--/* NULL XtEnum */ (XtEnum)NULL,
--/* NULL Boolean */ (Boolean)NULL,
--/* NULL Boolean */ (Boolean)NULL,
-+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
-+/* NULL XtEnum */ (XtEnum)(uintptr_t)NULL,
-+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
-+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
- /* free data for subclass pointers XtWidgetProc */ destroy,
- /* NULL XtProc */ NULL,
- /* NULL XtProc */ NULL,
-diff -urNad nedit-5.6~cvs20081118~/source/file.c nedit-5.6~cvs20081118/source/file.c
---- nedit-5.6~cvs20081118~/source/file.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/file.c 2009-09-15 22:06:42.000000000 +0200
-@@ -52,6 +52,7 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
-
-@@ -1914,7 +1915,7 @@
- if (XmToggleButtonGetState(w)) {
- XtPointer userData;
- XtVaGetValues(w, XmNuserData, &userData, NULL);
-- *(int*) clientData = (int) userData;
-+ *(int*) clientData = (int) (uintptr_t) userData;
- }
- }
-
-diff -urNad nedit-5.6~cvs20081118~/source/highlight.c nedit-5.6~cvs20081118/source/highlight.c
---- nedit-5.6~cvs20081118~/source/highlight.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.000000000 +0200
-@@ -49,6 +49,7 @@
- #include <limits.h>
- #include <math.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #ifdef VMS
- #include "../util/VMSparam.h"
-@@ -512,7 +513,7 @@
- if (!pattern) {
- return NULL;
- }
-- return (void*)pattern->userStyleIndex;
-+ return (void*)(uintptr_t)pattern->userStyleIndex;
- }
-
- /*
-diff -urNad nedit-5.6~cvs20081118~/source/macro.c nedit-5.6~cvs20081118/source/macro.c
---- nedit-5.6~cvs20081118~/source/macro.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.000000000 +0200
-@@ -60,6 +60,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -2924,7 +2925,7 @@
- readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
- btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
- XmNlabelString, s1=XmStringCreateSimple(btnLabel),
-- XmNuserData, (XtPointer)(i+1), NULL);
-+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
- XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
- XmStringFree(s1);
- }
-@@ -2965,7 +2966,7 @@
- return; /* shouldn't happen */
- if (XtClass(w) == xmPushButtonWidgetClass) {
- XtVaGetValues(w, XmNuserData, &userData, NULL);
-- retVal.val.n = (int)userData;
-+ retVal.val.n = (int)(uintptr_t)userData;
- } else
- retVal.val.n = 1;
- retVal.tag = INT_TAG;
-@@ -3101,7 +3102,7 @@
- readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
- btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
- XmNlabelString, s1=XmStringCreateSimple(btnLabel),
-- XmNuserData, (XtPointer)(i+1), NULL);
-+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
- XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
- XmStringFree(s1);
- }
-@@ -3155,7 +3156,7 @@
- returned in w. */
- if (XtClass(w) == xmPushButtonWidgetClass) {
- XtVaGetValues(w, XmNuserData, &userData, NULL);
-- btnNum = (int)userData;
-+ btnNum = (int)(uintptr_t)userData;
- } else
- btnNum = 1;
-
-@@ -3680,7 +3681,7 @@
- readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
- btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
- XmNlabelString, s1=XmStringCreateSimple(btnLabel),
-- XmNuserData, (XtPointer)(i+1), NULL);
-+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
- XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
- XmStringFree(s1);
- }
-@@ -3760,7 +3761,7 @@
- returned in w. */
- if (XtClass(w) == xmPushButtonWidgetClass) {
- XtVaGetValues(w, XmNuserData, &userData, NULL);
-- btnNum = (int)userData;
-+ btnNum = (int)(uintptr_t)userData;
- } else
- btnNum = 1;
-
-diff -urNad nedit-5.6~cvs20081118~/source/preferences.c nedit-5.6~cvs20081118/source/preferences.c
---- nedit-5.6~cvs20081118~/source/preferences.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/preferences.c 2009-09-15 22:07:47.000000000 +0200
-@@ -58,6 +58,7 @@
- #include <ctype.h>
- #include <pwd.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -2296,7 +2297,7 @@
- XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
- for (n=0; n<(int)nItems; n++) {
- XtVaGetValues(items[n], XmNuserData, &userData, NULL);
-- XmToggleButtonSetState(items[n], (int)userData == mode, False);
-+ XmToggleButtonSetState(items[n], (int)(uintptr_t)userData == mode, False);
- }
- }
- }
-@@ -5148,7 +5149,7 @@
- xmToggleButtonGadgetClass, menu,
- XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
- XmNmarginHeight, 0,
-- XmNuserData, (void *)i,
-+ XmNuserData, (void *)(uintptr_t)i,
- XmNset, window->languageMode==i, NULL);
- XmStringFree(s1);
- XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
-@@ -5169,14 +5170,14 @@
- XtVaGetValues(w, XmNuserData, &mode, NULL);
-
- /* If the mode didn't change, do nothing */
-- if (window->languageMode == (int)mode)
-+ if (window->languageMode == (int)(uintptr_t)mode)
- return;
-
- /* redo syntax highlighting word delimiters, etc. */
- /*
- reapplyLanguageMode(window, (int)mode, False);
- */
-- params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
-+ params[0] = (((int)(uintptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)(uintptr_t)mode]->name;
- XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);
- }
-
-diff -urNad nedit-5.6~cvs20081118~/source/regularExp.c nedit-5.6~cvs20081118/source/regularExp.c
---- nedit-5.6~cvs20081118~/source/regularExp.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/regularExp.c 2009-09-15 22:08:16.000000000 +0200
-@@ -88,6 +88,7 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
-
- #ifdef HAVE_DEBUG_H
-@@ -4157,7 +4158,7 @@
- table [*c] = 1;
- }
-
-- table [(int) NULL] = 1; /* These */
-+ table [(int)(uintptr_t) NULL] = 1; /* These */
- table [(int) '\t'] = 1; /* characters */
- table [(int) '\n'] = 1; /* are always */
- table [(int) ' ' ] = 1; /* delimiters. */
-diff -urNad nedit-5.6~cvs20081118~/source/userCmds.c nedit-5.6~cvs20081118/source/userCmds.c
---- nedit-5.6~cvs20081118~/source/userCmds.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/source/userCmds.c 2009-09-15 22:08:47.000000000 +0200
-@@ -49,6 +49,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <ctype.h>
- #ifdef VMS
-@@ -1116,7 +1117,7 @@
- XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
- dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
- } else {
-- index = (int)userData - 10;
-+ index = (int)(uintptr_t)userData - 10;
- if (index <0 || index >= nMenuItems)
- return;
- if (menuList[index]->input == FROM_SELECTION)
-@@ -1928,7 +1929,7 @@
- XmNlabelString, st1,
- XmNacceleratorText, st2,
- XmNmnemonic, f->mnemonic,
-- XmNuserData, (XtPointer)(index+10), NULL);
-+ XmNuserData, (XtPointer)(uintptr_t)(index+10), NULL);
- XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg);
- XmStringFree(st1);
- XmStringFree(st2);
-diff -urNad nedit-5.6~cvs20081118~/util/prefFile.c nedit-5.6~cvs20081118/util/prefFile.c
---- nedit-5.6~cvs20081118~/util/prefFile.c 2009-09-15 21:27:12.000000000 +0200
-+++ nedit-5.6~cvs20081118/util/prefFile.c 2009-09-15 22:04:14.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- #ifdef VMS
- #include "VMSparam.h"
- #else
-@@ -353,9 +354,9 @@
- *(int *)rsrcDescrip->valueAddr = 0;
- return False;
- case PREF_STRING:
-- if ((int)strlen(string) >= (int)rsrcDescrip->arg)
-+ if ((int)strlen(string) >= (int)(uintptr_t)rsrcDescrip->arg)
- return False;
-- strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
-+ strncpy(rsrcDescrip->valueAddr, string, (int)(uintptr_t)rsrcDescrip->arg);
- return True;
- case PREF_ALLOC_STRING:
- *(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);
diff --git a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch b/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
deleted file mode 100644
index 92b0778e2ab..00000000000
--- a/app-editors/nedit/files/nedit-5.6-fix-crash-with-noX.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -urN a/source/highlightData.c b/source/highlightData.c
---- a/source/highlightData.c 2018-03-13 08:42:40.930188154 +0100
-+++ b/source/highlightData.c 2018-03-13 08:44:59.651196431 +0100
-@@ -1280,7 +1280,7 @@
- XFontStruct *font;
-
- if (styleNo<0)
-- return GetDefaultFontStruct(window->fontList);
-+ return GetDefaultFontStruct(TheDisplay, window->fontList);
- fontNum = HighlightStyles[styleNo]->font;
- if (fontNum == BOLD_FONT)
- font = window->boldFontStruct;
-@@ -1289,10 +1289,10 @@
- else if (fontNum == BOLD_ITALIC_FONT)
- font = window->boldItalicFontStruct;
- else /* fontNum == PLAIN_FONT */
-- font = GetDefaultFontStruct(window->fontList);
-+ font = GetDefaultFontStruct(TheDisplay, window->fontList);
-
- /* If font isn't loaded, silently substitute primary font */
-- return font == NULL ? GetDefaultFontStruct(window->fontList) : font;
-+ return font == NULL ? GetDefaultFontStruct(TheDisplay, window->fontList) : font;
- }
-
- int FontOfNamedStyleIsBold(char *styleName)
-diff -urN a/source/text.c b/source/text.c
---- a/source/text.c 2018-03-13 08:42:40.931188154 +0100
-+++ b/source/text.c 2018-03-13 08:46:37.785202286 +0100
-@@ -778,9 +778,13 @@
- textBuffer *buf;
- Pixel white, black;
- int textLeft;
-- int charWidth = fs->max_bounds.width;
-- int marginWidth = new->text.marginWidth;
-- int lineNumCols = new->text.lineNumCols;
-+ int charWidth;
-+ int marginWidth;
-+ int lineNumCols;
-+
-+ charWidth = fs->max_bounds.width;
-+ marginWidth = new->text.marginWidth;
-+ lineNumCols = new->text.lineNumCols;
-
- /* Set the initial window size based on the rows and columns resources */
- if (request->core.width == 0)
-diff -urN a/source/window.c b/source/window.c
---- a/source/window.c 2018-03-13 08:42:40.937188155 +0100
-+++ b/source/window.c 2018-03-13 08:48:07.727207652 +0100
-@@ -1839,7 +1839,7 @@
-
- /* Change the primary font in all the widgets */
- if (primaryChanged) {
-- font = GetDefaultFontStruct(window->fontList);
-+ font = GetDefaultFontStruct(TheDisplay, window->fontList);
- XtVaSetValues(window->textArea, textNfont, font, NULL);
- for (i=0; i<window->nPanes; i++)
- XtVaSetValues(window->textPanes[i], textNfont, font, NULL);
-@@ -1861,7 +1861,7 @@
- size appropriate for the new font, but only do so if there's only
- _one_ document in the window, in order to avoid growing-window bug */
- if (NDocuments(window) == 1) {
-- fontWidth = GetDefaultFontStruct(window->fontList)->max_bounds.width;
-+ fontWidth = GetDefaultFontStruct(TheDisplay, window->fontList)->max_bounds.width;
- fontHeight = textD->ascent + textD->descent;
- newWindowWidth = (oldTextWidth*fontWidth) / oldFontWidth + borderWidth;
- newWindowHeight = (oldTextHeight*fontHeight) / oldFontHeight +
-@@ -2244,7 +2244,7 @@
- textNrows, rows, textNcolumns, cols,
- textNlineNumCols, lineNumCols,
- textNemulateTabs, emTabDist,
-- textNfont, GetDefaultFontStruct(window->fontList),
-+ textNfont, GetDefaultFontStruct(TheDisplay, window->fontList),
- textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
- textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
- textNwordDelimiters, delimiters,
-
---- a/util/misc.c 2018-03-13 08:50:54.892217626 +0100
-+++ b/util/misc.c 2018-03-13 08:56:50.346238834 +0100
-@@ -1018,7 +1018,7 @@
- ** a Motif font list. Since Motif stores this, it saves us from storing
- ** it or querying it from the X server.
- */
--XFontStruct *GetDefaultFontStruct(XmFontList font)
-+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font)
- {
- XFontStruct *fs;
- XmFontContext context;
-@@ -1028,6 +1028,17 @@
- XmFontListGetNextFont(context, &charset, &fs);
- XmFontListFreeFontContext(context);
- XtFree(charset);
-+
-+ /* FontList might be a render table with no only XFT fonts */
-+ if (fs == NULL) {
-+ fs = XLoadQueryFont(d, "fixed");
-+ }
-+
-+ if (fs == NULL) {
-+ fprintf(stderr, "Unabled to load any fallback fonts.\n");
-+ exit(EXIT_FAILURE);
-+ }
-+
- return fs;
- }
-
-diff -urN a/util/misc.h b/util/misc.h
---- a/util/misc.h 2018-03-13 08:50:54.890217626 +0100
-+++ b/util/misc.h 2018-03-13 08:55:52.790235400 +0100
-@@ -65,7 +65,7 @@
- void AccelLockBugPatch(Widget topWidget, Widget topMenuContainer);
- void UpdateAccelLockPatch(Widget topWidget, Widget newButton);
- char *GetXmStringText(XmString fromString);
--XFontStruct *GetDefaultFontStruct(XmFontList font);
-+XFontStruct *GetDefaultFontStruct(Display *d, XmFontList font);
- XmString* StringTable(int count, ...);
- void FreeStringTable(XmString *table);
- void SimulateButtonPress(Widget widget);
-
diff --git a/app-editors/nedit/files/nedit-5.6-format.patch b/app-editors/nedit/files/nedit-5.6-format.patch
deleted file mode 100644
index e2d6e17a647..00000000000
--- a/app-editors/nedit/files/nedit-5.6-format.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nedit-5.6/source/nc.c.format nedit-5.6/source/nc.c
---- nedit-5.6/source/nc.c.format 2014-12-28 13:56:20.000000000 +0000
-+++ nedit-5.6/source/nc.c 2015-06-17 07:30:25.617032345 +0100
-@@ -503,7 +503,7 @@ static int startServer(const char *messa
-
- /* prompt user whether to start server */
- if (!Preferences.autoStart) {
-- printf(message);
-+ printf("%s", message);
- do {
- c = getc(stdin);
- } while (c == ' ' || c == '\t');
diff --git a/app-editors/nedit/files/nedit-5.6-ldflags.patch b/app-editors/nedit/files/nedit-5.6-ldflags.patch
deleted file mode 100644
index a549b02490c..00000000000
--- a/app-editors/nedit/files/nedit-5.6-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/source/Makefile.common 2004-03-21 15:25:56.000000000 +0100
-+++ b/source/Makefile.common 2009-10-24 10:47:03.667835157 +0200
-@@ -21,12 +21,12 @@
- # we only want natural rebuilds to regenerate the link date.
- nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
- $(CC) $(CFLAGS) -c linkdate.c
-- $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
- $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@
-
- # Note LIBS isn't quite right here; it links unnecessarily against Motif
- nc: nc.o server_common.o ../util/libNUtil.a
-- $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
-
- help.o: help.c
- $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild b/app-editors/nedit/nedit-5.6-r2.ebuild
deleted file mode 100644
index bc781249d83..00000000000
--- a/app-editors/nedit/nedit-5.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/nedit"
-SRC_URI="
- https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
- https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=x11-libs/motif-2.3:0
- x11-libs/libXt
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- || ( dev-util/yacc sys-devel/bison )
- dev-lang/perl"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-format.patch"
- "${FILESDIR}/${P}-ldflags.patch"
- "${FILESDIR}/${P}-40_Pointer_to_Integer.patch"
- "${FILESDIR}/${P}-security.patch"
- "${FILESDIR}/${P}-fix-crash-with-noX.patch"
-)
-
-src_prepare() {
- #respecting LDFLAGS, bug #208189
- default
- sed \
- -e "s:bin/:${EPREFIX}/bin/:g" \
- -i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
- sed \
- -e "s:nc:neditc:g" -i doc/nc.pod || die
- sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
- makefiles/Makefile.linux || die
- sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \
- -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
- -e "s:-lX11:-lX11 -lXmu -liconv:" \
- -e "s:check_tif_rule::" \
- makefiles/Makefile.macosx || die
-}
-
-src_compile() {
- case "${CHOST}" in
- *-darwin*)
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
- ;;
- *-linux*)
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
- ;;
- esac
- emake VERSION="NEdit ${PV}" -C doc all
-}
-
-src_install() {
- dobin source/nedit
- newbin source/nc neditc
-
- make_desktop_entry "${PN}"
- doicon "${WORKDIR}/${PN}.png"
-
- newman doc/nedit.man nedit.1
- newman doc/nc.man neditc.1
-
- dodoc README ReleaseNotes ChangeLog
- dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
- dohtml doc/nedit.html
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-22 12:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-14 17:04 [gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/, app-editors/nedit/files/ Amy Winston
-- strict thread matches above, loose matches on Subject: below --
2021-04-22 12:27 Sam James
2016-04-06 17:11 Justin Lecher
2016-03-14 17:04 Amy Winston
2015-09-21 8:27 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox