From a8f1b55a2eeadb0b756b59217f73af07c5c10eb3 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 23 Jun 2018 04:57:41 +0000 Subject: Sat Jun 23 04:57:41 UTC 2018 a/dialog-1.3_20170509-x86_64-2.txz: Rebuilt. It seems the latest dialog causes a lot of breakage in the installer and other scripts. I looked over the diff since last time and nothing jumped out at me. Reverting to the previous version that worked properly. isolinux/initrd.img: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/a/dialog/dialog.SlackBuild | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild index 87ded0946..56047e67a 100755 --- a/source/a/dialog/dialog.SlackBuild +++ b/source/a/dialog/dialog.SlackBuild @@ -22,8 +22,23 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dialog -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} -BUILD=${BUILD:-1} + +# Think twice (or more) before upgrading this - the latest versions completely +# destroy the careful formatting in the Slackware installer. While it's lost +# to history now for the most part, I was the original beta tester for dialog, +# which was created to support our installer. I even wrote the --infobox widget +# before the first release. While I appreciate the advances dialog has made in +# the years since then, I'm nnot about to quickly shoot myself in the foot again +# (think tar-1.13 ;-). If you are reading this and think that Slackware "needs" +# to have the latest dialog, I'm willing to listen to your rationale. However, +# unless it's been tested with the installer and every other script in Slackware +# that uses dialog and found to work, and you've already gotten any needed +# patches accepted upstream... well... I like this version. If it's got bugs, +# they aren't bugs that I'm running into often. +#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} +VERSION=1.3-20170509 + +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,7 +85,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1 @@ -93,7 +108,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-nls \ --with-ncursesw \ --enable-widec \ - --build=$ARCH-slackware-linux || exit 1 + --build=$ARCH-slackware-linux # Build and install: make -j4 || exit 1 -- cgit v1.2.3