Commit 602eb15c authored by abveritas's avatar abveritas

start of boost/icu update, repo-clean new source

parent fbb3f690
Index: /trunk/boost/foreach_fwd.hpp
===================================================================
--- /trunk/boost/foreach_fwd.hpp (revision 62661)
+++ /trunk/boost/foreach_fwd.hpp (revision 75540)
@@ -15,4 +15,6 @@
#define BOOST_FOREACH_FWD_HPP
+#include <utility> // for std::pair
+
// This must be at global scope, hence the uglified name
enum boost_foreach_argument_dependent_lookup_hack
@@ -26,4 +28,7 @@
namespace foreach
{
+ template<typename T>
+ std::pair<T, T> in_range(T begin, T end);
+
///////////////////////////////////////////////////////////////////////////////
// boost::foreach::tag
@@ -47,4 +52,22 @@
} // namespace foreach
+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
+namespace BOOST_FOREACH
+{
+ using foreach::in_range;
+ using foreach::tag;
+
+ template<typename T>
+ struct is_lightweight_proxy
+ : foreach::is_lightweight_proxy<T>
+ {};
+
+ template<typename T>
+ struct is_noncopyable
+ : foreach::is_noncopyable<T>
+ {};
+
+} // namespace BOOST_FOREACH
+
} // namespace boost
Index: /trunk/boost/foreach.hpp
===================================================================
--- /trunk/boost/foreach.hpp (revision 75077)
+++ /trunk/boost/foreach.hpp (revision 75540)
@@ -166,5 +166,5 @@
// at the global namespace for your type.
template<typename T>
-inline boost::foreach::is_lightweight_proxy<T> *
+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
@@ -191,5 +191,5 @@
// at the global namespace for your type.
template<typename T>
-inline boost::foreach::is_noncopyable<T> *
+inline boost::BOOST_FOREACH::is_noncopyable<T> *
boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas[at]chakra-project[dot]org>
# Contributor: Artyom Smirnov <smirnoffjr@gmail.com>
# Note: you have to rebuild those pkgs
......@@ -11,52 +11,35 @@
pkgbase=boost
pkgname=('boost-libs' 'boost')
pkgver=1.48.0
pkgver=1.52.0
_boostver=${pkgver//./_}
pkgrel=4
pkgrel=1
pkgdesc="Free peer-reviewed portable C++ source libraries"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://www.boost.org/"
license=('custom')
depends=('bzip2' 'zlib')
makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi') # Add Python (3) whenever it is added to our repos.
optdepends=('python: for python bindings')
options=('!ccache')
source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
exceptions.patch
BOOST_FOREACH.patch
libstdcpp3.hpp.patch)
makedepends=('icu' 'python2' 'python3' 'bzip2' 'zlib' 'openmpi')
source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz")
license=('custom')
md5sums=('313a11e97eb56eb7efd18325354631be'
'e12a237436bd9c18c4f7c1f55a7d0996'
'af2c30a290d2429b3e09788bcfa2210e'
'a493d2c5848198a3e8040646cfe358c8')
md5sums=('f62451fa646ca392b0fbc08beb23ad12')
_stagedir="${srcdir}/stagedir"
build() {
# set python path for bjam
cd "${srcdir}/${pkgbase}_${_boostver}/tools"
echo "using python : 2.7 : /usr/bin/python2 : /usr/include/python2.7 : /usr/lib ;" >> build/v2/user-config.jam
#echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
echo "using mpi ;" >> build/v2/user-config.jam
cd "${srcdir}"/${pkgbase}_${_boostver}
# https://svn.boost.org/trac/boost/ticket/5731
patch -p0 -i "${srcdir}/exceptions.patch"
# https://svn.boost.org/trac/boost/ticket/6131
patch -p2 -i "${srcdir}/BOOST_FOREACH.patch"
patch -p0 -i "${srcdir}/libstdcpp3.hpp.patch"
# build bjam
cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
./build.sh cc
_bindir="bin.linuxx86"
[ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
install -d "${_stagedir}"/usr/bin
install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
install bin.linuxx86_64/bjam "${_stagedir}"/usr/bin/bjam
# build tools
cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
......@@ -97,7 +80,7 @@ build() {
package_boost() {
pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
depends=("boost-libs=${pkgver}")
optdepends=('python: for python bindings'
optdepends=('python3: for python3 bindings'
'python2: for python2 bindings')
install -d "${pkgdir}"/usr/{include,lib,share}
......
diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200
+++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200
@@ -20,6 +20,7 @@
#include "boost/mpl/if.hpp"
#include "boost/mpl/integral_c.hpp"
+#include "boost/throw_exception.hpp"
namespace boost { namespace numeric
{
@@ -159,9 +160,9 @@ struct def_overflow_handler
void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
{
if ( r == cNegOverflow )
- throw negative_overflow() ;
+ boost::throw_exception( negative_overflow() ) ;
else if ( r == cPosOverflow )
- throw positive_overflow() ;
+ boost::throw_exception( positive_overflow() ) ;
}
} ;
Diff finished. Fri Jul 22 11:46:49 2011
Index: boost/config/stdlib/libstdcpp3.hpp
===================================================================
--- boost/config/stdlib/libstdcpp3.hpp (revision 75635)
+++ boost/config/stdlib/libstdcpp3.hpp (working copy)
@@ -33,7 +33,8 @@
#ifdef __GLIBCXX__ // gcc 3.4 and greater:
# if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
- || defined(_GLIBCXX__PTHREADS)
+ || defined(_GLIBCXX__PTHREADS) \
+ || defined(_GLIBCXX_HAS_GTHREADS)
//
// If the std lib has thread support turned on, then turn it on in Boost
// as well. We do this because some gcc-3.4 std lib headers define _REENTANT
# Platform Packages for Chakra, part of chakra-project.org
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas[at]chakra-project[dot]org>
pkgname=icu
pkgver=4.6
pkgrel=4
pkgver=50.1.2
pkgrel=1
pkgdesc="International Components for Unicode library"
arch=('x86_64')
url="http://www.icu-project.org/"
......@@ -14,8 +14,8 @@ source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4
#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
icu.8198.revert.icu5431.patch
)
md5sums=('43e56b71c407be5154de681eaa646a4a'
'685f0c5ff76bc50f930ffb67bbd27eb3')
md5sums=('beb98aa972219c9fcd9c8a71314943c9'
'ebd5470fc969c75e52baf4af94a9ee82')
build() {
cd ${srcdir}/icu/source
......@@ -25,8 +25,13 @@ build() {
make
}
check() {
cd "$srcdir/icu/source"
make -k check # passes all
}
package() {
cd ${srcdir}/icu/source
cd ${srcdir}/icu/source
make -j1 DESTDIR=${pkgdir} install
# Install license
......
This diff is collapsed.
# Core Packages for Chakra, part of chakra-project.org
#
# KDEmod, modular KDE packages for Arch Linux, part of chakra-project.org
#
# maintainer (i686): Jan Mette (funkyou) <funkyou @ kdemod.ath.cx>
# maintainer (x86_64): Martin Sandsmark (PhinnFort) <sandsmark @ kdemod.ath.cx>
# Contributor: Artyom Smirnov <smirnoffjr@gmail.com>
# maintainer abveritas[at]chakra-project[dot]org>
# contributor: Jan Mette (funkyou) <funkyou @ kdemod.ath.cx>
# contributor: Martin Sandsmark (PhinnFort) <sandsmark @ kdemod.ath.cx>
pkgname=repo-clean
pkgver=0.1.4
pkgrel=10
pkgrel=11
pkgdesc="Clean utility for Pacman repository"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://code.google.com/p/repo-clean/"
license=('GPL')
depends=('boost-libs' 'pacman>=4.0')
makedepends=('boost' 'cmake' 'gcc')
source=(http://chakra-linux.org/sources/$pkgname/$pkgname-$pkgver.tar.gz
repo_clean_xz.patch
boost-1.46.1.patch
repo_clean_pacman4.patch)
md5sums=('6c300644fc2adc3ceb3630e1cfe299d0'
'b1ca28279da1bbe35b887b2ef2ad2305'
'7f599b351851dea0eeb1a3b68ae8dd5f'
'e90dae15487fc40942053c2ff116e782')
makedepends=('boost' 'cmake' 'gcc' 'scons')
source=("https://github.com/downloads/luolimao/repo-clean-xz/$pkgname-xz-$pkgver.tar.bz2")
md5sums=('b9d7ddfe83ef1c6e19786d6d428ade6e')
build() {
cd $srcdir/$pkgname
# Patches.
patch -Np1 -i $srcdir/repo_clean_xz.patch
patch -uN ./src/repo-clean.cpp $srcdir/boost-1.46.1.patch
patch -p1 -i $srcdir/repo_clean_pacman4.patch
cd $srcdir/$pkgname-xz-$pkgver
mkdir build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
..
make
scons
install -d "$pkgdir"/usr/
}
package() {
cd $srcdir/$pkgname/build
make DESTDIR=$pkgdir install
cp -rf "$srcdir"/$pkgname-xz-$pkgver/dist/* $pkgdir/usr/
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment