mirror of
https://github.com/SlackBuildsOrg/slackbuilds
synced 2024-09-28 15:21:00 +02:00
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>
This commit is contained in:
parent
2f34ffad4b
commit
a87b0ab07d
3 changed files with 44 additions and 34 deletions
|
@ -23,7 +23,8 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=nedit
|
||||
VERSION=${VERSION:-5.5}
|
||||
VERSION=${VERSION:-5.6a}
|
||||
NUMVER=$(echo $VERSION | tr -d '[:alpha:]')
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
@ -59,20 +60,20 @@ set -e
|
|||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG $OUTPUT
|
||||
cd $TMP
|
||||
rm -rf $PRGNAM-$VERSION
|
||||
tar jxvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
|
||||
cd $PRGNAM-$VERSION
|
||||
rm -rf $PRGNAM-$NUMVER
|
||||
tar xvf $CWD/$PRGNAM-$VERSION-src.tar.?z*
|
||||
cd $PRGNAM-$NUMVER
|
||||
chown -R root:root .
|
||||
find -L . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||
-o -perm 511 \) -exec chmod 755 {} \; -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# Apply patch to make compilation possible
|
||||
patch -p1 < $CWD/nedit.patch
|
||||
|
||||
make linux
|
||||
make CFLAGS="${SLKCFLAGS} -DBUILD_UNTESTED_NEDIT" linux
|
||||
|
||||
mkdir -p $PKG/usr/bin $PKG/usr/man/man1
|
||||
install -m 755 source/nedit $PKG/usr/bin/nedit
|
||||
|
@ -85,8 +86,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
|
|||
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
|
||||
|
||||
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cp -a COPYRIGHT ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cp -a doc/html $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cp -a COPYRIGHT ChangeLog README doc/faq.txt $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
|
||||
|
||||
mkdir -p $PKG/install
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="nedit"
|
||||
VERSION="5.5"
|
||||
VERSION="5.6a"
|
||||
HOMEPAGE="http://sourceforge.net/projects/nedit/"
|
||||
DOWNLOAD="http://sourceforge.net/projects/nedit/files/nedit-source/5.5/nedit-5.5-src.tar.bz2"
|
||||
MD5SUM="48cb3dce52d44988f3a4d7c6f47b6bbe"
|
||||
DOWNLOAD="http://sourceforge.net/projects/nedit/files/nedit-source/nedit-5.6a-src.tar.gz"
|
||||
MD5SUM="f8d7e22879c7e9c62ad02eef078f1c2b"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES=""
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue