pool/nedit
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 139490 from home:dstoecker

Browse Source 
I do an updated nedit version for several years now. It is based on latest CVS which is very slowly evolving and obsoletes most of the patches. I suggest to use this version instead of the current one.

Also it is bad style to link from an non-home-project to a home project. editors/nedit should be the base, not the other way round.

I checked all inbetween changes in the other packages today and I'm pretty sure that this version is more recent in every detail.

OBS-URL: https://build.opensuse.org/request/show/139490
OBS-URL: https://build.opensuse.org/package/show/editors/nedit?expand=0&rev=7
This commit is contained in:
Ismail Dönmez 2012-11-13 13:37:37 +00:00 committed by Git OBS Bridge
parent 014fa17db5
commit f24de0b229
14 changed files with 174 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nedit-5.4-makefiles.patch
View File

@ -1,23 +0,0 @@
--- nedit-5.4/makefiles/Makefile.linux.makefiles 2003-05-20 02:27:56.000000000 +0200
+++ nedit-5.4/makefiles/Makefile.linux 2004-03-17 15:28:40.000000000 +0100
@@ -1,5 +1,5 @@
# $Id: Makefile.linux,v 1.11 2003/05/20 00:27:56 n8gray Exp $
-CC=cc
+CC=gcc
AR=ar
# For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
@@ -17,11 +17,11 @@
# To test if the Motif library exports the runtime version
# add -DHAVE__XMVERSIONSTRING to CFLAGS
#
-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+CFLAGS=-I/usr/X11R6/include $(RPM_OPT_FLAGS) -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
ARFLAGS=-urs
-LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
+LIBS= -lXm -lXmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
include Makefile.common

118
nedit-5.5-nc-manfix.patch
View File

@ -1,118 +0,0 @@
--- nedit-5.5/doc/nc.man.nc-manfix 2004-09-30 23:03:59.000000000 +0200
+++ nedit-5.5/doc/nc.man 2005-10-16 08:53:42.000000000 +0200
@@ -128,30 +128,30 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "NC 1"
-.TH NC 1 "2004-07-21" "NEdit 5.5" "NEdit documentation"
+.IX Title "NEDIT-CLIENT 1"
+.TH NEDIT-CLIENT 1 "2004-07-21" "NEdit 5.5" "NEdit documentation"
.SH "NAME"
-nc \- Client program for NEdit text editor
+nedit-client \- Client program for NEdit text editor
.SH "SYNOPSYS"
.IX Header "SYNOPSYS"
-nc [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
- [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR]
- [\fB\-lm\fR \fIlanguagemode\fR]
- [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR]
- [\fB\-display\fR \fI[host]:server[.screen]\fR]
- [\fB\-timeout\fR \fIseconds\fR] [\fB\-wait\fR] [\fB\-xrm\fR \fIresourcestring\fR]
- [\fB\-tabbed\fR] [\fB\-untabbed\fR] [\fB\-group\fR]
- [\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...]
+nedit-client [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
+ [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR]
+ [\fB\-lm\fR \fIlanguagemode\fR]
+ [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR]
+ [\fB\-display\fR \fI[host]:server[.screen]\fR]
+ [\fB\-timeout\fR \fIseconds\fR] [\fB\-wait\fR] [\fB\-xrm\fR \fIresourcestring\fR]
+ [\fB\-tabbed\fR] [\fB\-untabbed\fR] [\fB\-group\fR]
+ [\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...]
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
-\&\fBnc\fR is the client interface to the NEdit text editor. A server can be started
+\&\fBnedit-client\fR is the client interface to the NEdit text editor. A server can be started
explicitly by running NEdit in server mode:
.PP
.Vb 1
\& nedit -server
.Ve
.PP
-If no server is running, \fBnc\fR will start one unless configured otherwise.
+If no server is running, \fBnedit-client\fR will start one unless configured otherwise.
Client/server mode is useful for integrating NEdit with software development
environments, mailers, and other programs; or just as a quick way to open files
from the shell command line without starting a new NEdit session.
@@ -171,21 +171,21 @@ Go to line number \fIn\fR.
Execute an NEdit macro or action on the file following the \-do argument on the
command line.
.Sp
-If you use this command without a filename, \fBnc\fR would randomly choose one
+If you use this command without a filename, \fBnedit-client\fR would randomly choose one
window to focus and execute the macro in.
.IP "\fB\-ask\fR, \fB\-noask\fR" 4
.IX Item "-ask, -noask"
-Instructs \fBnc\fR whether to automatically start a server if one is not
+Instructs \fBnedit-client\fR whether to automatically start a server if one is not
available. This overrides the X resource `nc.autoStart'.
.IP "\fB\-svrname\fR \fIname\fR" 4
.IX Item "-svrname name"
-Explicitly instructs \fBnc\fR which server to connect to, an instance of
+Explicitly instructs \fBnedit-client\fR which server to connect to, an instance of
\&\fInedit\fR\|(1) with a corresponding \fB\-svrname\fR argument. By naming servers, you
can run several simultaneously, and direct files and commands specifically to
any one.
.IP "\fB\-svrcmd\fR \fIcommand\fR" 4
.IX Item "-svrcmd command"
-The command which \fBnc\fR uses to start an NEdit server. It is also settable via
+The command which \fBnedit-client\fR uses to start an NEdit server. It is also settable via
the X resource `nc.serverCommand', by default, \fI\*(L"nedit \-server\*(R"\fR.
.IP "\fB\-lm\fR \fIlanguagemode\fR" 4
.IX Item "-lm languagemode"
@@ -221,11 +221,11 @@ Under rare conditions (such as a slow co
increase the time-out period. In most cases, the default is fine.
.IP "\fB\-wait\fR" 4
.IX Item "-wait"
-Instructs \fBnc\fR not to return to the shell until all files given
+Instructs \fBnedit-client\fR not to return to the shell until all files given
are closed.
.Sp
-Normally, \fBnc\fR returns once the files given in its command line
-are opened by the server. When this option is given, nc returns
+Normally, \fBnedit-client\fR returns once the files given in its command line
+are opened by the server. When this option is given, nedit-client returns
only after the last file given in this call is closed.
Note that this option affects all files, not only the ones
following this option in the command line.
@@ -262,11 +262,11 @@ for your display:
.Ve
.SH "NOTES"
.IX Header "NOTES"
-Communication between \fInc\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as
-long as X windows is set up and working properly, \fBnc\fR will work properly
-as well. \fBnc\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and
+Communication between \fInedit-client\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as
+long as X windows is set up and working properly, \fBnedit-client\fR will work properly
+as well. \fBnedit-client\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and
your user name to find the appropriate server, meaning, if you have several
-machines sharing a common file system, \fBnc\fR will not be able to find a server
+machines sharing a common file system, \fBnedit-client\fR will not be able to find a server
that is running on a machine with a different host name, even though it may be
perfectly appropriate for editing a given file.
.PP
@@ -275,12 +275,12 @@ command line, for example:
.IP "incorrect:" 4
.IX Item "incorrect:"
.Vb 1
-\& nc file.c -line 25
+\& nedit-client file.c -line 25
.Ve
.IP "correct:" 4
.IX Item "correct:"
.Vb 1
-\& nc -line 25 file.c
+\& nedit-client -line 25 file.c
.Ve
.PP
For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit

86
nedit-5.5-null-pointers.patch
View File

@ -1,86 +0,0 @@
--- source/text.c 2008/12/24 22:27:27 1.1
+++ source/text.c 2008/12/24 22:28:19
@@ -3126,7 +3126,7 @@
cancelDrag(w);
if (hasKey("scrollbar", args, nArgs)) {
XtVaGetValues(textD->hScrollBar, XmNmaximum, &sliderMax,
- XmNsliderSize, &sliderSize, 0);
+ XmNsliderSize, &sliderSize, NULL);
horizOffset = min(textD->horizOffset + textD->width, sliderMax - sliderSize);
if (textD->horizOffset == horizOffset) {
ringIfNecessary(silent, w);
@@ -3218,7 +3218,7 @@
if (*nArgs == 0 || sscanf(args[0], "%d", &nPixels) != 1)
return;
XtVaGetValues(textD->hScrollBar, XmNmaximum, &sliderMax,
- XmNsliderSize, &sliderSize, 0);
+ XmNsliderSize, &sliderSize, NULL);
horizOffset = min(max(0, textD->horizOffset - nPixels), sliderMax - sliderSize);
if (textD->horizOffset != horizOffset) {
TextDSetScroll(textD, textD->topLineNum, horizOffset);
@@ -3235,7 +3235,7 @@
if (*nArgs == 0 || sscanf(args[0], "%d", &nPixels) != 1)
return;
XtVaGetValues(textD->hScrollBar, XmNmaximum, &sliderMax,
- XmNsliderSize, &sliderSize, 0);
+ XmNsliderSize, &sliderSize, NULL);
horizOffset = min(max(0, textD->horizOffset + nPixels), sliderMax - sliderSize);
if (textD->horizOffset != horizOffset) {
TextDSetScroll(textD, textD->topLineNum, horizOffset);
--- source/search.c 2008/12/24 22:26:53 1.1
+++ source/search.c 2008/12/24 22:27:17
@@ -1042,7 +1042,7 @@
XtAddCallback(replaceBtn, XmNactivateCallback, (XtCallbackProc)replaceCB, window);
XmStringFree(st1);
XtManageChild(replaceBtn);
- XtVaGetValues(replaceBtn, XmNshadowThickness, &shadowThickness, 0);
+ XtVaGetValues(replaceBtn, XmNshadowThickness, &shadowThickness, NULL);
defaultBtnOffset = shadowThickness + 4;
argcnt = 0;
--- source/window.c 2008/12/24 22:28:23 1.1
+++ source/window.c 2008/12/24 22:29:03
@@ -1157,7 +1157,7 @@
if (window->backlightChars)
{
XtVaSetValues(text, textNbacklightCharTypes,
- window->backlightCharTypes, 0);
+ window->backlightCharTypes, NULL);
}
XtManageChild(text);
window->textPanes[window->nPanes++] = text;
@@ -3016,10 +3016,10 @@
window->backlightCharTypes = NULL;
XtVaSetValues(window->textArea,
- textNbacklightCharTypes, window->backlightCharTypes, 0);
+ textNbacklightCharTypes, window->backlightCharTypes, NULL);
for (i=0; i<window->nPanes; i++)
XtVaSetValues(window->textPanes[i],
- textNbacklightCharTypes, window->backlightCharTypes, 0);
+ textNbacklightCharTypes, window->backlightCharTypes, NULL);
if (is_applied != do_apply)
SetToggleButtonState(window, window->backlightCharsItem, do_apply, False);
}
--- source/menu.c 2008/12/24 22:34:34 1.1
+++ source/menu.c 2008/12/24 22:34:44
@@ -1254,7 +1254,7 @@
HidePointerOnKeyedEvent(WidgetToWindow(MENU_WIDGET(menuItem))->lastFocus,
((XmAnyCallbackStruct *)callData)->event);
- XtVaGetValues( menuItem, XmNuserData, &topic, 0 );
+ XtVaGetValues( menuItem, XmNuserData, &topic, NULL );
Help(topic);
}
--- source/menu.c 2008/12/24 23:16:55 1.1
+++ source/menu.c 2008/12/24 23:17:17
@@ -1242,7 +1242,7 @@
Widget menuItem =
createMenuItem( parent, name, label, mnemonic, callback, cbArg, mode );
- XtVaSetValues( menuItem, XmNuserData, topic, 0 );
+ XtVaSetValues( menuItem, XmNuserData, topic, NULL );
return menuItem;
}

