diff --git a/common/shlibs b/common/shlibs index b0cce3cee97..64743fdec7c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -588,38 +588,39 @@ libnm-glib-vpn.so.1 libnm-0.9.1.90_1 libnm.so.0 libnm-1.0.0_1 libKF5ItemModels.so.5 kitemmodels-5.26.0_1 libpanel-applet-4.so.0 gnome-panel-3.3.92_1 -libboost_context.so.1.62.0 boost-1.62<1.63_1 -libboost_coroutine.so.1.62.0 boost-1.62<1.63_1 -libboost_container.so.1.62.0 boost-1.62<1.63_1 -libboost_prg_exec_monitor.so.1.62.0 boost-1.62<1.63_1 -libboost_signals.so.1.62.0 boost-1.62<1.63_1 -libboost_timer.so.1.62.0 boost-1.62<1.63_1 -libboost_random.so.1.62.0 boost-1.62<1.63_1 -libboost_filesystem.so.1.62.0 boost-1.62<1.63_1 -libboost_unit_test_framework.so.1.62.0 boost-1.62<1.63_1 -libboost_math_c99f.so.1.62.0 boost-1.62<1.63_1 -libboost_math_tr1f.so.1.62.0 boost-1.62<1.63_1 -libboost_regex.so.1.62.0 boost-1.62<1.63_1 -libboost_serialization.so.1.62.0 boost-1.62<1.63_1 -libboost_chrono.so.1.62.0 boost-1.62<1.63_1 -libboost_wserialization.so.1.62.0 boost-1.62<1.63_1 -libboost_graph.so.1.62.0 boost-1.62<1.63_1 -libboost_log.so.1.62.0 boost-1.62<1.63_1 -libboost_locale.so.1.62.0 boost-1.62<1.63_1 -libboost_math_tr1l.so.1.62.0 boost-1.62<1.63_1 -libboost_program_options.so.1.62.0 boost-1.62<1.63_1 -libboost_iostreams.so.1.62.0 boost-1.62<1.63_1 -libboost_system.so.1.62.0 boost-1.62<1.63_1 -libboost_thread.so.1.62.0 boost-1.62<1.63_1 -libboost_log_setup.so.1.62.0 boost-1.62<1.63_1 -libboost_date_time.so.1.62.0 boost-1.62<1.63_1 -libboost_math_c99.so.1.62.0 boost-1.62<1.63_1 -libboost_wave.so.1.62.0 boost-1.62<1.63_1 -libboost_math_tr1.so.1.62.0 boost-1.62<1.63_1 -libboost_atomic.so.1.62.0 boost-1.62<1.63_1 -libboost_math_c99l.so.1.62.0 boost-1.62<1.63_1 -libboost_type_erasure.so.1.62.0 boost-1.62<1.63_1 -libboost_python.so.1.62.0 boost-python-1.62<1.63_1 +libboost_context.so.1.64.0 boost-1.64<1.65_1 +libboost_coroutine.so.1.64.0 boost-1.64<1.65_1 +libboost_container.so.1.64.0 boost-1.64<1.65_1 +libboost_prg_exec_monitor.so.1.64.0 boost-1.64<1.65_1 +libboost_signals.so.1.64.0 boost-1.64<1.65_1 +libboost_timer.so.1.64.0 boost-1.64<1.65_1 +libboost_random.so.1.64.0 boost-1.64<1.65_1 +libboost_filesystem.so.1.64.0 boost-1.64<1.65_1 +libboost_unit_test_framework.so.1.64.0 boost-1.64<1.65_1 +libboost_math_c99f.so.1.64.0 boost-1.64<1.65_1 +libboost_math_tr1f.so.1.64.0 boost-1.64<1.65_1 +libboost_regex.so.1.64.0 boost-1.64<1.65_1 +libboost_serialization.so.1.64.0 boost-1.64<1.65_1 +libboost_chrono.so.1.64.0 boost-1.64<1.65_1 +libboost_wserialization.so.1.64.0 boost-1.64<1.65_1 +libboost_graph.so.1.64.0 boost-1.64<1.65_1 +libboost_log.so.1.64.0 boost-1.64<1.65_1 +libboost_locale.so.1.64.0 boost-1.64<1.65_1 +libboost_math_tr1l.so.1.64.0 boost-1.64<1.65_1 +libboost_program_options.so.1.64.0 boost-1.64<1.65_1 +libboost_iostreams.so.1.64.0 boost-1.64<1.65_1 +libboost_system.so.1.64.0 boost-1.64<1.65_1 +libboost_thread.so.1.64.0 boost-1.64<1.65_1 +libboost_log_setup.so.1.64.0 boost-1.64<1.65_1 +libboost_date_time.so.1.64.0 boost-1.64<1.65_1 +libboost_math_c99.so.1.64.0 boost-1.64<1.65_1 +libboost_wave.so.1.64.0 boost-1.64<1.65_1 +libboost_math_tr1.so.1.64.0 boost-1.64<1.65_1 +libboost_atomic.so.1.64.0 boost-1.64<1.65_1 +libboost_math_c99l.so.1.64.0 boost-1.64<1.65_1 +libboost_type_erasure.so.1.64.0 boost-1.64<1.65_1 +libboost_fiber.so.1.64.0 boost-1.64<1.65_1 +libboost_python.so.1.64.0 boost-python-1.64<1.65_1 libexempi.so.3 exempi-2.1.1_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2.so.2 libsgutils-1.42_1 diff --git a/srcpkgs/boost/patches/fix-ublas-storage.patch b/srcpkgs/boost/patches/fix-ublas-storage.patch new file mode 100644 index 00000000000..0138ceb214d --- /dev/null +++ b/srcpkgs/boost/patches/fix-ublas-storage.patch @@ -0,0 +1,10 @@ +--- boost/numeric/ublas/storage.hpp.orig 2017-04-17 02:22:23.000000000 +0000 ++++ boost/numeric/ublas/storage.hpp 2017-04-22 14:00:01.928830045 +0000 +@@ -19,6 +19,7 @@ + #endif + + #include ++#include + #include + #include + diff --git a/srcpkgs/boost/patches/libressl.patch b/srcpkgs/boost/patches/libressl.patch deleted file mode 100644 index 9b93e206102..00000000000 --- a/srcpkgs/boost/patches/libressl.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- boost/asio/ssl/impl/context.ipp.orig 2016-09-29 11:44:54.479184454 +0200 -+++ boost/asio/ssl/impl/context.ipp 2016-09-29 11:44:56.838184575 +0200 -@@ -228,7 +228,7 @@ - { - if (handle_) - { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); - #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) - void* cb_userdata = handle_->default_passwd_callback_userdata; -@@ -239,7 +239,7 @@ - static_cast( - cb_userdata); - delete callback; --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); - #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) - handle_->default_passwd_callback_userdata = 0; -@@ -578,7 +578,7 @@ - bio_cleanup bio = { make_buffer_bio(chain) }; - if (bio.p) - { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); - void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); - #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -@@ -682,7 +682,7 @@ - { - ::ERR_clear_error(); - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); - void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); - #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -@@ -749,7 +749,7 @@ - { - ::ERR_clear_error(); - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); - void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); - #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) -@@ -988,7 +988,7 @@ - boost::system::error_code context::do_set_password_callback( - detail::password_callback_base* callback, boost::system::error_code& ec) - { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); - ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); - #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index f0c547f1e7c..2468f52bd7c 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,7 +1,7 @@ # Template file for 'boost' pkgname=boost -version=1.62.0 -revision=4 +version=1.64.0 +revision=1 wrksrc="${pkgname}_${version//\./_}" hostmakedepends="bzip2-devel icu-devel python-devel" makedepends="zlib-devel bzip2-devel icu-devel python-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.boost.org/" license="Boost Software License 1.0" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2" -checksum=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0 +checksum=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 CXXFLAGS="-std=c++11"