From e4744bafbf98be5634cb4be76e4ef39bff19d595 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 5 Sep 2021 16:57:51 -0400 Subject: development/nchexedit: Updated for version 0.9.7_7.1, fix rc1 build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- development/nchexedit/nchexedit.SlackBuild | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'development/nchexedit/nchexedit.SlackBuild') diff --git a/development/nchexedit/nchexedit.SlackBuild b/development/nchexedit/nchexedit.SlackBuild index 4af50b5820..c51ffb3de0 100644 --- a/development/nchexedit/nchexedit.SlackBuild +++ b/development/nchexedit/nchexedit.SlackBuild @@ -13,11 +13,13 @@ # We're using most of Debian's patches, the _5 in VERSION is their # patchlevel. +# 20210905 bkw: update for v0.9.7_7.1, fix -current segfault issue. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nchexedit -VERSION=${VERSION:-0.9.7_5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.7_7.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -34,9 +36,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -81,7 +80,8 @@ rm -f debian/patches/fix_hexedit_references.patch \ debian/patches/info_dir_section.patch \ debian/patches/rename_binaries.patch \ debian/patches/autoconf_2.69.patch \ - debian/patches/fix_its_typo.patch + debian/patches/fix_its_typo.patch \ + debian/patches/fix_spelling_errors.patch chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ @@ -90,7 +90,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # Apply the patches we didn't rm. for i in $( cat debian/patches/series ); do P=debian/patches/$i - [ -e $P ] && patch -p1 < $P + [ -e $P ] && echo "=== $P" && patch -p1 < $P done # Reworked version of Debian patch. @@ -101,15 +101,21 @@ sed -i \ -e 's/hexedit/nchexedit/g' \ -e 's/Hexedit/NCHexedit/g' \ -e 's/HEXEDIT/NCHEXEDIT/g' \ - -e '/utexas\.edu/s#{http[^}]*}#{http://www.rogoyski.com/adam/programs/hexedit/}#' \ + -e '/utexas\.edu/s#{http[^}]*}#{https://www.rogoyski.com/adam/programs/hexedit/}#' \ docs/$SRCNAM.1 # ...nor the info file. sed -i \ -e 's/hexedit/nchexedit/g' \ - -e '/utexas\.edu/s#{http[^}]*}#{http://www.rogoyski.com/adam/programs/hexedit/}#' \ + -e '/utexas\.edu/s#{http[^}]*}#{https://www.rogoyski.com/adam/programs/hexedit/}#' \ docs/$SRCNAM.texinfo +# 20210905 bkw: required for -current (but why?). Without this, it segfaults +# on startup. +sed -i 's,-lncurses,-lncursesw,g' configure + +SLKCFLAGS+=" -fcommon" + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ -- cgit v1.2.3