3
nedit-5.5-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f6ae7205753080e8b047fb45759a7d6036b19396045c0b5c4a979441231966b
size 1124825

52
nedit-5.5-utf8.patch
View File

@ -1,52 +0,0 @@
--- nedit-5.5/source/nedit.c.utf8 2004-09-02 10:49:56.000000000 +0200
+++ nedit-5.5/source/nedit.c 2004-12-27 09:59:40.997208056 +0100
@@ -90,6 +90,7 @@ static int checkDoMacroArg(const char *m
static String neditLanguageProc(Display *dpy, String xnl, XtPointer closure);
static void maskArgvKeywords(int argc, char **argv, const char **maskArgs);
static void unmaskArgvKeywords(int argc, char **argv, const char **maskArgs);
+static void changeLocaleIfUTF8(void);
static void patchResourcesForVisual(void);
static void patchResourcesForKDEbug(void);
static void patchLocaleForMotif(void);
@@ -392,6 +393,8 @@ int main(int argc, char **argv)
/* Save the command which was used to invoke nedit for restart command */
ArgV0 = argv[0];
+ changeLocaleIfUTF8();
+
/* Set locale for C library, X, and Motif input functions.
Reverts to "C" if requested locale not available. */
XtSetLanguageProc(NULL, neditLanguageProc, NULL);
@@ -1035,6 +1038,32 @@ static String neditLanguageProc(Display
return setlocale(LC_ALL, NULL); /* re-query in case overwritten */
}
+static void changeLocaleIfUTF8(void)
+{
+ char *locale;
+
+ locale = getenv("LANG");
+ if (!locale) {
+ locale = setlocale(LC_ALL, NULL);
+ }
+
+ if (locale) {
+ char *ptr;
+
+ ptr = strstr(locale, ".UTF-8");
+ if (ptr) {
+ fprintf(stderr, "nedit: the current locale is utf8 (%s)\n", locale);
+
+ ptr[0] = '\0';
+
+ setenv("LC_ALL", locale, 1);
+ locale = setlocale(LC_ALL, locale);
+
+ fprintf(stderr, "nedit: changed locale to non-utf8 (%s)\n", locale);
+ }
+ }
+}
+
static int sortAlphabetical(const void* k1, const void* k2)
{
const char* key1 = *(const char**)k1;

11
nedit-5.5-varfix.patch
View File

@ -1,11 +0,0 @@
--- nedit-5.5/source/server.c.varfix 2004-07-21 13:32:05.000000000 +0200
+++ nedit-5.5/source/server.c 2005-01-12 11:12:08.989922248 +0100
@@ -340,7 +340,7 @@ static void processServerCommandString(c
char *fullname, filename[MAXPATHLEN], pathname[MAXPATHLEN];
char *doCommand, *geometry, *langMode, *inPtr;
int editFlags, stringLen = strlen(string);
- int lineNum, createFlag, readFlag, iconicFlag, lastIconic = 0, tabbed;
+ int lineNum, createFlag, readFlag, iconicFlag, lastIconic = 0, tabbed = 0;
int fileLen, doLen, lmLen, geomLen, charsRead, itemsRead;
WindowInfo *window, *lastFile = NULL;
long currentDesktop = QueryCurrentDesktop(TheDisplay,

18
nedit-5.5CVS-makefiles.patch Normal file
View File

@ -0,0 +1,18 @@
--- nedit-5.5_CVS20071122/makefiles/Makefile.linux.makefiles 2006-10-26 04:20:16.000000000 +0200
+++ nedit-5.5_CVS20071122/makefiles/Makefile.linux 2007-11-22 08:29:38.000000000 +0100
@@ -1,5 +1,5 @@
# $Id: Makefile.linux,v 1.14 2006/10/26 02:20:16 tringali Exp $
-CC=cc
+CC=gcc
AR=ar
# For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
@@ -17,7 +17,7 @@
# To test if the Motif library exports the runtime version
# add -DHAVE__XMVERSIONSTRING to CFLAGS
#
-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+CFLAGS=-I/usr/X11R6/include $(RPM_OPT_FLAGS) -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
ARFLAGS=-urs

106
nedit-5.5CVS-nc-manfix.patch Normal file
View File

@ -0,0 +1,106 @@
--- nedit-5.5_CVS20071122/doc/nc.pod.orig 2007-11-22 08:38:37.000000000 +0100
+++ nedit-5.5_CVS20071122/doc/nc.pod 2007-11-22 08:41:02.000000000 +0100
@@ -3,11 +3,11 @@
=head1 NAME
-nc - Client program for NEdit text editor
+nedit-client - Client program for NEdit text editor
=head1 SYNOPSYS
-nc [B<-read>] [B<-create>] [B<-line> I<n> | B<+>I<n>] [B<-do> I<command>]
+nedit-client [B<-read>] [B<-create>] [B<-line> I<n> | B<+>I<n>] [B<-do> I<command>]
[B<-ask>] [B<-noask>] [B<-svrname> I<name>] [B<-svrcmd> I<command>]
[B<-lm> I<languagemode>]
[B<-geometry> I<geometry> | B<-g> I<geometry>] [B<-icon> | B<-iconic>]
@@ -18,12 +18,12 @@
=head1 DESCRIPTION
-B<nc> is the client interface to the NEdit text editor. A server can be started
+B<nedit-client> is the client interface to the NEdit text editor. A server can be started
explicitly by running NEdit in server mode:
nedit -server
-If no server is running, B<nc> will start one unless configured otherwise.
+If no server is running, B<nedit-client> will start one unless configured otherwise.
Client/server mode is useful for integrating NEdit with software development
environments, mailers, and other programs; or just as a quick way to open files
from the shell command line without starting a new NEdit session.
@@ -49,25 +49,25 @@
Execute an NEdit macro or action on the file following the -do argument on the
command line.
-If you use this command without a filename, B<nc> would randomly choose one
+If you use this command without a filename, B<nedit-client> would randomly choose one
window to focus and execute the macro in.
=item B<-ask>, B<-noask>
-Instructs B<nc> whether to automatically start a server if one is not
+Instructs B<nedit-client> whether to automatically start a server if one is not
available. This overrides the X resource `nc.autoStart'.
=item B<-svrname> I<name>
-Explicitly instructs B<nc> which server to connect to, an instance of
+Explicitly instructs B<nedit-client> which server to connect to, an instance of
L<nedit(1)> with a corresponding B<-svrname> argument. By naming servers, you
can run several simultaneously, and direct files and commands specifically to
any one.
=item B<-svrcmd> I<command>
-The command which B<nc> uses to start an NEdit server. It is also settable via
+The command which B<nedit-client> uses to start an NEdit server. It is also settable via
the X resource `nc.serverCommand', by default, I<"nedit -server">.
=item B<-lm> I<languagemode>
@@ -107,11 +107,11 @@
=item B<-wait>
-Instructs B<nc> not to return to the shell until all files given
+Instructs B<nedit-client> not to return to the shell until all files given
are closed.
-Normally, B<nc> returns once the files given in its command line
-are opened by the server. When this option is given, nc returns
+Normally, B<nedit-client> returns once the files given in its command line
+are opened by the server. When this option is given, B<nedit-client> returns
only after the last file given in this call is closed.
Note that this option affects all files, not only the ones
following this option in the command line.
@@ -167,11 +167,11 @@
=head1 NOTES
-Communication between L<nc(1)> and L<nedit(1)> is through the X display. So as
-long as X windows is set up and working properly, B<nc> will work properly
-as well. B<nc> uses the `DISPLAY' environment variable, the machine name and
+Communication between L<nedit-client(1)> and L<nedit(1)> is through the X display. So as
+long as X windows is set up and working properly, B<nedit-client> will work properly
+as well. B<nedit-client> uses the `DISPLAY' environment variable, the machine name and
your user name to find the appropriate server, meaning, if you have several
-machines sharing a common file system, B<nc> will not be able to find a server
+machines sharing a common file system, B<nedit-client> will not be able to find a server
that is running on a machine with a different host name, even though it may be
perfectly appropriate for editing a given file.
@@ -182,11 +182,11 @@
=item incorrect:
- nc file.c -line 25
+ nedit-client file.c -line 25
=item correct:
- nc -line 25 file.c
+ nedit-client -line 25 file.c
=back

19
nedit-5.4-security.patch → nedit-5.5CVS-security.patch
View File

@ -1,8 +1,7 @@
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 @@
diff -ur nedit-5.5_CVS20100831/source/file.c nedit-5.5_CVS20100831_f/source/file.c
--- nedit-5.5_CVS20100831/source/file.c 2010-08-31 18:47:59.000000000 +0200
+++ nedit-5.5_CVS20100831_f/source/file.c 2010-08-31 18:50:03.000000000 +0200
@@ -1372,7 +1372,7 @@
*/
void PrintString(const char *string, int length, Widget parent, const char *jobName)
{
@ -11,7 +10,7 @@ Index: nedit-5.5/source/file.c
FILE *fp;
int fd;
@@ -1325,14 +1325,10 @@
@@ -1383,14 +1383,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. */
@ -28,7 +27,7 @@ Index: nedit-5.5/source/file.c
{
DialogF(DF_WARN, parent, 1, "Error while Printing",
"Unable to write file for printing:\n%s", "OK",
@@ -1346,7 +1342,7 @@
@@ -1404,7 +1400,7 @@
/* write to the file */
#ifdef IBM_FWRITE_BUG
@ -37,7 +36,7 @@ Index: nedit-5.5/source/file.c
#else
fwrite(string, sizeof(char), length, fp);
#endif
@@ -1356,6 +1352,7 @@
@@ -1414,6 +1410,7 @@
"%s not printed:\n%s", "OK", jobName, errorString());
fclose(fp); /* should call close(fd) in turn! */
remove(tmpFileName);
@ -45,7 +44,7 @@ Index: nedit-5.5/source/file.c
return;
}
@@ -1366,6 +1363,7 @@
@@ -1424,6 +1421,7 @@
"Error closing temp. print file:\n%s", "OK",
errorString());
remove(tmpFileName);
@ -53,7 +52,7 @@ Index: nedit-5.5/source/file.c
return;
}
@@ -1377,6 +1375,7 @@
@@ -1435,6 +1433,7 @@
PrintFile(parent, tmpFileName, jobName);
remove(tmpFileName);
#endif /*VMS*/

3
nedit-5.5_CVS20121026-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:453b6cff87c38281d9b809a563031e9c33dd7bda9e8ea7c3325e9bc6541323b9
size 1056292

12
nedit.changes
View File

@ -1,9 +1,18 @@
-------------------------------------------------------------------
Fri Oct 26 19:30:58 UTC 2012 - opensuse@dstoecker.de
- update to use new OpenMotif 2.3.3
-------------------------------------------------------------------
Fri Sep 17 15:43:01 CEST 2010 - jdelvare@suse.de
- nedit-5.5-visfix.patch: Use default visual, to prevent crashes
when running under compiz. Patch from Mandriva.
-------------------------------------------------------------------
Tue Jan 27 12:00:00 UTC 2009 - opensuse@dstoecker.de
- cleanup
-------------------------------------------------------------------
Wed Dec 24 09:50:00 CEST 2008 - drahn@suse.de
@ -13,5 +22,4 @@ Wed Dec 24 09:50:00 CEST 2008 - drahn@suse.de
-------------------------------------------------------------------
Fri Jun 29 14:44:56 CEST 2007 - drahn@suse.de
- initial BS version
- initial BS version

55
nedit.spec
View File

@ -1,24 +1,23 @@
Name: nedit
Version: 5.5
Name: nedit
Version: 5.5_CVS20121026
Release: 1
License: GPL
License: GPL-2.0+
Url: http://www.nedit.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: openmotif-devel update-desktop-files
%if 0%{?suse_version} <= 1010
BuildRequires: xorg-x11-devel
%endif
Group: Applications/Editors
BuildRequires: bison
Group: Productivity/Editors/Other
Summary: A GUI text editor
Source0: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2
Source1: nedit-icon.png
Source2: nedit.desktop
Patch1: nedit-5.4-makefiles.patch
Patch2: nedit-5.4-security.patch
Patch3: nedit-5.5-utf8.patch
Patch4: nedit-5.5-varfix.patch
Patch5: nedit-5.5-nc-manfix.patch
Patch6: nedit-5.5-null-pointers.patch
Patch7: nedit-5.5-visfix.patch
Source0: %{name}-%{version}-src.tar.bz2
Source1: %{name}-icon.png
Source2: %{name}.desktop
Patch1: %{name}-5.5CVS-makefiles.patch
Patch2: %{name}-5.5CVS-security.patch
Patch3: %{name}-5.5CVS-nc-manfix.patch
Patch4: %{name}-5.5-visfix.patch
%description
NEdit is a GUI style plain text editor for workstations with the X Window System
@ -27,18 +26,15 @@ mouse support, macro extension language, syntax highlighting,
and a lot other nice features (and extensions for programmers).
%prep
%setup -q
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p0
%patch7 -p1
cp %{S:1} $RPM_BUILD_DIR/%{name}-%{version}/
cp %{S:2} $RPM_BUILD_DIR/%{name}-%{version}/
%build
#find -name .cvsignore |xargs rm
#find -name CVS |xargs rm -r
%if 0%{?suse_version} <= 1010
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L/usr/X11R6/%{_lib}" \
linux
@ -49,18 +45,23 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \
linux
%endif
pushd doc
make all
popd
%install
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
mv source/nc source/nedit-client
install -s -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir}
install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit.1x
mv doc/nc.man doc/nedit-client.man
install -m 644 doc/nedit-client.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client.1x
gzip doc/*.man
install -m 644 doc/nedit.man.gz $RPM_BUILD_ROOT%{_mandir}/man1/nedit.1x.gz
mv doc/nc.man.gz doc/nedit-client.man.gz
install -m 644 doc/nedit-client.man.gz $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client.1x.gz
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
install -m 644 nedit-icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 nedit.desktop $RPM_BUILD_ROOT%{_datadir}/applications/
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{S:2} $RPM_BUILD_ROOT%{_datadir}/applications/
%suse_update_desktop_file %name TextEditor
%clean
@ -74,4 +75,4 @@ rm -rf "$RPM_BUILD_ROOT"
%{_prefix}/share/applications/*
%{_datadir}/pixmaps/nedit-icon.png
%changelog

11
openmotif.diff
View File

@ -1,11 +0,0 @@
--- makefiles/Makefile.linux.orig 2007-04-23 14:29:04.000000000 +0200
+++ makefiles/Makefile.linux 2007-04-23 14:29:40.000000000 +0200
@@ -17,7 +17,7 @@
# To test if the Motif library exports the runtime version
# add -DHAVE__XMVERSIONSTRING to CFLAGS
#
-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
ARFLAGS=-urs

141
project.diff
View File

@ -1,141 +0,0 @@
--- nedit-5.5-null-pointers.patch.orig
+++ nedit-5.5-null-pointers.patch
@@ -0,0 +1,108 @@
+--- source/menu.c
++++ source/menu.c 2008/11/01 10:12:04
+@@ -1,4 +1,4 @@
+-static const char CVSID[] = "$Id: menu.c,v 1.115 2004/09/15 22:50:57 n8gray Exp $";
++static const char CVSID[] = "$Id: menu.c,v 1.1 2008/11/01 10:11:21 drahn Exp drahn $";
+ /*******************************************************************************
+ * *
+ * menu.c -- Nirvana Editor menus *
+@@ -1242,7 +1242,7 @@
+ Widget menuItem =
+ createMenuItem( parent, name, label, mnemonic, callback, cbArg, mode );
+
+- XtVaSetValues( menuItem, XmNuserData, topic, 0 );
++ XtVaSetValues( menuItem, XmNuserData, topic, NULL );
+ return menuItem;
+ }
+
+@@ -1254,7 +1254,7 @@
+
+ HidePointerOnKeyedEvent(WidgetToWindow(MENU_WIDGET(menuItem))->lastFocus,
+ ((XmAnyCallbackStruct *)callData)->event);
+- XtVaGetValues( menuItem, XmNuserData, &topic, 0 );
++ XtVaGetValues( menuItem, XmNuserData, &topic, NULL );
+
+ Help(topic);
+ }
+--- source/search.c
++++ source/search.c 2008/11/01 10:13:15
+@@ -1,4 +1,4 @@
+-static const char CVSID[] = "$Id: search.c,v 1.71 2004/08/01 10:06:11 yooden Exp $";
++static const char CVSID[] = "$Id: search.c,v 1.1 2008/11/01 10:12:55 drahn Exp drahn $";
+ /*******************************************************************************
+ * *
+ * search.c -- Nirvana Editor search and replace functions *
+@@ -1042,7 +1042,7 @@
+ XtAddCallback(replaceBtn, XmNactivateCallback, (XtCallbackProc)replaceCB, window);
+ XmStringFree(st1);
+ XtManageChild(replaceBtn);
+- XtVaGetValues(replaceBtn, XmNshadowThickness, &shadowThickness, 0);
++ XtVaGetValues(replaceBtn, XmNshadowThickness, &shadowThickness, NULL);
+ defaultBtnOffset = shadowThickness + 4;
+
+ argcnt = 0;
+--- source/text.c
++++ source/text.c 2008/11/01 10:14:36
+@@ -1,4 +1,4 @@
+-static const char CVSID[] = "$Id: text.c,v 1.48 2004/07/28 18:02:03 n8gray Exp $";
++static const char CVSID[] = "$Id: text.c,v 1.1 2008/11/01 10:13:38 drahn Exp drahn $";
+ /*******************************************************************************
+ * *
+ * text.c - Display text from a text buffer *
+@@ -3126,7 +3126,7 @@
+ cancelDrag(w);
+ if (hasKey("scrollbar", args, nArgs)) {
+ XtVaGetValues(textD->hScrollBar, XmNmaximum, &sliderMax,
+- XmNsliderSize, &sliderSize, 0);
++ XmNsliderSize, &sliderSize, NULL);
+ horizOffset = min(textD->horizOffset + textD->width, sliderMax - sliderSize);
+ if (textD->horizOffset == horizOffset) {
+ ringIfNecessary(silent, w);
+@@ -3218,7 +3218,7 @@
+ if (*nArgs == 0 || sscanf(args[0], "%d", &nPixels) != 1)
+ return;
+ XtVaGetValues(textD->hScrollBar, XmNmaximum, &sliderMax,
+- XmNsliderSize, &sliderSize, 0);
++ XmNsliderSize, &sliderSize, NULL);
+ horizOffset = min(max(0, textD->horizOffset - nPixels), sliderMax - sliderSize);
+ if (textD->horizOffset != horizOffset) {
+ TextDSetScroll(textD, textD->topLineNum, horizOffset);
+@@ -3235,7 +3235,7 @@
+ if (*nArgs == 0 || sscanf(args[0], "%d", &nPixels) != 1)
+ return;
+ XtVaGetValues(textD->hScrollBar, XmNmaximum, &sliderMax,
+- XmNsliderSize, &sliderSize, 0);
++ XmNsliderSize, &sliderSize, NULL);
+ horizOffset = min(max(0, textD->horizOffset + nPixels), sliderMax - sliderSize);
+ if (textD->horizOffset != horizOffset) {
+ TextDSetScroll(textD, textD->topLineNum, horizOffset);
+--- source/window.c
++++ source/window.c 2008/11/01 10:15:20
+@@ -1,4 +1,4 @@
+-static const char CVSID[] = "$Id: window.c,v 1.174 2004/09/15 22:50:58 n8gray Exp $";
++static const char CVSID[] = "$Id: window.c,v 1.1 2008/11/01 10:14:41 drahn Exp drahn $";
+ /*******************************************************************************
+ * *
+ * window.c -- Nirvana Editor window creation/deletion *
+@@ -1157,7 +1157,7 @@
+ if (window->backlightChars)
+ {
+ XtVaSetValues(text, textNbacklightCharTypes,
+- window->backlightCharTypes, 0);
++ window->backlightCharTypes, NULL);
+ }
+ XtManageChild(text);
+ window->textPanes[window->nPanes++] = text;
+@@ -3016,10 +3016,10 @@
+ window->backlightCharTypes = NULL;
+
+ XtVaSetValues(window->textArea,
+- textNbacklightCharTypes, window->backlightCharTypes, 0);
++ textNbacklightCharTypes, window->backlightCharTypes, NULL);
+ for (i=0; i<window->nPanes; i++)
+ XtVaSetValues(window->textPanes[i],
+- textNbacklightCharTypes, window->backlightCharTypes, 0);
++ textNbacklightCharTypes, window->backlightCharTypes, NULL);
+ if (is_applied != do_apply)
+ SetToggleButtonState(window, window->backlightCharsItem, do_apply, False);
+ }
--- nedit.changes.orig
+++ nedit.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sat Nov 01 10:37:32 CET 2008 - drahn@suse.de
+
+- fix NULL pointers
+
+-------------------------------------------------------------------
Fri Jun 29 14:44:56 CEST 2007 - drahn@suse.de
- initial BS version
--- nedit.spec.orig
+++ nedit.spec
@@ -17,6 +17,7 @@ Patch2: nedit-5.4-security.patch
Patch3: nedit-5.5-utf8.patch
Patch4: nedit-5.5-varfix.patch
Patch5: nedit-5.5-nc-manfix.patch
+Patch6: nedit-5.5-null-pointers.patch
%description
NEdit is a GUI style plain text editor for workstations with the X Window System
@@ -31,6 +32,7 @@ and a lot other nice features (and exten
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p0
cp %{S:1} $RPM_BUILD_DIR/%{name}-%{version}/
cp %{S:2} $RPM_BUILD_DIR/%{name}-%{version}/