summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-08-18 02:09:51 +0000
committer Eric Hameleers <alien@slackware.com>2018-08-18 09:00:31 +0200
commit865737c0c7ba343b8351dab8bfaa0b6932275b52 (patch)
tree38c04f34e6f36def3d41454cf811b686551f2ce9 /source/ap
parentb4263a7629e3e3e2397066ed6f65c63b0f19118d (diff)
downloadcurrent-865737c0c7ba343b8351dab8bfaa0b6932275b52.tar.gz
current-865737c0c7ba343b8351dab8bfaa0b6932275b52.tar.xz
Sat Aug 18 02:09:51 UTC 201820180818020951
a/kernel-generic-4.14.64-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.64-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.64-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.64-x86-1.txz: Upgraded. k/kernel-source-4.14.64-noarch-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/jove/jove.SlackBuild9
-rw-r--r--source/ap/jove/jove.getline.buffsiz.diff60
2 files changed, 67 insertions, 2 deletions
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild
index 14f8e5c73..cf0036884 100755
--- a/source/ap/jove/jove.SlackBuild
+++ b/source/ap/jove/jove.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=jove
VERSION=4.16.0.73
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -77,7 +77,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup
+zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup || exit 1
+
+# Avoid a glibc namespace conflict with getline(), and increase some
+# buffer sizes:
+zcat $CWD/jove.getline.buffsiz.diff.gz | patch -p1 --verbose --backup || exit 1
+
# More patching needed now:
sed -i -e "s#/lib/jove#/lib${LIBDIRSUFFIX}/jove#" \
-e "s#^OPTFLAGS = .*#OPTFLAGS = $SLKCFLAGS#" Makefile
diff --git a/source/ap/jove/jove.getline.buffsiz.diff b/source/ap/jove/jove.getline.buffsiz.diff
new file mode 100644
index 000000000..59b79c522
--- /dev/null
+++ b/source/ap/jove/jove.getline.buffsiz.diff
@@ -0,0 +1,60 @@
+--- ./fp.h.orig 2002-03-20 15:49:38.000000000 -0600
++++ ./fp.h 2018-08-16 12:43:15.763002319 -0500
+@@ -17,7 +17,8 @@
+ # define scr_putchar(c) f_putc((c), jstdout)
+ extern void flushscreen proto((void));
+ # ifndef SMALL
+-# define MAXTTYBUF 2048
++// TTK here -- upping from 2048 to 256K
++# define MAXTTYBUF 262144
+ # else
+ # define MAXTTYBUF 512
+ # endif
+--- ./insert.c.orig 2002-03-20 15:49:38.000000000 -0600
++++ ./insert.c 2018-08-16 12:43:15.773002319 -0500
+@@ -504,7 +506,7 @@
+ atchar = 0;
+ }
+
+- getline(atline->l_dline, genbuf);
++ j_getline(atline->l_dline, genbuf);
+ atchar += tchar;
+ linecopy(genbuf, atchar, save);
+ atline->l_dline = putline(genbuf);
+--- ./jove.h.orig 2002-03-20 15:49:38.000000000 -0600
++++ ./jove.h 2018-08-16 12:43:15.797002319 -0500
+@@ -267,7 +267,8 @@
+
+ /* term.c: universal termcap-like declarations */
+
+-#define MAXCOLS 256 /* maximum number of columns */
++// TTK here -- boosting to 256K
++#define MAXCOLS 262144 /* maximum number of columns */
+
+ extern int
+ SG, /* number of magic cookies left by SO and SE */
+--- ./io.h.orig 2002-03-20 15:49:38.000000000 -0600
++++ ./io.h 2018-08-16 12:43:15.790002319 -0500
+@@ -40,7 +40,7 @@
+ close_file proto((File *fp)),
+ d_cache_init proto((void)),
+ file_write proto((char *fname, bool app)),
+- getline proto((daddr addr, char *buf)),
++ j_getline proto((daddr addr, char *buf)),
+ lsave proto((void)),
+ putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
+ read_file proto((char *file, bool is_insert)),
+--- ./io.c.orig 2010-04-16 00:41:46.000000000 -0500
++++ ./io.c 2018-08-16 12:43:15.782002319 -0500
+@@ -1356,9 +1356,9 @@
+
+ void
+ #ifdef USE_PROTOTYPES
+-getline proto((daddr addr, register char *buf))
++j_getline proto((daddr addr, register char *buf))
+ #else
+-getline(addr, buf)
++j_getline(addr, buf)
+ daddr addr;
+ register char *buf;
+ #endif