commit 1abdc7c1f9fae9ac59f13961cde3fcee1be7ce44 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Apr 23 21:04:59 2015 +1000 mkvtoolnix: patch for boost 1.58 fix for last commit diff --git a/mkvtoolnix/.md5sum b/mkvtoolnix/.md5sum index 877b3f9..14bb84f 100644 --- a/mkvtoolnix/.md5sum +++ b/mkvtoolnix/.md5sum @@ -1,2 +1,2 @@ -ba7ad1b6a0573e70351f879576df56ea boost-1.58.patch +db72bf028eeedd3029129e9c3a15a028 boost-1.58.patch 91fd8f34c25b8d3980c3e39b3cb6ae6c mkvtoolnix-7.8.0.tar.xz diff --git a/mkvtoolnix/boost-1.58.patch b/mkvtoolnix/boost-1.58.patch index b596ceb..b42c04a 100644 --- a/mkvtoolnix/boost-1.58.patch +++ b/mkvtoolnix/boost-1.58.patch @@ -1,26 +1,20 @@ -diff --git a/testing/mkvtoolnix/boost-1.58.patch b/testing/mkvtoolnix/boost-1.58.patch -new file mode 100644 -index 0000000..b42c04a ---- /dev/null -+++ b/testing/mkvtoolnix/boost-1.58.patch -@@ -0,0 +1,20 @@ -+--- ./lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp.orig -++++ ./lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp -+@@ -171,14 +171,13 @@ -+ // How many char objects can I process to get <= max_limit -+ // wchar_t objects? -+ int utf8_codecvt_facet::do_length( -+- BOOST_CODECVT_DO_LENGTH_CONST std::mbstate_t &, -++ const std::mbstate_t &, -+ const char * from, -+ const char * from_end, -+ std::size_t max_limit -++) const -+ #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) -+-) const throw() -+-#else -+-) const -++ throw() -+ #endif -+ { -+ // RG - this code is confusing! I need a better way to express it. +--- ./lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp.orig ++++ ./lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp +@@ -171,14 +171,13 @@ + // How many char objects can I process to get <= max_limit + // wchar_t objects? + int utf8_codecvt_facet::do_length( +- BOOST_CODECVT_DO_LENGTH_CONST std::mbstate_t &, ++ const std::mbstate_t &, + const char * from, + const char * from_end, + std::size_t max_limit ++) const + #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) +-) const throw() +-#else +-) const ++ throw() + #endif + { + // RG - this code is confusing! I need a better way to express it.