summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-09-04 21:13:39 +0000
committer Eric Hameleers <alien@slackware.com>2019-09-05 08:59:48 +0200
commit1b94b19c05778870f8b9bd88cdc88b3f753e0009 (patch)
tree7bef04bff78992e0d67d33451885b0263bd7694a /source/ap
parent47128aeb9bfd16f1d5f5f7ea9aa7511a7580cd12 (diff)
downloadcurrent-1b94b19c05778870f8b9bd88cdc88b3f753e0009.tar.gz
current-1b94b19c05778870f8b9bd88cdc88b3f753e0009.tar.xz
Wed Sep 4 21:13:39 UTC 201920190904211339
a/kernel-firmware-20190904_6ddb9d9-noarch-1.txz: Upgraded. ap/jove-4.16.0.74-x86_64-1.txz: Upgraded. l/gtk+3-3.24.11-x86_64-1.txz: Upgraded. l/seamonkey-solibs-2.49.5-x86_64-1.txz: Upgraded. x/mesa-19.1.6-x86_64-1.txz: Upgraded. xap/seamonkey-2.49.5-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: http://www.seamonkey-project.org/releases/2.49.5 (* Security fix *)
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/jove/jove.SlackBuild8
-rw-r--r--source/ap/jove/jove.getline.buffsiz.diff102
-rw-r--r--source/ap/jove/jove.url3
3 files changed, 5 insertions, 108 deletions
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild
index 2a394a87c..b3a71e762 100755
--- a/source/ap/jove/jove.SlackBuild
+++ b/source/ap/jove/jove.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=jove
-VERSION=4.16.0.73
-BUILD=${BUILD:-6}
+VERSION=4.16.0.74
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -79,10 +79,6 @@ find . \
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
deleted file mode 100644
index ffc1e99ce..000000000
--- a/source/ap/jove/jove.getline.buffsiz.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- ./fp.h.orig 2002-03-20 15:49:38.000000000 -0600
-+++ ./fp.h 2018-08-19 13:12:52.539005346 -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
---- ./recover.c.orig 2010-07-09 01:29:37.000000000 -0500
-+++ ./recover.c 2018-08-19 13:13:12.904005347 -0500
-@@ -166,7 +166,7 @@
- private char *getblock proto((daddr atl));
-
- void
--getline(tl, buf)
-+j_getline(tl, buf)
- daddr tl;
- char *buf;
- {
-@@ -597,7 +597,7 @@
- Nchars = Nlines = 0L;
- while (--nlines >= 0) {
- addr = getaddr(ptrs_fp);
-- getline(addr, buf);
-+ j_getline(addr, buf);
- Nlines += 1;
- Nchars += 1 + strlen(buf);
- fputs(buf, out);
---- ./insert.c.orig 2002-03-20 15:49:38.000000000 -0600
-+++ ./insert.c 2018-08-19 13:13:12.905005347 -0500
-@@ -504,7 +504,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-19 13:12:52.540005346 -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 */
---- ./util.h.orig 2004-02-01 13:38:29.000000000 -0600
-+++ ./util.h 2018-08-19 13:13:12.906005347 -0500
-@@ -18,7 +18,7 @@
- #define eobp() (lastp(curline) && eolp())
- #define eolp() (linebuf[curchar] == '\0')
- #define firstp(line) ((line) == curbuf->b_first)
--#define getDOT() getline(curline->l_dline, linebuf)
-+#define getDOT() j_getline(curline->l_dline, linebuf)
- #define lastp(line) ((line) == curbuf->b_last)
-
- extern UnivPtr
---- ./temp.h.orig 2002-03-20 15:49:39.000000000 -0600
-+++ ./temp.h 2018-08-19 13:13:12.907005347 -0500
-@@ -12,7 +12,7 @@
- * Yank and Kill are really easy; basically all we do is make copies
- * of the disk addresses of the lines (as opposed to the contents).
- * So, putline(char *buf) writes buf to the disk and returns a new
-- * disk address. getline(daddr addr, char *buf) is the opposite of
-+ * disk address. j_getline(daddr addr, char *buf) is the opposite of
- * putline(). f_getputl(LinePtr line, File fp) reads from open fp
- * directly into the tmp file (into the buffer cache (see below))
- * and stores the address in line. This is used during read_file to
---- ./io.c.orig 2010-04-16 00:41:46.000000000 -0500
-+++ ./io.c 2018-08-19 13:13:12.909005347 -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
---- ./util.c.orig 2004-02-01 13:38:29.000000000 -0600
-+++ ./util.c 2018-08-19 13:13:12.909005347 -0500
-@@ -280,7 +280,7 @@
- strcpy(buf, linebuf);
- Jr_Len = strlen(linebuf);
- } else
-- getline(line->l_dline, buf);
-+ j_getline(line->l_dline, buf);
- return buf;
- }
-
diff --git a/source/ap/jove/jove.url b/source/ap/jove/jove.url
new file mode 100644
index 000000000..024b00c40
--- /dev/null
+++ b/source/ap/jove/jove.url
@@ -0,0 +1,3 @@
+ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev
+# Old stable site:
+#ftp://ftp.cs.toronto.edu/cs/ftp/pub/moraes/jove