diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-09-12 21:19:38 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-09-13 09:00:32 +0200 |
commit | 4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e (patch) | |
tree | 9db69cd6844d576aa97a12f01166f84c3db65fe8 /source | |
parent | 4ffeac73188b0486a8c6a6dac099a2675276e599 (diff) | |
download | current-4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e.tar.gz current-4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e.tar.xz |
Wed Sep 12 21:19:38 UTC 201820180912211938
a/elilo-3.16-x86_64-8.txz: Rebuilt.
eliloconfig: this was occasionally failing and the issue was traced to the
script's use of tr (not sure why still). Replaced the construct with sed
and the issue seems to have gone away.
a/openssl-solibs-1.1.1-x86_64-1.txz: Upgraded.
d/binutils-2.31.1-x86_64-3.txz: Rebuilt.
Do not install the Windows-specific tools. Not only are these useless on
Linux, but the presence of windres fools freetype into thinking that it is
on a Windows system, leading to a build failure.
d/git-2.19.0-x86_64-1.txz: Upgraded.
l/freetype-2.9.1-x86_64-1.txz: Upgraded.
l/harfbuzz-1.9.0-x86_64-1.txz: Upgraded.
l/media-player-info-24-noarch-1.txz: Upgraded.
l/pcre2-10.32-x86_64-1.txz: Upgraded.
l/sg3_utils-1.43-x86_64-1.txz: Upgraded.
n/openssl-1.1.1-x86_64-1.txz: Upgraded.
x/fontconfig-2.13.1-x86_64-1.txz: Upgraded.
We had problem reports with fontconfig-2.13.0 which led to it being reverted
but we'll try it again. Please let me know if the issues (with Wine iirc)
persist.
x/libinput-1.12.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/elilo/elilo.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/elilo/eliloconfig | 4 | ||||
-rwxr-xr-x | source/d/binutils/binutils.SlackBuild | 6 | ||||
-rwxr-xr-x | source/d/python-setuptools/python-setuptools.SlackBuild | 6 | ||||
-rwxr-xr-x | source/l/freetype/freetype.SlackBuild | 20 | ||||
-rwxr-xr-x | source/l/media-player-info/media-player-info.SlackBuild | 6 | ||||
-rwxr-xr-x | source/l/pcre2/pcre2.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/sg3_utils/sg3_utils.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/sg3_utils/sg3_utils.url (renamed from source/l/sg3_utils/sg3_utils.info) | 0 | ||||
-rwxr-xr-x | source/n/openssl/openssl.SlackBuild | 6 | ||||
-rwxr-xr-x | source/x/fontconfig/fontconfig.SlackBuild | 2 |
11 files changed, 38 insertions, 18 deletions
diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild index 5a59c3b75..933a67b55 100755 --- a/source/a/elilo/elilo.SlackBuild +++ b/source/a/elilo/elilo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=elilo VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig index c31d137e9..43616d563 100644 --- a/source/a/elilo/eliloconfig +++ b/source/a/elilo/eliloconfig @@ -91,11 +91,11 @@ PARTLEN=9 if mount | grep vfat | grep -wq /boot/efi ; then mount | grep vfat | grep -w /boot/efi | grep -q -e nvme -e mmcblk && DEVLEN=12 && PARTLEN=14 EFI_DEVICE=$(mount | grep vfat | grep -w /boot/efi | cut -b 1-${DEVLEN}) - EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) + EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | sed 's/[^0-9]*//g') else mount | grep vfat | grep -w $T_PX/boot/efi | grep -q -e nvme -e mmcblk && DEVLEN=12 && PARTLEN=14 EFI_DEVICE=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -b 1-${DEVLEN}) - EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) + EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | sed 's/[^0-9]*//g') fi # There better be a kernel: diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index a189cba29..cea4ac382 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=binutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -184,6 +184,10 @@ mkdir -p $PKG/usr/${TARGET}/bin # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Remove Windows specific tools / docs (if they exist): +rm -f $PKG/usr/bin/{dlltool,nlmconv,windres,windmc} +rm -f $PKG/usr/man/man1/{dlltool,nlmconv,windres,windmc}* + # Add a symlink since binutils's version of strings used to be called # "strings-GNU" on Slackware, and it's possible that people have scripts # that use that name: diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index aaacb14d1..b178de8c0 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -28,13 +28,13 @@ if ls *.zip 1> /dev/null 2> /dev/null ; then unzip *.zip tar cf $(basename *.zip .zip).tar $(basename *.zip .zip) touch -r *.zip *.tar - xz -9 *.tar + plzip -9 *.tar rm -r $(basename *.zip .zip) rm *.zip fi PKGNAM=python-setuptools -VERSION=${VERSION:-$(echo setuptools-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} SRCNAM=setuptools @@ -62,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find -L . \ diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index ffe814215..2adce0b55 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freetype VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -96,7 +96,23 @@ zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/freetype.compile.both.subpixel.hinting.methods.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . -CFLAGS="$SLKCFLAGS" make setup CFG="--prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} --build=$ARCH-slackware-linux" + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --with-zlib=yes \ + --with-bzip2=yes \ + --with-png=yes \ + --enable-freetype-config \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/media-player-info/media-player-info.SlackBuild b/source/l/media-player-info/media-player-info.SlackBuild index 705d31548..575e9573e 100755 --- a/source/l/media-player-info/media-player-info.SlackBuild +++ b/source/l/media-player-info/media-player-info.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=media-player-info -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} ARCH=noarch @@ -45,7 +45,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/l/pcre2/pcre2.SlackBuild b/source/l/pcre2/pcre2.SlackBuild index f38ef39fa..0b38406bc 100755 --- a/source/l/pcre2/pcre2.SlackBuild +++ b/source/l/pcre2/pcre2.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pcre2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/sg3_utils/sg3_utils.SlackBuild b/source/l/sg3_utils/sg3_utils.SlackBuild index 4cb7d1fd3..09d391b41 100755 --- a/source/l/sg3_utils/sg3_utils.SlackBuild +++ b/source/l/sg3_utils/sg3_utils.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sg3_utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} diff --git a/source/l/sg3_utils/sg3_utils.info b/source/l/sg3_utils/sg3_utils.url index f429377ea..f429377ea 100644 --- a/source/l/sg3_utils/sg3_utils.info +++ b/source/l/sg3_utils/sg3_utils.url diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild index e8aa3bfb0..0d9e08e67 100755 --- a/source/n/openssl/openssl.SlackBuild +++ b/source/n/openssl/openssl.SlackBuild @@ -28,7 +28,7 @@ TMP=${TMP:-/tmp} PKGNAM=openssl VERSION=${VERSION:-$(echo openssl-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,9 +90,9 @@ fi # paranoid that they won't run against a different OpenSSL version than # what they were compiled against, whether or not the ABI has changed. # -# So, we will use the OPENSSL_VERSION_NUMBER from openssl-1.1.0h unless ABI +# So, we will use the OPENSSL_VERSION_NUMBER from openssl-1.1.1 unless ABI # breakage forces it to change. Yes, we're finally using this old trick. :) -sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x1010008fL (1.1.0h) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x1000205fL/g" include/openssl/opensslv.h || exit 1 +sed -i "s/#define OPENSSL_VERSION_NUMBER.*/\/* Use 0x1010100fL (1.1.1) below to avoid pointlessly breaking the ABI *\/\n#define OPENSSL_VERSION_NUMBER 0x1010100fL/g" include/openssl/opensslv.h || exit 1 chown -R root:root . mkdir -p $PKG1/usr/doc/openssl-$VERSION diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild index c18c41007..92ecc4f36 100755 --- a/source/x/fontconfig/fontconfig.SlackBuild +++ b/source/x/fontconfig/fontconfig.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fontconfig VERSION=${VERSION:-$(echo fontconfig-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |