diff options
Diffstat (limited to '')
| -rw-r--r-- | source/a/FTBFSlog | 13 | ||||
| -rwxr-xr-x | source/a/cpio/cpio.SlackBuild | 9 | ||||
| -rwxr-xr-x | source/a/floppy/floppy.SlackBuild | 6 | ||||
| -rwxr-xr-x | source/a/gpm/gpm.SlackBuild | 8 | ||||
| -rwxr-xr-x | source/a/jfsutils/jfsutils.SlackBuild | 8 | ||||
| -rwxr-xr-x | source/a/kbd/kbd.SlackBuild | 3 | ||||
| -rw-r--r-- | source/a/mkinitrd/busybox-dot-config | 31 | ||||
| -rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 6 | ||||
| -rwxr-xr-x | source/a/sharutils/sharutils.SlackBuild | 8 | ||||
| -rwxr-xr-x | source/a/tcsh/tcsh.SlackBuild | 8 | ||||
| -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 |
16 files changed, 385 insertions, 43 deletions
diff --git a/source/a/FTBFSlog b/source/a/FTBFSlog index 180b39d63..58e0ffb09 100644 --- a/source/a/FTBFSlog +++ b/source/a/FTBFSlog @@ -1,3 +1,16 @@ +Sun Jan 17 20:10:50 UTC 2021 + mkinitrd: upgrade busybox to fix missing stime in newer glibc. ++--------------------------+ +Sat Jan 16 18:30:47 UTC 2021 + cpio: add -fcommon to CFLAGS. + floppy: add -fcommon to CFLAGS. + gpm: add -fcommon to CFLAGS. + jfsutils: add -fcommon to CFLAGS. + kbd: add -fcommon to CFLAGS. + sharutils: add -fcommon to CFLAGS. + tcsh: add -fcommon to CFLAGS. + Thanks to nobodino. ++--------------------------+ Sat May 4 17:55:48 UTC 2019 efivar: patched to fix GCC9 warnings resulting in build failure. Thanks to nobodino and ponce. diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild index ef1145a7b..463cfc4e0 100755 --- a/source/a/cpio/cpio.SlackBuild +++ b/source/a/cpio/cpio.SlackBuild @@ -53,14 +53,17 @@ rm -rf $PKG mkdir -p $TMP $PKG if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=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" +else + SLKCFLAGS="-O2 -fcommon" + LIBDIRSUFFIX="" fi # Don't use icecream: diff --git a/source/a/floppy/floppy.SlackBuild b/source/a/floppy/floppy.SlackBuild index 836e8d4d5..7180ca538 100755 --- a/source/a/floppy/floppy.SlackBuild +++ b/source/a/floppy/floppy.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -46,10 +46,10 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi if [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O -fPIC" + SLKCFLAGS="-O -fPIC -fcommon" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O" + SLKCFLAGS="-O -fcommon" LIBDIRSUFFIX="" fi diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild index 559286151..a9b1f8e44 100755 --- a/source/a/gpm/gpm.SlackBuild +++ b/source/a/gpm/gpm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2014, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2014, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -50,13 +50,13 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-gpm if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=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" fi diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild index 60556c67d..f37be98a2 100755 --- a/source/a/jfsutils/jfsutils.SlackBuild +++ b/source/a/jfsutils/jfsutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -48,11 +48,11 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-jfsutils if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" fi rm -rf $PKG diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild index 94bced874..71522117f 100755 --- a/source/a/kbd/kbd.SlackBuild +++ b/source/a/kbd/kbd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -107,6 +107,7 @@ zcat $CWD/sources/kbd-1.15.3-fix-es-translation.patch.gz | patch -p1 --verbose | zcat $CWD/sources/nl.euro.diff.gz | patch -p1 || exit 1 # Configure: +CFLAGS="-fcommon" \ ./configure \ --prefix=/usr \ --localedir=/usr/share/locale/ \ diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config index 01c892222..866752902 100644 --- a/source/a/mkinitrd/busybox-dot-config +++ b/source/a/mkinitrd/busybox-dot-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.1 -# Sun Mar 3 13:10:00 2019 +# Busybox version: 1.32.1 +# Sun Jan 17 13:37:03 2021 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y CONFIG_PLATFORM_LINUX=y @@ -75,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -236,7 +238,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -303,6 +304,7 @@ CONFIG_STTY=y CONFIG_SUM=y CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y +CONFIG_FSYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -461,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -639,6 +642,7 @@ CONFIG_FEATURE_MDEV_RENAME=y CONFIG_FEATURE_MDEV_RENAME_REGEXP=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_FEATURE_MDEV_DAEMON=y CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_MKE2FS=y @@ -690,6 +694,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y CONFIG_TASKSET=y CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_FEATURE_TASKSET_CPULIST=y CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -786,6 +791,7 @@ CONFIG_I2CGET=y CONFIG_I2CSET=y CONFIG_I2CDUMP=y CONFIG_I2CDETECT=y +CONFIG_I2CTRANSFER=y CONFIG_INOTIFYD=y CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -806,6 +812,7 @@ CONFIG_MAKEDEVS=y CONFIG_FEATURE_MAKEDEVS_TABLE=y CONFIG_MAN=y CONFIG_MICROCOM=y +CONFIG_MIM=y CONFIG_MT=y CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y @@ -819,6 +826,7 @@ CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TS=y CONFIG_TTYSIZE=y CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y @@ -883,12 +891,12 @@ CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_MAPPING=y CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y # CONFIG_INETD is not set -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y -CONFIG_FEATURE_INETD_RPC=y +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set CONFIG_IP=y CONFIG_IPADDR=y CONFIG_IPLINK=y @@ -946,6 +954,7 @@ CONFIG_FEATURE_TELNETD_STANDALONE=y CONFIG_FEATURE_TELNETD_INETD_WAIT=y CONFIG_TFTP=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_FEATURE_TFTP_HPA_COMPAT=y CONFIG_TFTPD=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y @@ -1094,6 +1103,7 @@ CONFIG_SH_IS_ASH=y CONFIG_BASH_IS_ASH=y # CONFIG_BASH_IS_HUSH is not set # CONFIG_BASH_IS_NONE is not set +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1114,6 +1124,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y CONFIG_CTTYHACK=y # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1155,6 +1166,7 @@ CONFIG_CTTYHACK=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set @@ -1179,6 +1191,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set CONFIG_FEATURE_SYSLOGD_CFG=y +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index f4a63f13c..3d89da60f 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} -BB=1.30.1 -BUILD=${BUILD:-16} +BB=1.32.1 +BUILD=${BUILD:-17} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/sharutils/sharutils.SlackBuild b/source/a/sharutils/sharutils.SlackBuild index f3dbbdc40..539c07d98 100755 --- a/source/a/sharutils/sharutils.SlackBuild +++ b/source/a/sharutils/sharutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -48,13 +48,13 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-sharutils if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="64" fi diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild index 5bbf788a9..a681a6642 100755 --- a/source/a/tcsh/tcsh.SlackBuild +++ b/source/a/tcsh/tcsh.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -50,11 +50,11 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" fi rm -rf $PKG diff --git a/source/ap/FTBFSlog b/source/ap/FTBFSlog index 7904c67c4..23a464f7d 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 1d364ade6..33d4ca5d5 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 000000000..d6beb5811 --- /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 000000000..66b5f6556 --- /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 614896e0e..8179ac614 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 8276722b2..def8cd771 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 |