From eb1b08fe37ff143fd212e844e1dee22c24c1df8b Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Tue, 1 May 2012 23:40:44 +0000
Subject: boost: upgrade to 1.49. Dep of mkvtoolnix.

---
 abs/extra/boost/PKGBUILD         | 12 +++++++++---
 abs/extra/boost/exceptions.patch | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 abs/extra/boost/exceptions.patch

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
-- 
cgit v0.12


From d8d48ec69ab59d7d8f0e17fd978b058e845ba71a Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Tue, 1 May 2012 23:54:07 +0000
Subject: mkvtoolnix: Add note to PKGBUILD re: gcc v4.6.0

---
 abs/extra/mkvtoolnix/PKGBUILD | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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')
-- 
cgit v0.12