diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/FTBFSlog | 9 | ||||
| -rwxr-xr-x | source/ap/bpe/bpe.SlackBuild | 5 | ||||
| -rw-r--r-- | source/ap/bpe/bpe.port.to.strerror.diff | 258 | ||||
| -rw-r--r-- | source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch | 39 | ||||
| -rwxr-xr-x | source/ap/ghostscript/ghostscript.SlackBuild | 3 | ||||
| -rwxr-xr-x | source/ap/squashfs-tools/squashfs-tools.SlackBuild | 14 |
6 files changed, 320 insertions, 8 deletions
diff --git a/source/ap/FTBFSlog b/source/ap/FTBFSlog index 7904c67c..23a464f7 100644 --- a/source/ap/FTBFSlog +++ b/source/ap/FTBFSlog @@ -1,3 +1,12 @@ +Sun Jan 17 20:00:47 UTC 2021 + bpe: port from sys_errlist to strerror. ++--------------------------+ +Sat Jan 16 18:33:06 UTC 2021 + squashfs-tools: add -fcommon to CFLAGS. Thanks to nobodino. ++--------------------------+ +Fri Jan 15 20:03:16 UTC 2021 + ghostscript: fix build against freetype-2.10.4. Thanks to nobodino. ++--------------------------+ Mon Dec 9 21:33:37 UTC 2019 Patched for texinfo-6.7. Thanks to Matteo Bernardini. +--------------------------+ diff --git a/source/ap/bpe/bpe.SlackBuild b/source/ap/bpe/bpe.SlackBuild index 1d364ade..33d4ca5d 100755 --- a/source/ap/bpe/bpe.SlackBuild +++ b/source/ap/bpe/bpe.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -66,6 +66,9 @@ cd bpe-$VERSION chown -R root:root . find . -perm 777 -exec chmod 755 {} \+ find . -perm 664 -exec chmod 644 {} \+ + +zcat $CWD/bpe.port.to.strerror.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr || exit 1 diff --git a/source/ap/bpe/bpe.port.to.strerror.diff b/source/ap/bpe/bpe.port.to.strerror.diff new file mode 100644 index 00000000..d6beb581 --- /dev/null +++ b/source/ap/bpe/bpe.port.to.strerror.diff @@ -0,0 +1,258 @@ +diff -u -r --new-file bpe-2.01.00.orig/backup.c bpe-2.01.00/backup.c +--- bpe-2.01.00.orig/backup.c 2000-03-19 17:46:30.000000000 -0600 ++++ bpe-2.01.00/backup.c 2021-01-17 13:58:59.476044303 -0600 +@@ -65,7 +65,7 @@ + if ((fdb = open(bfile, O_WRONLY | O_CREAT | O_TRUNC, + (int) (Sbuf.st_mode & 0777))) == -1) + { +- stl_msg(sys_errlist[errno], bfile, BUC1ERR, 1); ++ stl_msg(strerror(errno), bfile, BUC1ERR, 1); + (void) umask(cmask); + Fil[optind].bak_status = errbak; + return; +@@ -73,7 +73,7 @@ + + if (lseek(Crnt.fd, 0L, 0) == -1) + { +- stl_msg(sys_errlist[errno], (char *) NULL, LSERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LSERR, 1); + (void) umask(cmask); + (void) close(fdb); + Fil[optind].bak_status = errbak; +@@ -86,7 +86,7 @@ + break; + + if (c < 0 || d < 0) +- stl_msg(sys_errlist[errno], (char *) NULL, ++ stl_msg(strerror(errno), (char *) NULL, + (c < 0) ? RDERR : WRERR, 1); + + (void) close(fdb); +@@ -251,7 +251,7 @@ + O_WRONLY | O_APPEND : O_WRONLY | O_CREAT | O_TRUNC, + (~cmask) & 0666)) == -1) + { +- stl_msg(sys_errlist[errno], filename, (trunc_flag == off) ? ++ stl_msg(strerror(errno), filename, (trunc_flag == off) ? + FAERR : FCERR, 1); + (void) umask(cmask); + return; +@@ -259,7 +259,7 @@ + + if (lseek(Crnt.fd, start, 0) == -1) + { +- stl_msg(sys_errlist[errno], (char *) NULL, LSERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LSERR, 1); + (void) umask(cmask); + (void) close(fdf); + return; +@@ -278,7 +278,7 @@ + + if (d < 0 || e < 0) + /* read/write-error message */ +- stl_msg(sys_errlist[errno], (char *) NULL, ++ stl_msg(strerror(errno), (char *) NULL, + (d < 0) ? RDERR : WRERR, 1); + + else +diff -u -r --new-file bpe-2.01.00.orig/buffer.c bpe-2.01.00/buffer.c +--- bpe-2.01.00.orig/buffer.c 2000-03-19 17:46:30.000000000 -0600 ++++ bpe-2.01.00/buffer.c 2021-01-17 13:58:59.476044303 -0600 +@@ -37,15 +37,15 @@ + dispos(); + + if (lseek(Crnt.fd, Fil[optind].fpos, 0) == -1) +- stl_msg(sys_errlist[errno], (char *) NULL, LSERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LSERR, 1); + + else + /* if ((Crnt.bytes = read(Crnt.fd, (char *) Buf.pagebuf, + Ute.edit_chars)) == -1) +- stl_msg(sys_errlist[errno], (char *) NULL, RDERR, 1); */ ++ stl_msg(strerror(errno), (char *) NULL, RDERR, 1); */ + if ((Crnt.bytes = read(Crnt.fd, (unsigned char *) Buf.pagebuf, + Ute.edit_chars)) == -1) +- stl_msg(sys_errlist[errno], (char *) NULL, RDERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, RDERR, 1); + + return(Crnt.bytes); + +@@ -167,14 +167,14 @@ + + if (lseek(Crnt.fd, Fil[optind].fpos, 0) == -1) + { +- stl_msg(sys_errlist[errno], (char *) NULL, LSERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LSERR, 1); + return(-1); + } + + if (write(Crnt.fd, (char *) Buf.pagebuf, + (unsigned) Crnt.bytes) != Crnt.bytes) + { +- stl_msg(sys_errlist[errno], (char *) NULL, WRERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, WRERR, 1); + return(-1); + } + +@@ -215,7 +215,7 @@ + (unsigned) sizeof (struct files))) == NULL) + { + (void) fprintf(stderr,"%s: cannot allocate memory: %s\n", +- Ute.bpe_name, sys_errlist[errno]); ++ Ute.bpe_name, strerror(errno)); + (void) fflush(stderr); + return(1); + } +@@ -244,7 +244,7 @@ + (unsigned char *) malloc((unsigned) Ute.edit_chars)) == NULL) + { + (void) sprintf(Ute.errmsg, "cannot allocate buffer memory: %s", +- sys_errlist[errno]); ++ strerror(errno)); + return(1); + } + +@@ -277,7 +277,7 @@ + (strlen(filename) + 1))) == NULL) + { + /* cannot allocate memory message */ +- stl_msg(sys_errlist[errno], (char *) NULL, MEMERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, MEMERR, 1); + return(1); + } + +diff -u -r --new-file bpe-2.01.00.orig/file.c bpe-2.01.00/file.c +--- bpe-2.01.00.orig/file.c 2000-03-19 17:46:30.000000000 -0600 ++++ bpe-2.01.00/file.c 2021-01-17 13:58:59.477044303 -0600 +@@ -205,7 +205,7 @@ + stl_msg((char *) NULL, last_file, NOSFILE, 1); + + else +- stl_msg(sys_errlist[errno], last_file, ACCERR, 1); ++ stl_msg(strerror(errno), last_file, ACCERR, 1); + + return(1); + } +@@ -491,7 +491,7 @@ + { + Fil[optind].ftype = 0; + dispheader(1, filename); +- stl_msg(sys_errlist[errno], filename, OPERR, 1); ++ stl_msg(strerror(errno), filename, OPERR, 1); + return(1); + } + +@@ -550,7 +550,7 @@ + if (close(Crnt.fd) == -1) + { + (void) sprintf(Ute.errmsg, "cannot close: \"%s\" - %s", +- filename, sys_errlist[errno]); ++ filename, strerror(errno)); + return(1); + } + +@@ -579,7 +579,7 @@ + + if (stat(filename, &Sbuf)) + { +- stl_msg(sys_errlist[errno], filename, STERR, 1); ++ stl_msg(strerror(errno), filename, STERR, 1); + Fil[optind].flength = -1L; + return(-1); + } +@@ -630,7 +630,7 @@ + + if (stat(filename, &tsbuf)) + { +- stl_msg(sys_errlist[errno], filename, STERR, 1); ++ stl_msg(strerror(errno), filename, STERR, 1); + return(1); + } + +@@ -649,7 +649,7 @@ + tbuf.actime = tsbuf.st_atime; + if (utime(filename, &tbuf)) + { +- stl_msg(sys_errlist[errno], filename, TIMERR, 1); ++ stl_msg(strerror(errno), filename, TIMERR, 1); + return(1); + } + +diff -u -r --new-file bpe-2.01.00.orig/lock.c bpe-2.01.00/lock.c +--- bpe-2.01.00.orig/lock.c 2000-03-19 17:46:30.000000000 -0600 ++++ bpe-2.01.00/lock.c 2021-01-17 13:58:59.481044303 -0600 +@@ -36,7 +36,7 @@ + if (unlink(lockfile)) + { + Crnt.lock_flag = errnolock; +- stl_msg(sys_errlist[errno], ++ stl_msg(strerror(errno), + (char *) NULL, LFDERR, 1); + } + } +@@ -114,7 +114,7 @@ + else + { + /* Cannot create lockfile */ +- stl_msg(sys_errlist[errno], (char *) NULL, LFCERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LFCERR, 1); + Crnt.lock_flag = errnolock; + } + +@@ -128,7 +128,7 @@ + sizeof(struct lock_id)) + { + /* Cannot write to lockfile */ +- stl_msg(sys_errlist[errno], (char *) NULL, LFWERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LFWERR, 1); + (void) close(fdl); + (void) umask(cmask); + Crnt.lock_flag = errlock; +@@ -160,7 +160,7 @@ + else + { + /* lockfile error */ +- stl_msg(sys_errlist[errno], (char *) NULL, LFERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LFERR, 1); + Crnt.lock_flag = errlock; + return; + } +@@ -170,7 +170,7 @@ + sizeof(struct lock_id)) + { + /* Cannot read lockfile */ +- stl_msg(sys_errlist[errno], (char *) NULL, LFRERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LFRERR, 1); + (void) close(fdl); + Crnt.lock_flag = errlock; + return; +@@ -189,7 +189,7 @@ + + if (Crnt.lock_flag == lock || Crnt.lock_flag == errlock) + if (unlink(lockfile) && (status_code)) +- stl_msg(sys_errlist[errno], (char *) NULL, LFDERR, 1); ++ stl_msg(strerror(errno), (char *) NULL, LFDERR, 1); + + } + +diff -u -r --new-file bpe-2.01.00.orig/main.c bpe-2.01.00/main.c +--- bpe-2.01.00.orig/main.c 2000-03-19 17:46:30.000000000 -0600 ++++ bpe-2.01.00/main.c 2021-01-17 13:58:59.482044303 -0600 +@@ -226,7 +226,7 @@ + if (Ute.numfiles == 1 && access(argv[optind], 4)) + { + (void) fprintf(stderr, "%s: cannot access: \"%s\" - %s\n", +- Ute.bpe_name, argv[optind], sys_errlist[errno]); ++ Ute.bpe_name, argv[optind], strerror(errno)); + (void) fflush(stderr); + return(EXIT_FAILURE); + } +@@ -452,7 +452,7 @@ + if ((ttyflag = setup_tty()) != 0) + { + (void) fprintf(stderr, "%s: ioctl error - %s\n", +- Ute.bpe_name, sys_errlist[ttyflag]); ++ Ute.bpe_name, strerror(ttyflag)); + (void) fflush(stderr); + return(EXIT_FAILURE); + } diff --git a/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch new file mode 100644 index 00000000..66b5f655 --- /dev/null +++ b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch @@ -0,0 +1,39 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2020-10-20 +Initial Package Version: 9.53.3 +Upstream Status: Applied +Origin: https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b#patch1 +Description: Fixes build failure with freetype-2.10.3 and later. + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dc..21aef2f 100644 (file) +--- a/base/fapi_ft.c ++++ b/base/fapi_ft.c +@@ -125,7 +125,7 @@ static void + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + +-FT_CALLBACK_DEF(void *) ++static void * + FF_alloc(FT_Memory memory, long size) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) + return (gs_malloc(mem, size, 1, "FF_alloc")); + } + +-FT_CALLBACK_DEF(void *) ++static void * + FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) + return (tmp); + } + +-FT_CALLBACK_DEF(void) ++static void + FF_free(FT_Memory memory, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; + diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild index 614896e0..8179ac61 100755 --- a/source/ap/ghostscript/ghostscript.SlackBuild +++ b/source/ap/ghostscript/ghostscript.SlackBuild @@ -76,6 +76,9 @@ cd ${SRCPREFIX}${PKGNAM}-$VERSION || exit 1 # Remove unmaintained garbage: rm -rf freetype jpeg lcms2 libpng libtiff png tiff zlib +# Fix build against freetype-2.10.3+: +zcat $CWD/ghostscript-9.53.3-freetype_fix-1.patch.gz | patch -p1 --verbose || exit 1 + # Regenerate ./configure. Needed if patched, or to prevent libtool mismatch. autoreconf --force --install ( cd jbig2dec ; autoreconf --force --install ) diff --git a/source/ap/squashfs-tools/squashfs-tools.SlackBuild b/source/ap/squashfs-tools/squashfs-tools.SlackBuild index 8276722b..def8cd77 100755 --- a/source/ap/squashfs-tools/squashfs-tools.SlackBuild +++ b/source/ap/squashfs-tools/squashfs-tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2015, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -48,22 +48,22 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" + SLKCFLAGS="-O2 -march=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16 -fcommon" LIBDIRSUFFIX="" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" fi |