summaryrefslogtreecommitdiff
path: root/source/l/boost
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-05-09 20:49:43 +0000
committerEric Hameleers <alien@slackware.com>2020-05-10 08:59:54 +0200
commit8c0924cc550c761da0289742cfed897ee6312d14 (patch)
treebc8f83ec0ad5773ace873a21222d19ac5a8b31e1 /source/l/boost
parent04ebdce888955069ae2288597a2e50339eda3f4b (diff)
downloadcurrent-8c0924cc550c761da0289742cfed897ee6312d14.tar.gz
Sat May 9 20:49:43 UTC 202020200509204943
ap/pamixer-1.4-x86_64-5.txz: Rebuilt. Recompiled against boost-1.73.0. d/Cython-0.29.17-x86_64-2.txz: Rebuilt. Added cython3 symlink. kde/calligra-2.9.11-x86_64-35.txz: Rebuilt. Recompiled against boost-1.73.0. l/akonadi-1.13.0-x86_64-15.txz: Rebuilt. Recompiled against boost-1.73.0. l/boost-1.73.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/freetype-2.10.2-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_11-x86_64-1.txz: Upgraded. n/libqmi-1.24.12-x86_64-1.txz: Upgraded. xap/blueman-2.1.3-x86_64-1.txz: Upgraded. testing/packages/PAM/pam-krb5-4.9-x86_64-1_pam.txz: Added. Thanks to Bart van der Hall for the packaging hints.
Diffstat (limited to 'source/l/boost')
-rwxr-xr-xsource/l/boost/boost.SlackBuild5
-rw-r--r--source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch42
2 files changed, 1 insertions, 46 deletions
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index b311eccb..0ed7d87f 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:-1}
PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -92,9 +92,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Fix missing `boost/serialization/split_member.hpp` include:
-zcat $CWD/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch.gz | patch -p2 --verbose || exit 1
-
# First build bjam, the boost build system:
./bootstrap.sh \
--with-toolset=gcc \
diff --git a/source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch b/source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch
deleted file mode 100644
index 0090bf04..00000000
--- a/source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f61dd9c5324d8439c52764c7aebaac7d0d4b7128 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 21 Dec 2019 14:02:13 +0100
-Subject: [PATCH] Fix missing `boost/serialization/split_member.hpp` include
-
-* As suggested by @glenfe and @robertramey in
- https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430,
- the `boost/serialization/split_member.hpp` include is not part
- of the interface and consumers should not rely on it being
- included.
-
-Fixes lightspark/lightspark#406
-Fixes https://bugs.gentoo.org/703294
----
- include/boost/bimap/detail/map_view_iterator.hpp | 1 +
- include/boost/bimap/detail/set_view_iterator.hpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/include/boost/bimap/detail/map_view_iterator.hpp b/include/boost/bimap/detail/map_view_iterator.hpp
-index 17d43cb..4af8484 100644
---- a/include/boost/bimap/detail/map_view_iterator.hpp
-+++ b/include/boost/bimap/detail/map_view_iterator.hpp
-@@ -22,6 +22,7 @@
-
- #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
- #include <boost/serialization/nvp.hpp>
-+ #include <boost/serialization/split_member.hpp>
- #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
-
- #include <boost/iterator/detail/enable_if.hpp>
-diff --git a/include/boost/bimap/detail/set_view_iterator.hpp b/include/boost/bimap/detail/set_view_iterator.hpp
-index e785ed7..b1e2dfa 100644
---- a/include/boost/bimap/detail/set_view_iterator.hpp
-+++ b/include/boost/bimap/detail/set_view_iterator.hpp
-@@ -22,6 +22,7 @@
-
- #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION
- #include <boost/serialization/nvp.hpp>
-+ #include <boost/serialization/split_member.hpp>
- #endif // BOOST_BIMAP_DISABLE_SERIALIZATION
-
- #include <boost/iterator/detail/enable_if.hpp>