summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2012-05-02 01:40:05 (GMT)
committerBritney Fransen <brfransen@gmail.com>2012-05-02 01:40:05 (GMT)
commit196287e30eba5548cf4d6dd9aa1bae309eb68d59 (patch)
treeaefaf1a9f0edffcf65f92108e1a37b1f4ff228da /abs
parentd910c2a8c16736475693f0c109ccfe298385009e (diff)
parentd8d48ec69ab59d7d8f0e17fd978b058e845ba71a (diff)
downloadlinhes_pkgbuild-196287e30eba5548cf4d6dd9aa1bae309eb68d59.zip
linhes_pkgbuild-196287e30eba5548cf4d6dd9aa1bae309eb68d59.tar.gz
linhes_pkgbuild-196287e30eba5548cf4d6dd9aa1bae309eb68d59.tar.bz2
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs')
-rw-r--r--abs/extra/boost/PKGBUILD12
-rw-r--r--abs/extra/boost/exceptions.patch25
-rw-r--r--abs/extra/mkvtoolnix/PKGBUILD7
3 files changed, 40 insertions, 4 deletions
diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD
index 37bb2de..f9502a9 100644
--- a/abs/extra/boost/PKGBUILD
+++ b/abs/extra/boost/PKGBUILD
@@ -6,13 +6,14 @@
pkgbase=boost
pkgname=('boost-libs' 'boost')
-pkgver=1.47.0
+pkgver=1.49.0
_boostver=${pkgver//./_}
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.boost.org/"
makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+ exceptions.patch)
license=('custom')
_stagedir="${srcdir}/stagedir"
@@ -24,6 +25,10 @@ build() {
#echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /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"
+
# build bjam
cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
./build.sh cc
@@ -106,4 +111,5 @@ package_boost-libs() {
install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
"${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
}
-md5sums=('ff180a5276bec773a7625cac7e2288e8')
+md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
+ 'bedd276510b6ad1ff2b4d143de21373e')
diff --git a/abs/extra/boost/exceptions.patch b/abs/extra/boost/exceptions.patch
new file mode 100644
index 0000000..0322db6
--- /dev/null
+++ b/abs/extra/boost/exceptions.patch
@@ -0,0 +1,25 @@
+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
diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD
index f77ecd6..fb275a2 100644
--- a/abs/extra/mkvtoolnix/PKGBUILD
+++ b/abs/extra/mkvtoolnix/PKGBUILD
@@ -2,6 +2,11 @@
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: 03/08/04 <lefungus@altern.org>
+##
+## NOTE!!! Newer versions of mkvtoolnix requires gcc v4.6.0+ !!!
+##
+
+
pkgname=mkvtoolnix
pkgver=5.0.1
pkgrel=1
@@ -24,4 +29,4 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
./drake DESTDIR=${pkgdir} install
}
-md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
+md5sums=('2cd84ff24e1d9217dd3caf170f34e758')