diff options
| author |   David Spencer <baildon.research@googlemail.com> | 2015-08-09 17:22:06 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | a87b0ab07d25ffee7eb73eb71aea60b1ecfd3ed7 (patch) | |
| tree | 6b9ca482d01ccd2fcafe00d0e1c84de55127a8b3 /development/nedit/nedit.patch | |
| parent | 2f34ffad4bf8f309fcadbce7302691528826f080 (diff) | |
| download | slackbuilds-a87b0ab07d25ffee7eb73eb71aea60b1ecfd3ed7.tar.gz slackbuilds-a87b0ab07d25ffee7eb73eb71aea60b1ecfd3ed7.tar.xz | |
development/nedit: Updated for version 5.6a.
Fixes build failure with motif-2.3.4 on -current.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/nedit/nedit.patch')
| -rw-r--r-- | development/nedit/nedit.patch | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/development/nedit/nedit.patch b/development/nedit/nedit.patch index d66623f0f9..9eac5b9eb9 100644 --- a/development/nedit/nedit.patch +++ b/development/nedit/nedit.patch @@ -1,24 +1,34 @@ -diff -rNu nedit-5.5.orig/source/nedit.c nedit-5.5/source/nedit.c ---- nedit-5.5.orig/source/nedit.c 2014-04-15 21:37:41.893066434 +0200 -+++ nedit-5.5/source/nedit.c 2014-04-15 21:41:30.262069783 +0200 -@@ -389,6 +389,9 @@ - "-bw", "-title", NULL}; - unsigned char* invalidBindings = NULL; - -+ /* workaround for lesstif */ -+ setenv("XLIB_SKIP_ARGB_VISUALS", "1", 1); -+ - /* Save the command which was used to invoke nedit for restart command */ - ArgV0 = argv[0]; - -diff -rNu nedit-5.5.orig/util/check_lin_tif.c nedit-5.5/util/check_lin_tif.c ---- nedit-5.5.orig/util/check_lin_tif.c 2014-04-15 21:37:41.973066435 +0200 -+++ nedit-5.5/util/check_lin_tif.c 2014-04-15 21:38:39.407067277 +0200 -@@ -87,6 +87,7 @@ - "0.93.12", - "0.93.18", - "0.93.94", -+ "0.95.2", - NULL - }; +diff -u -r nedit-5.6/util/check_lin_tif.c nedit-5.6-patched/util/check_lin_tif.c +--- nedit-5.6/util/check_lin_tif.c 2014-12-28 13:56:21.000000000 +0000 ++++ nedit-5.6-patched/util/check_lin_tif.c 2015-08-07 11:18:29.404307905 +0100 +@@ -103,28 +103,11 @@ + if (stability == MotifUnknown) + { + /* This version is neither known-good nor known-bad */ +- fprintf(stderr, +- "ERROR: Untested Motif Version:\n\t%s\n", +- XmVERSION_STRING); +- +- fprintf(stderr, +- "You are attempting to build NEdit with a version of Motif that\n" +- "has not been verified to work well with NEdit. This could be fine,\n" +- "but it could also lead to crashes and instability. Historically, \n" +- "older versions of Motif have quite often been more stable\n" +- "than newer versions when used with NEdit, so don't assume newer\n" +- "is better.\n"); ++ /* Yeah, whatevs, it's the only version we have, mister snottypants */ + #ifdef BUILD_UNTESTED_NEDIT + { +- char buf[2]; +- fprintf(stderr, +- "\n========================== WARNING ===========================\n" +- "You have chosen to build NEdit with an untested version of Motif.\n" +- "Please report your success or failure with this version to:\n" +- "\tdevelop@nedit.org\n" +- "\nHIT ENTER TO CONTINUE\n"); +- fgets(buf, 2, stdin); ++ /* Bollocks. */ + return EXIT_SUCCESS; + } + #else |