From 6888b10e8512c82c01946e3ab02c01e0356b8802 Mon Sep 17 00:00:00 2001 From: B. Watson Date: Sat, 20 Feb 2021 17:24:26 -0500 Subject: system/ded: Updated for version 20210110. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- system/ded/ded.SlackBuild | 12 +++++++++--- system/ded/ded.info | 10 +++++----- system/ded/td_lib_no_write_usr.diff | 12 ------------ 3 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 system/ded/td_lib_no_write_usr.diff diff --git a/system/ded/ded.SlackBuild b/system/ded/ded.SlackBuild index fa67c0955b..ca200877e3 100644 --- a/system/ded/ded.SlackBuild +++ b/system/ded/ded.SlackBuild @@ -10,6 +10,8 @@ # This build script was written from scratch for 14.1, without referring # to the old script. +# 20210220 bkw: updated for 20210110. get rid of configure patch, found +# a better way to disable the long filename test. # 20200111 bkw: updated for 20200428 release # 20200111 bkw: updated for 20191226 release # 20180915 bkw: updated for 20180324 release @@ -26,7 +28,7 @@ # - added td_lib docs in /usr/doc PRGNAM=ded -VERSION=${VERSION:-20200428} +VERSION=${VERSION:-20210110} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,10 +83,13 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # "checking for long filenames" wants to create files in /usr/lib and # /var/lib. Violates the principle of least surprise: users don't expect # configure scripts (or SlackBuilds) to touch their system directories. -patch -p1 < $CWD/td_lib_no_write_usr.diff -# NB: the -j1's are necessary, even on 'make install'. +# This *should* work, but doesn't, I guess because configure.in is too old. +#sed -i '/^AC_SYS_LONG_FILE_NAMES/d' configure.in +#autoreconf -i +# It turns out we can force it in the environment. +ac_cv_sys_long_file_names="set" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -95,6 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux +# NB: the -j1's are necessary, even on 'make install'. make -j1 # actually, don't really need to make install, ded's configure will find diff --git a/system/ded/ded.info b/system/ded/ded.info index ffd293fa42..009d0a2485 100644 --- a/system/ded/ded.info +++ b/system/ded/ded.info @@ -1,10 +1,10 @@ PRGNAM="ded" -VERSION="20200428" +VERSION="20210110" HOMEPAGE="http://invisible-island.net/ded/" -DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20200428.tgz \ - http://invisible-mirror.net/archives/ded/td_lib-20200428.tgz" -MD5SUM="8002fc7e13f830abe9b2e6f547433d78 \ - c1fd18b0e91d9372c5eb298de4b6616c" +DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20210110.tgz \ + http://invisible-mirror.net/archives/ded/td_lib-20210110.tgz" +MD5SUM="80a03899f46fe64179d824f65ed1491b \ + 71a71fb677e480e293dc7907df23b70b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ded/td_lib_no_write_usr.diff b/system/ded/td_lib_no_write_usr.diff deleted file mode 100644 index 455b1a85bf..0000000000 --- a/system/ded/td_lib_no_write_usr.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur td_lib-20150704/configure td_lib-20150704.patched/configure ---- td_lib-20150704/configure 2015-07-04 11:20:27.000000000 -0400 -+++ td_lib-20150704.patched/configure 2017-03-05 11:29:40.888486013 -0500 -@@ -5031,7 +5031,7 @@ - else - ac_tmpdirs='/tmp /var/tmp /usr/tmp' - fi --for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do -+for ac_dir in . $ac_tmpdirs ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. - ac_xdir=$ac_dir/cf$$ -- cgit v1.2.3