Date: Friday, April 3, 2015 @ 21:45:26 Author: andyrtr Revision: 235402
archrelease: copy trunk to staging-i686, staging-x86_64 Added: boost/repos/staging-i686/ boost/repos/staging-i686/0001-Add-missing-include-to-signals2-trackable.hpp.patch (from rev 235401, boost/trunk/0001-Add-missing-include-to-signals2-trackable.hpp.patch) boost/repos/staging-i686/0001-fixed-shared_ptr_helper-include.patch (from rev 235401, boost/trunk/0001-fixed-shared_ptr_helper-include.patch) boost/repos/staging-i686/PKGBUILD (from rev 235401, boost/trunk/PKGBUILD) boost/repos/staging-x86_64/ boost/repos/staging-x86_64/0001-Add-missing-include-to-signals2-trackable.hpp.patch (from rev 235401, boost/trunk/0001-Add-missing-include-to-signals2-trackable.hpp.patch) boost/repos/staging-x86_64/0001-fixed-shared_ptr_helper-include.patch (from rev 235401, boost/trunk/0001-fixed-shared_ptr_helper-include.patch) boost/repos/staging-x86_64/PKGBUILD (from rev 235401, boost/trunk/PKGBUILD) -------------------------------------------------------------------------+ staging-i686/0001-Add-missing-include-to-signals2-trackable.hpp.patch | 29 ++ staging-i686/0001-fixed-shared_ptr_helper-include.patch | 24 ++ staging-i686/PKGBUILD | 111 ++++++++++ staging-x86_64/0001-Add-missing-include-to-signals2-trackable.hpp.patch | 29 ++ staging-x86_64/0001-fixed-shared_ptr_helper-include.patch | 24 ++ staging-x86_64/PKGBUILD | 111 ++++++++++ 6 files changed, 328 insertions(+) Copied: boost/repos/staging-i686/0001-Add-missing-include-to-signals2-trackable.hpp.patch (from rev 235401, boost/trunk/0001-Add-missing-include-to-signals2-trackable.hpp.patch) =================================================================== --- staging-i686/0001-Add-missing-include-to-signals2-trackable.hpp.patch (rev 0) +++ staging-i686/0001-Add-missing-include-to-signals2-trackable.hpp.patch 2015-04-03 19:45:26 UTC (rev 235402) @@ -0,0 +1,29 @@ +From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@foutrelis.com> +Date: Thu, 6 Nov 2014 09:19:26 +0200 +Subject: [PATCH] Add missing include to signals2/trackable.hpp + +boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots +associated with signals2::trackable immediately) but the matching header +wasn't included. + +https://svn.boost.org/trac/boost/ticket/10100#comment:7 +--- + include/boost/signals2/trackable.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/boost/signals2/trackable.hpp b/include/boost/signals2/trackable.hpp +index dba001d..64e8489 100644 +--- a/include/boost/signals2/trackable.hpp ++++ b/include/boost/signals2/trackable.hpp +@@ -18,6 +18,7 @@ + + #include <boost/assert.hpp> + #include <boost/shared_ptr.hpp> ++#include <boost/weak_ptr.hpp> + + namespace boost { + namespace signals2 { +-- +2.1.3 + Copied: boost/repos/staging-i686/0001-fixed-shared_ptr_helper-include.patch (from rev 235401, boost/trunk/0001-fixed-shared_ptr_helper-include.patch) =================================================================== --- staging-i686/0001-fixed-shared_ptr_helper-include.patch (rev 0) +++ staging-i686/0001-fixed-shared_ptr_helper-include.patch 2015-04-03 19:45:26 UTC (rev 235402) @@ -0,0 +1,24 @@ +From 02fff0a69e46b4d77844cf7b8c8d3bc2adbc96bb Mon Sep 17 00:00:00 2001 +From: Robert Ramey <ra...@rrsd.com> +Date: Tue, 11 Nov 2014 22:13:05 -0800 +Subject: [PATCH] fixed shared_ptr_helper include + +--- + include/boost/serialization/shared_ptr_helper.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/boost/serialization/shared_ptr_helper.hpp b/include/boost/serialization/shared_ptr_helper.hpp +index f4784ec..64269a9 100644 +--- a/include/boost/serialization/shared_ptr_helper.hpp ++++ b/include/boost/serialization/shared_ptr_helper.hpp +@@ -29,6 +29,7 @@ + #include <boost/serialization/singleton.hpp> + #include <boost/serialization/extended_type_info.hpp> + #include <boost/serialization/throw_exception.hpp> ++#include <boost/serialization/type_info_implementation.hpp> + #include <boost/archive/archive_exception.hpp> + #include <boost/archive/detail/decl.hpp> + +-- +2.2.1 + Copied: boost/repos/staging-i686/PKGBUILD (from rev 235401, boost/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-04-03 19:45:26 UTC (rev 235402) @@ -0,0 +1,111 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Kritoke <krit...@gamebox.net> +# Contributor: Luca Roccia <little_r...@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.57.0 +_boostver=${pkgver//./_} +pkgrel=4 +url='http://www.boost.org/' +arch=('i686' 'x86_64') +license=('custom') +makedepends=('icu>=55.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 + 0001-fixed-shared_ptr_helper-include.patch + 0001-Add-missing-include-to-signals2-trackable.hpp.patch) +sha1sums=('e151557ae47afd1b43dc3fac46f8b04a8fe51c12' + 'b58746c795a99150545ebfa5dba7997d771b3dcc' + '35bc8ad7493a641ec708a691036fe5319aec70cd') + +prepare() { + cd ${pkgbase}_${_boostver} + + # https://svn.boost.org/trac/boost/ticket/10749 + patch -Np2 -i ../0001-fixed-shared_ptr_helper-include.patch + + # https://github.com/boostorg/signals2/pull/8 + patch -Np2 -i ../0001-Add-missing-include-to-signals2-trackable.hpp.patch +} + +build() { + export _stagedir="${srcdir}/stagedir" + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd ${pkgbase}_${_boostver} + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 + + # Add an extra python version. This does not replace anything and python 2.x + # need to be the default. + echo "using python : 3.4 : /usr/bin/python3 : /usr/include/python3.4m : /usr/lib ;" \ + >> project-config.jam + + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam + + # boostbook is needed by quickbook + install -dm755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \ + --layout=system \ + --prefix="${_stagedir}" \ + ${JOBS} \ + install +} + +package_boost() { + pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings' + 'boost-build: to use boost jam for building your project.') + options=('staticlibs') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr + + install -d "${pkgdir}"/usr/lib + cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + + ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam +} + +package_boost-libs() { + pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + rm "${pkgdir}"/usr/lib/*.a + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} Copied: boost/repos/staging-x86_64/0001-Add-missing-include-to-signals2-trackable.hpp.patch (from rev 235401, boost/trunk/0001-Add-missing-include-to-signals2-trackable.hpp.patch) =================================================================== --- staging-x86_64/0001-Add-missing-include-to-signals2-trackable.hpp.patch (rev 0) +++ staging-x86_64/0001-Add-missing-include-to-signals2-trackable.hpp.patch 2015-04-03 19:45:26 UTC (rev 235402) @@ -0,0 +1,29 @@ +From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@foutrelis.com> +Date: Thu, 6 Nov 2014 09:19:26 +0200 +Subject: [PATCH] Add missing include to signals2/trackable.hpp + +boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots +associated with signals2::trackable immediately) but the matching header +wasn't included. + +https://svn.boost.org/trac/boost/ticket/10100#comment:7 +--- + include/boost/signals2/trackable.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/boost/signals2/trackable.hpp b/include/boost/signals2/trackable.hpp +index dba001d..64e8489 100644 +--- a/include/boost/signals2/trackable.hpp ++++ b/include/boost/signals2/trackable.hpp +@@ -18,6 +18,7 @@ + + #include <boost/assert.hpp> + #include <boost/shared_ptr.hpp> ++#include <boost/weak_ptr.hpp> + + namespace boost { + namespace signals2 { +-- +2.1.3 + Copied: boost/repos/staging-x86_64/0001-fixed-shared_ptr_helper-include.patch (from rev 235401, boost/trunk/0001-fixed-shared_ptr_helper-include.patch) =================================================================== --- staging-x86_64/0001-fixed-shared_ptr_helper-include.patch (rev 0) +++ staging-x86_64/0001-fixed-shared_ptr_helper-include.patch 2015-04-03 19:45:26 UTC (rev 235402) @@ -0,0 +1,24 @@ +From 02fff0a69e46b4d77844cf7b8c8d3bc2adbc96bb Mon Sep 17 00:00:00 2001 +From: Robert Ramey <ra...@rrsd.com> +Date: Tue, 11 Nov 2014 22:13:05 -0800 +Subject: [PATCH] fixed shared_ptr_helper include + +--- + include/boost/serialization/shared_ptr_helper.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/boost/serialization/shared_ptr_helper.hpp b/include/boost/serialization/shared_ptr_helper.hpp +index f4784ec..64269a9 100644 +--- a/include/boost/serialization/shared_ptr_helper.hpp ++++ b/include/boost/serialization/shared_ptr_helper.hpp +@@ -29,6 +29,7 @@ + #include <boost/serialization/singleton.hpp> + #include <boost/serialization/extended_type_info.hpp> + #include <boost/serialization/throw_exception.hpp> ++#include <boost/serialization/type_info_implementation.hpp> + #include <boost/archive/archive_exception.hpp> + #include <boost/archive/detail/decl.hpp> + +-- +2.2.1 + Copied: boost/repos/staging-x86_64/PKGBUILD (from rev 235401, boost/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-04-03 19:45:26 UTC (rev 235402) @@ -0,0 +1,111 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Kritoke <krit...@gamebox.net> +# Contributor: Luca Roccia <little_r...@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.57.0 +_boostver=${pkgver//./_} +pkgrel=4 +url='http://www.boost.org/' +arch=('i686' 'x86_64') +license=('custom') +makedepends=('icu>=55.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2 + 0001-fixed-shared_ptr_helper-include.patch + 0001-Add-missing-include-to-signals2-trackable.hpp.patch) +sha1sums=('e151557ae47afd1b43dc3fac46f8b04a8fe51c12' + 'b58746c795a99150545ebfa5dba7997d771b3dcc' + '35bc8ad7493a641ec708a691036fe5319aec70cd') + +prepare() { + cd ${pkgbase}_${_boostver} + + # https://svn.boost.org/trac/boost/ticket/10749 + patch -Np2 -i ../0001-fixed-shared_ptr_helper-include.patch + + # https://github.com/boostorg/signals2/pull/8 + patch -Np2 -i ../0001-Add-missing-include-to-signals2-trackable.hpp.patch +} + +build() { + export _stagedir="${srcdir}/stagedir" + local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" + + cd ${pkgbase}_${_boostver} + + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2 + + _bindir="bin.linuxx86" + [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64" + install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2 + + # Add an extra python version. This does not replace anything and python 2.x + # need to be the default. + echo "using python : 3.4 : /usr/bin/python3 : /usr/include/python3.4m : /usr/lib ;" \ + >> project-config.jam + + # Support for OpenMPI + echo "using mpi ;" >> project-config.jam + + # boostbook is needed by quickbook + install -dm755 "${_stagedir}"/share/boostbook + cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/ + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + "${_stagedir}"/bin/b2 \ + variant=release \ + debug-symbols=off \ + threading=multi \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + python=2.7 \ + cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \ + --layout=system \ + --prefix="${_stagedir}" \ + ${JOBS} \ + install +} + +package_boost() { + pkgdesc='Free peer-reviewed portable C++ source libraries - development headers' + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings' + 'boost-build: to use boost jam for building your project.') + options=('staticlibs') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr + + install -d "${pkgdir}"/usr/lib + cp -a "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt + + ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam +} + +package_boost-libs() { + pkgdesc='Free peer-reviewed portable C++ source libraries - runtime libraries' + depends=('bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -dm755 "${pkgdir}"/usr + cp -a "${_stagedir}"/lib "${pkgdir}"/usr + rm "${pkgdir}"/usr/lib/*.a + + install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +}