diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
| -rwxr-xr-x | source/installer/build_installer.sh | 5 | ||||
| -rw-r--r-- | source/l/boost/boost-1.73-geometry-issue721.patch | 23 | ||||
| -rwxr-xr-x | source/l/boost/boost.SlackBuild | 5 |
4 files changed, 39 insertions, 1 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 43f7cda15..6ed80164e 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Sun Jul 26 18:30:17 UTC 2020 + Add neofetch. Seems like a useful system information tool to have in the + installer, and it's small enough. + Note that without /etc/os-release, this gives a generic Tux logo instead of + the Slackware logo, but that also keeps the system information from getting + clipped if the terminal is 80 columns. ++--------------------------+ Fri Jul 10 00:21:42 UTC 2020 Add speakup modules to the installer image. We'll hopefully figure out how to better handle these in the future. diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index d3841190b..15700c3d3 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -905,6 +905,7 @@ a/zerofree \ ap/ddrescue \ ap/dmidecode \ ap/lsscsi \ +ap/neofetch \ ap/terminus-font \ d/gcc \ d/gcc-g++ \ @@ -992,6 +993,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \ ddrescue \ ldd \ lzip \ + neofetch \ plzip \ rev \ uuidgen \ @@ -2233,6 +2235,9 @@ if [ -d usr/man ]; then man8/ip.8.bz2 \ man1/nano.1.bz2 \ man8/zerofree.8.bz2 \ + man1/lzip.1.bz2 \ + man1/plzip.1.bz2 \ + man1/neofetch.1.bz2 \ ; do mkdir -p man/$(dirname $manpage) cp -a man.full/$manpage man/$manpage diff --git a/source/l/boost/boost-1.73-geometry-issue721.patch b/source/l/boost/boost-1.73-geometry-issue721.patch new file mode 100644 index 000000000..0e843b9ca --- /dev/null +++ b/source/l/boost/boost-1.73-geometry-issue721.patch @@ -0,0 +1,23 @@ +From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <boost@kayari.org> +Date: Fri, 5 Jun 2020 19:29:27 +0100 +Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public + +Fixes #721 +--- + include/boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/geometry/index/detail/rtree/visitors/insert.hpp b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp +index 2d324cb7f4..5709a930cc 100644 +--- a/boost/geometry/index/detail/rtree/visitors/insert.hpp ++++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp +@@ -265,7 +265,7 @@ struct insert_traverse_data + // Default insert visitor + template <typename Element, typename MembersHolder> + class insert +- : MembersHolder::visitor ++ : public MembersHolder::visitor + { + protected: + typedef typename MembersHolder::box_type box_type; diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 80d32a63e..b69988377 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -85,6 +85,9 @@ rm -rf boost_$VERSION tar xvf $CWD/boost_$VERSION.tar.?z || exit 1 cd boost_$VERSION || exit 1 +# Revert a change that broke building krita: +zcat $CWD/boost-1.73-geometry-issue721.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |