Revision bump, fix build with newer boost, wrt bug #425600

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

4 files changed, 624 insertions, 22 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index 6bf07ee57b97..774413690741 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/bombono-dvd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.33 2012/09/11 10:55:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.34 2012/12/09 19:13:23 pinkbyte Exp $
+
+*bombono-dvd-1.2.1-r1 (09 Dec 2012)
+
+  09 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> +bombono-dvd-1.2.1-r1.ebuild,
+  +files/bombono-dvd-boost-1.51.0-fix.patch:
+  Revision bump, fix build with newer boost, wrt bug #425600
 
   11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop maintainership
diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
index e59b94e1e6e0..d6104c7eac0a 100644
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX bombono-dvd-1.0.1-cflags.patch 404 SHA256 444670fc33219364ff6fa360f35d34ac4db9e5df89fca62b616f369fdf1b7a85 SHA512 a70787c4495279e847c2d277e5b90bf53478cd85b7a31c5065038262c2fb853366dbf13aa38b6b756f01e87bd5466962186ddde202f2df1abd251b17eec3ae1e WHIRLPOOL c938f43624ac09c87f40662e18830f8108cdddabeea8c598361d92fbc520a4d5480e039ef8b9e5343c2887a7af16fb6d89150e4706e452b4bd0a4d280f04d4d1
 AUX bombono-dvd-1.2.0-cdrtools.patch 864 SHA256 48bc239848cfff2adff21a11f11d7690bc11a1fb6a4b1bdbef6fa2c2948c135b SHA512 30bbc8860860c5d0d9d25edab1b70917ba615851cea54eff405598d8ebad9aade1ecc9701883b70fac738b8d4ce7465e39c08768efc203bc192234fadc624e28 WHIRLPOOL 89b276ac1d2b0998d7ab2da9836d1253bbe04f4be7ea1c579a2b3c99ca9f7d37fd5a129293729ddc5c75c2fa7f49c19758e2e570d00ddb0a8974bf5e3b729747
 AUX bombono-dvd-1.2.1-glib.patch 375 SHA256 bff2c5f84dc4aae2fc4bcbda393d752de794a8a956848c560e4d2f471113e359 SHA512 ac6a71cd699979e665c209885c8586f260cd2ae973188a7a541235c264996a93f0636a74ed230d6dffd0de60dfbb87757738521552bc6aa5d7ffe859685179f9 WHIRLPOOL c9799826d6483200af120279f536dde8a1ede1677029166e8d3e3ad500fc6f74935873ef626a2c19b4a6bbc35f02a615355bb93aa9fbbbd374ede41a3006abde
+AUX bombono-dvd-boost-1.51.0-fix.patch 23903 SHA256 f96827cbf9ef0aa50c522dee4db863bdfe44994a5d3811f5a52a195ddafa2622 SHA512 dd3b2054fe2c40bf33f3835d4b1a9eec9722e10bbcac4951a77365b83fccf1ada051a10aee1692ccce9076dcf7bac247d0f6d159ec3e24c5fe2875233ac8c2d7 WHIRLPOOL efb0c80880fa3d5b755a6b6744e7b0454855c32a48a09ee032d64009a809f3323e28b9959a448d1e6bf8937365a647b2867a9e85191e4e67c598eedb1de1ec18
 DIST bombono-dvd-1.2.1.tar.bz2 4111237 SHA256 89817ce134b5ee2879285dfb30e9f8b0603b2282989ecb91793e7b928d64152f SHA512 09dcb91b16074f21606af052e3e22a842050d06a93ba41dbe9474ccacb1dad4e5903dffb1f7818fcf864df9b234fb50087d39f19dbdc2eb14268847059c30765 WHIRLPOOL 36376b1375a7cb8f8cb96c8f5adf3589b4ada0ed3f8707394da6ffdbc98b3853eb620a43636322b3e64ecbeab1c11fceebc076df83df93ee59b41f117ba2f0fc
+EBUILD bombono-dvd-1.2.1-r1.ebuild 1657 SHA256 f3672b9f5b022a8636fa9f4029ac8b7fdab7e5c8c4d918c690c6fe81da3ec01f SHA512 a5b0e3cb88a8d20a0fdb296621bf4462d39f073606dea861bcabcc8d9d1b4538c062ec02c4a1ac480fcbd35aeb7739658cb1606416e3a38284b9cb11e196a529 WHIRLPOOL c4c788d8eaf1fd0f9925624b06bab3ef2e09054d0ec71880186ce1e8753f2c385076a3c1e1b031d237d974572f33ba1543026c2a94e6049e1c2f4abf002b81b9
 EBUILD bombono-dvd-1.2.1.ebuild 1606 SHA256 0271cc2f122bea4a80f5963c3323b9629cb9837b47cb26511878d7f381d96ed0 SHA512 14d1c4e6d88fe0a17dc75e7add227440428f7e1f115d9f7a423eca20ef1734f31c9f09bea7492724406bee2c2d0884b78a7a3aa59ab866fdc06c04d9fa6a8b5f WHIRLPOOL beb2a9671f12512647394bd3a31701b8d643c1c58ffe59f915c2f9b433e1d9152856e00cbc3bfeb1c814672d01c317e0e8a36ed0ef6cd8bfec33d0fbddf444e6
-MISC ChangeLog 6141 SHA256 5ad3089b9b128bb8c1056dee45515eaf9be66e8e171b9089fd415cf696a3898d SHA512 07be0e19cf00c76f0f3950c104534e3cd8631724162285856ac1e598432d54b66c372fccf8b4ea964e9e882fea340f7f9bd8a1e8e1c2019669e423691d79c735 WHIRLPOOL 1d34d05ffc4a0f0df8afe4bbe16f635651ee70e746e1602d9317eebb9b7bc946cd6725a42e7ff655505699f02f28b72601dbfe5829e35a0061628950645afb8f
+MISC ChangeLog 6364 SHA256 b7228b42a21dd354ae05a71cd67cb2c5c238bb699f0ccdaee983c1e0b6e70e05 SHA512 8ca72cc19c92ae7a0fd875d84ed2d3f1c425685e1dbac086833a5d0fd9bb9693fa372fd15ff86971eb9811a51b1e5d2320eadc606e1cb3aa681acbd11bcd68a2 WHIRLPOOL 0ae68dd8c7332aba0bafa0e3496951707f34862985431b176b6819ab5007ff5afd0efbd3ed5fe3c739870383c182789269652031e7074ecba9e1cf04b6f52252
 MISC metadata.xml 290 SHA256 3bb63ae5b1fbcfa2f62fb73656f85027b0703d398b3fe2e0a19c1b0c58e4452f SHA512 b9281587b7b73585274a406a01b3e2b185e5293ef50eb7968683c64ad85abd8357a420d1bad3f250975ee59e5dd3fa68c7978f9b4c63987a4c40c92506a90816 WHIRLPOOL 0e8df82744267b36619e322c546c35f3b1b234b20d3c14444198e411880aee2b929d45b02c0b1063408717cce1454a48738c8c2ec1c89b118f05f610e1357e56
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQTxkVAAoJEEb+UGWnxTyHiGcP/iu+Exq8K5/lEdJdShnNjKoK
-AJZcu396E9zy/m277WZjoUhRXBBqBtxEXKR3xaU+003NtU+EUDcSBlzOXZrFYIWa
-/LWPLeZFGYbCRcp2TLb5OlroDSIoTByPBIpKCi0W7fiX1DPydqzESwD+ZW0I5VBd
-Ue2qrZeunVdavR+wAAKZsDsSmq9eK3XJmQttfzxeUngrND0iIHA1u15oo1UIPaDd
-KI6lyrNpnrf3QoX2u5hd6I6UD4jFVVZcfeMXZoAcpscHL2eC2fHoaYBqnjbl9bnz
-bJp+qMmj+mM3u/wIQYJ5JsFU2Lr63qVcWMArEIqASx0sU6b4cMhaHswsiBoS5UXM
-iwE2Z5bp88BO8/++DAtAGSwn2Qo04bxE96ahB2kToVS5XmDZaIFS+VV7Cl0IZPEF
-JGDKaDxQ97YJLBf3vAKAQ2nqM1mlAkk+G8CBapFt6NOz7C7XiKSKJpoGT8jh6seu
-BuKUVuXlPDpflB+AkuBEopkZ9ZRRiZ2jxQ4S4lEM97uVcSsv/7L1QsOYLy9EVDEQ
-b/Zd0H+HQlh1CWINKV5AjWlvojMe9Wx12HmB0TLDHQ7uqPnSrnOVn6//LLLF48GP
-WOsq8yUCerK82/X07nO5CCc5zcNZjDBhpL6XWGoRZwGRslNXIPLkvJUgP37sSKk2
-YQZqifc+GPiJX6Few/s/
-=/jBO
------END PGP SIGNATURE-----
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..3b66359fe2ea
--- /dev/null
+++ b/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.1-r1.ebuild,v 1.1 2012/12/09 19:13:23 pinkbyte Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="0.96.1"
+
+inherit base scons-utils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="GUI DVD authoring program"
+HOMEPAGE="http://www.bombono.org/"
+SRC_URI="mirror://sourceforge/bombono/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gnome"
+
+COMMONDEPEND="
+	app-i18n/enca
+	app-cdr/dvd+rw-tools
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libxmlpp:2.6
+	>=dev-libs/boost-1.51
+	media-libs/libdvdread
+	media-sound/twolame
+	media-video/dvdauthor
+	virtual/cdrtools
+	virtual/ffmpeg
+	>=media-video/mjpegtools-1.8.0
+	x11-libs/gtk+:2
+"
+RDEPEND="${COMMONDEPEND}
+	gnome?	( gnome-base/gvfs )
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+"
+
+RESTRICT=test
+# bug 419655
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-cflags.patch"
+	"${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
+	"${FILESDIR}/${PN}-1.2.1-glib.patch"
+	"${FILESDIR}/${PN}-boost-1.51.0-fix.patch"
+)
+
+src_configure() {
+	append-cppflags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3
+	myesconsargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		DESTDIR="${D}"
+		LDFLAGS="${LDFLAGS}"
+		USE_EXT_BOOST=1
+		PREFIX="${EPREFIX}/usr"
+	)
+}
+
+src_compile() {
+	nonfatal escons \
+		|| die "Please add ${S}/config.opts when filing bugs reports!"
+}
+
+src_test() {
+	VIRTUALX_COMMAND="escons TEST=1" virtualmake
+}
+
+src_install() {
+	nonfatal escons install || die "Please add ${S}/config.opts when filing bugs reports!"
+}
diff --git a/media-video/bombono-dvd/files/bombono-dvd-boost-1.51.0-fix.patch b/media-video/bombono-dvd/files/bombono-dvd-boost-1.51.0-fix.patch
new file mode 100644
index 000000000000..8d5020df3455
--- /dev/null
+++ b/media-video/bombono-dvd/files/bombono-dvd-boost-1.51.0-fix.patch
@@ -0,0 +1,537 @@
+From a144c07915e82607bbc76791251e8e576e17149e Mon Sep 17 00:00:00 2001
+From: Slava Dubrovskiy <dubrsl@altlinux.ru>
+Date: Thu, 6 Sep 2012 20:18:45 +0300
+Subject: [PATCH 2/2] Fix build with boost 1.51.0
+
+---
+ libs/boost-lib/boost/filesystem/v2/fstream.hpp     | 26 +++++++++++-----------
+ libs/boost-lib/boost/filesystem/v2/operations.hpp  |  2 +-
+ libs/boost-lib/boost/filesystem/v2/path.hpp        | 24 ++++++++++----------
+ libs/boost-lib/boost/filesystem/v3/path.hpp        |  6 ++---
+ libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp  |  4 ++--
+ .../boost/logging/writer/on_dedicated_thread.hpp   |  2 +-
+ .../samples/scenarios/ded_loger_one_filter.cpp     |  2 +-
+ .../samples/scenarios/ts_loger_one_filter.cpp      |  2 +-
+ .../logging/samples/scenarios/your_scenario.cpp    |  2 +-
+ .../tests/test_simple_tss/test_simple_tss.cpp      |  2 +-
+ .../test_ts_resource.cpp                           |  4 ++--
+ .../logging/tests/test_tss/test_tss_objects.cpp    |  2 +-
+ src/mbase/project/table.cpp                        |  2 +-
+ src/mgui/author/script.cpp                         |  2 +-
+ src/mgui/editor/toolbar.cpp                        |  2 +-
+ src/mgui/mux.cpp                                   |  2 +-
+ src/mgui/project/add.cpp                           |  6 ++---
+ src/mgui/project/mconstructor.cpp                  |  2 +-
+ src/mgui/project/serialize.cpp                     |  2 +-
+ src/mgui/win_utils.cpp                             |  2 +-
+ src/mlib/filesystem.cpp                            | 15 ++-----------
+ 21 files changed, 51 insertions(+), 62 deletions(-)
+
+diff --git a/libs/boost-lib/boost/filesystem/v2/fstream.hpp b/libs/boost-lib/boost/filesystem/v2/fstream.hpp
+index bdcd485..101ed30 100644
+--- a/libs/boost-lib/boost/filesystem/v2/fstream.hpp
++++ b/libs/boost-lib/boost/filesystem/v2/fstream.hpp
+@@ -488,27 +488,27 @@ namespace boost
+       std::ios_base::openmode mode )
+     {
+       return std::basic_filebuf<charT,traits>::open(
+-        file_ph.file_string().c_str(), mode ) == 0 ? 0 : this;
++        file_ph.string().c_str(), mode ) == 0 ? 0 : this;
+     }
+ #  endif
+ 
+     template <class charT, class traits>
+     basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph )
+       : std::basic_ifstream<charT,traits>(
+-          file_ph.file_string().c_str(), std::ios_base::in ) {}
++          file_ph.string().c_str(), std::ios_base::in ) {}
+ 
+     template <class charT, class traits>
+     basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph,
+       std::ios_base::openmode mode )
+       : std::basic_ifstream<charT,traits>(
+-          file_ph.file_string().c_str(), mode ) {}
++          file_ph.string().c_str(), mode ) {}
+     
+ #   if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
+     template <class charT, class traits>
+     void basic_ifstream<charT,traits>::open( const path & file_ph )
+     {
+       std::basic_ifstream<charT,traits>::open(
+-        file_ph.file_string().c_str(), std::ios_base::in );
++        file_ph.string().c_str(), std::ios_base::in );
+     }
+     
+     template <class charT, class traits>
+@@ -516,27 +516,27 @@ namespace boost
+       std::ios_base::openmode mode )
+     {
+       std::basic_ifstream<charT,traits>::open(
+-        file_ph.file_string().c_str(), mode );
++        file_ph.string().c_str(), mode );
+     }
+ #   endif
+ 
+     template <class charT, class traits>
+     basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph )
+       : std::basic_ofstream<charT,traits>(
+-          file_ph.file_string().c_str(), std::ios_base::out ) {}
++          file_ph.string().c_str(), std::ios_base::out ) {}
+ 
+     template <class charT, class traits>
+     basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph,
+       std::ios_base::openmode mode )
+       : std::basic_ofstream<charT,traits>(
+-          file_ph.file_string().c_str(), mode ) {}
++          file_ph.string().c_str(), mode ) {}
+     
+ #   if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
+     template <class charT, class traits>
+     void basic_ofstream<charT,traits>::open( const path & file_ph )
+     {
+       std::basic_ofstream<charT,traits>::open(
+-        file_ph.file_string().c_str(), std::ios_base::out );
++        file_ph.string().c_str(), std::ios_base::out );
+     }
+     
+     template <class charT, class traits>
+@@ -544,14 +544,14 @@ namespace boost
+       std::ios_base::openmode mode )
+     {
+       std::basic_ofstream<charT,traits>::open(
+-        file_ph.file_string().c_str(), mode );
++        file_ph.string().c_str(), mode );
+     }
+ #   endif
+ 
+     template <class charT, class traits>
+     basic_fstream<charT,traits>::basic_fstream( const path & file_ph )
+       : std::basic_fstream<charT,traits>(
+-          file_ph.file_string().c_str(),
++          file_ph.string().c_str(),
+           std::ios_base::in|std::ios_base::out ) {}
+ 
+ 
+@@ -559,14 +559,14 @@ namespace boost
+     basic_fstream<charT,traits>::basic_fstream( const path & file_ph,
+       std::ios_base::openmode mode )
+       : std::basic_fstream<charT,traits>(
+-          file_ph.file_string().c_str(), mode ) {}
++          file_ph.string().c_str(), mode ) {}
+ 
+ #   if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
+     template <class charT, class traits>
+     void basic_fstream<charT,traits>::open( const path & file_ph )
+     {
+       std::basic_fstream<charT,traits>::open(
+-        file_ph.file_string().c_str(), std::ios_base::in|std::ios_base::out );
++        file_ph.string().c_str(), std::ios_base::in|std::ios_base::out );
+     }
+ 
+     template <class charT, class traits>
+@@ -574,7 +574,7 @@ namespace boost
+       std::ios_base::openmode mode )
+     {
+       std::basic_fstream<charT,traits>::open(
+-        file_ph.file_string().c_str(), mode );
++        file_ph.string().c_str(), mode );
+     }
+ #   endif
+   } // namespace filesystem2
+diff --git a/libs/boost-lib/boost/filesystem/v2/operations.hpp b/libs/boost-lib/boost/filesystem/v2/operations.hpp
+index 9bd35cd..ad08cc3 100644
+--- a/libs/boost-lib/boost/filesystem/v2/operations.hpp
++++ b/libs/boost-lib/boost/filesystem/v2/operations.hpp
+@@ -1081,7 +1081,7 @@ namespace boost
+       {
+         return path().filename();
+       }
+-      typename Path::string_type leaf() const
++      typename Path::string_type filename().string() const
+       {
+         return path().filename();
+       }
+diff --git a/libs/boost-lib/boost/filesystem/v2/path.hpp b/libs/boost-lib/boost/filesystem/v2/path.hpp
+index d159c37..580b635 100644
+--- a/libs/boost-lib/boost/filesystem/v2/path.hpp
++++ b/libs/boost-lib/boost/filesystem/v2/path.hpp
+@@ -232,11 +232,11 @@ namespace boost
+ 
+       // observers
+       const string_type & string() const         { return m_path; }
+-      const string_type file_string() const;
+-      const string_type directory_string() const { return file_string(); }
++      const string_type string() const;
++      const string_type string() const { return string(); }
+ 
+-      const external_string_type external_file_string() const { return Traits::to_external( *this, file_string() ); }
+-      const external_string_type external_directory_string() const { return Traits::to_external( *this, directory_string() ); }
++      const external_string_type external_file_string() const { return Traits::to_external( *this, string() ); }
++      const external_string_type external_directory_string() const { return Traits::to_external( *this, string() ); }
+ 
+       basic_path   root_path() const;
+       string_type  root_name() const;
+@@ -248,7 +248,7 @@ namespace boost
+       string_type  extension() const;
+ 
+ # ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+-      string_type  leaf() const            { return filename(); }
++      string_type  filename().string() const            { return filename(); }
+       basic_path   branch_path() const     { return parent_path(); }
+       bool         has_leaf() const        { return !m_path.empty(); }
+       bool         has_branch_path() const { return !parent_path().empty(); }
+@@ -309,8 +309,8 @@ namespace boost
+       // are only minor differences between generic and native path grammars.
+       // Private members might be quite different in other implementations,
+       // particularly where there were wide differences between portable and
+-      // native path formats, or between file_string() and
+-      // directory_string() formats, or simply that the implementation
++      // native path formats, or between string() and
++      // string() formats, or simply that the implementation
+       // was willing expend additional memory to achieve greater speed for
+       // some operations at the expense of other operations.
+ 
+@@ -338,8 +338,8 @@ namespace boost
+       basic_path( const string_type & str, name_check ) { operator/=( str ); }
+       basic_path( const typename string_type::value_type * s, name_check )
+         { operator/=( s );}
+-      string_type native_file_string() const { return file_string(); }
+-      string_type native_directory_string() const { return directory_string(); }
++      string_type native_file_string() const { return string(); }
++      string_type native_directory_string() const { return string(); }
+       static bool default_name_check_writable() { return false; } 
+       static void default_name_check( name_check ) {}
+       static name_check default_name_check() { return 0; }
+@@ -647,13 +647,13 @@ namespace boost
+             if ( !path1_arg.empty() )
+             {
+               target += ": \"";
+-              target += path1_arg.file_string();
++              target += path1_arg.string();
+               target += "\"";
+             }
+             if ( !path2_arg.empty() )
+             {
+               target += ", \"";
+-              target += path2_arg.file_string();
++              target += path2_arg.string();
+               target += "\"";
+             }
+           }
+@@ -1294,7 +1294,7 @@ namespace boost
+ 
+     template<class String, class Traits>
+     const String
+-    basic_path<String, Traits>::file_string() const
++    basic_path<String, Traits>::string() const
+     {
+ #   ifdef BOOST_WINDOWS_PATH
+       // for Windows, use the alternate separator, and bypass extra 
+diff --git a/libs/boost-lib/boost/filesystem/v3/path.hpp b/libs/boost-lib/boost/filesystem/v3/path.hpp
+index 0caa19f..fe3c975 100644
+--- a/libs/boost-lib/boost/filesystem/v3/path.hpp
++++ b/libs/boost-lib/boost/filesystem/v3/path.hpp
+@@ -389,7 +389,7 @@ namespace filesystem3
+     //  recently deprecated functions supplied by default
+     path&  normalize()              { return m_normalize(); }
+     path&  remove_leaf()            { return remove_filename(); }
+-    path   leaf() const             { return filename(); }
++    path   filename().string() const             { return filename(); }
+     path   branch_path() const      { return parent_path(); }
+     bool   has_leaf() const         { return !m_pathname.empty(); }
+     bool   has_branch_path() const  { return !parent_path().empty(); }
+@@ -399,8 +399,8 @@ namespace filesystem3
+ # if defined(BOOST_FILESYSTEM_DEPRECATED)
+     //  deprecated functions with enough signature or semantic changes that they are
+     //  not supplied by default 
+-    const std::string file_string() const               { return string(); }
+-    const std::string directory_string() const          { return string(); }
++    const std::string string() const               { return string(); }
++    const std::string string() const          { return string(); }
+     const std::string native_file_string() const        { return string(); }
+     const std::string native_directory_string() const   { return string(); }
+     const string_type external_file_string() const      { return native(); }
+diff --git a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
+index 7adeaff..4fc0343 100644
+--- a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
++++ b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
+@@ -107,13 +107,13 @@ namespace boost
+     //        if ( !path1.empty() )
+     //        {
+     //          target += ": \"";
+-    //          target += path1.file_string();
++    //          target += path1.string();
+     //          target += "\"";
+     //        }
+     //        if ( !path2.empty() )
+     //        {
+     //          target += ", \"";
+-    //          target += path2.file_string();
++    //          target += path2.string();
+     //          target += "\"";
+     //        }
+     //      }
+diff --git a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
+index 7b0aa71..a4a6f28 100644
+--- a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
++++ b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
+@@ -166,7 +166,7 @@ private:
+             }
+ 
+             boost::xtime to_wait;
+-            xtime_get(&to_wait, boost::TIME_UTC);
++            xtime_get(&to_wait, boost::TIME_UTC_);
+             to_wait.sec += sleep_ms / 1000;
+             to_wait.nsec += (sleep_ms % 1000) * (NANOSECONDS_PER_SECOND / 1000);
+             to_wait.sec += to_wait.nsec / NANOSECONDS_PER_SECOND ;
+diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
+index 1d934da..d45beb4 100644
+--- a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
++++ b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
+@@ -103,7 +103,7 @@ BOOST_DEFINE_LOG(g_l, log_type)
+ void do_sleep(int ms) {
+     using namespace boost;
+     xtime next;
+-    xtime_get( &next, TIME_UTC);
++    xtime_get( &next, TIME_UTC_);
+     next.nsec += (ms % 1000) * 1000000;
+ 
+     int nano_per_sec = 1000000000;
+diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
+index 9746319..4b9f845 100644
+--- a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
++++ b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
+@@ -95,7 +95,7 @@ BOOST_DEFINE_LOG(g_l, log_type)
+ void do_sleep(int ms) {
+     using namespace boost;
+     xtime next;
+-    xtime_get( &next, TIME_UTC);
++    xtime_get( &next, TIME_UTC_);
+     next.nsec += (ms % 1000) * 1000000;
+ 
+     int nano_per_sec = 1000000000;
+diff --git a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
+index d447f24..f5ad955 100644
+--- a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
++++ b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
+@@ -124,7 +124,7 @@ BOOST_DEFINE_LOG(g_log_dbg, finder::logger )
+ void do_sleep(int ms) {
+     using namespace boost;
+     xtime next;
+-    xtime_get( &next, TIME_UTC);
++    xtime_get( &next, TIME_UTC_);
+     next.nsec += (ms % 1000) * 1000000;
+ 
+     int nano_per_sec = 1000000000;
+diff --git a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
+index 627618e..205d07a 100644
+--- a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
++++ b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
+@@ -75,7 +75,7 @@ using namespace logging;
+ 
+ void do_sleep(int ms) {
+     xtime next;
+-    xtime_get( &next, TIME_UTC);
++    xtime_get( &next, TIME_UTC_);
+     next.nsec += (ms % 1000) * 1000000;
+ 
+     int nano_per_sec = 1000000000;
+diff --git a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
+index 0bee896..2217c12 100644
+--- a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
++++ b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
+@@ -167,7 +167,7 @@ void test_resource(int idx) {
+ 
+ void do_sleep(int ms) {
+     xtime next;
+-    xtime_get( &next, TIME_UTC);
++    xtime_get( &next, TIME_UTC_);
+     next.nsec += (ms % 1000) * 1000000;
+ 
+     int nano_per_sec = 1000000000;
+@@ -262,7 +262,7 @@ int g_run_period_secs = 200;
+ 
+ int main()
+ {
+-    xtime_get( &g_start, TIME_UTC);
++    xtime_get( &g_start, TIME_UTC_);
+ 
+     for ( int i = 0; i < g_update_thread_count; ++i)
+         thread t(&update_thread);
+diff --git a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
+index b8e1ba6..14c8281 100644
+--- a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
++++ b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
+@@ -98,7 +98,7 @@ private:
+ 
+ void do_sleep(int ms) {
+     xtime next;
+-    xtime_get( &next, TIME_UTC);
++    xtime_get( &next, TIME_UTC_);
+     next.nsec += (ms % 1000) * 1000000;
+ 
+     int nano_per_sec = 1000000000;
+diff --git a/src/mbase/project/table.cpp b/src/mbase/project/table.cpp
+index 33ee15a..feb851a 100644
+--- a/src/mbase/project/table.cpp
++++ b/src/mbase/project/table.cpp
+@@ -427,7 +427,7 @@ void GetThemeList(Str::List& t_lst)
+         {
+             for( fs::directory_iterator itr(dir), end; itr != end; ++itr )
+                 if( IsFrameDir(*itr) )
+-                    t_lst.push_back(itr->leaf());
++                    t_lst.push_back(itr->path().filename().string());
+         }
+     }
+ 
+diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp
+index aa2b494..0c34a08 100644
+--- a/src/mgui/author/script.cpp
++++ b/src/mgui/author/script.cpp
+@@ -370,7 +370,7 @@ static std::string SrcFilename(VideoItem vi)
+ static std::string PrefixCnvPath(VideoItem vi, const std::string& out_dir)
+ {
+     std::string dst_fname = boost::format("%1%.%2%") % GetAuthorNumber(vi) 
+-        % fs::path(SrcFilename(vi)).leaf() % bf::stop;
++        % fs::path(SrcFilename(vi)).filename().string() % bf::stop;
+     return AppendPath(out_dir, dst_fname);
+ }
+ 
+diff --git a/src/mgui/editor/toolbar.cpp b/src/mgui/editor/toolbar.cpp
+index e549490..c6f15b3 100644
+--- a/src/mgui/editor/toolbar.cpp
++++ b/src/mgui/editor/toolbar.cpp
+@@ -287,7 +287,7 @@ Toolbar::Toolbar(): selTool(MakeSelectionToolImage()), txtTool(MakeTextToolLabel
+     	    if( fs::is_directory(dir) )
+     	    {    
+     		boost_foreach( const fs::path& pth, dir_range(dir) )
+-    		    o_lst.push_back(pth.filename());
++    		    o_lst.push_back(pth.filename().string());
+     	    }
+     	}
+     	std::sort(o_lst.begin(), o_lst.end(), &ByExtName);
+diff --git a/src/mgui/mux.cpp b/src/mgui/mux.cpp
+index 4b4a5fa..0864bc2 100644
+--- a/src/mgui/mux.cpp
++++ b/src/mgui/mux.cpp
+@@ -72,7 +72,7 @@ void SetDialogStrict(Gtk::Dialog& dlg, int min_wdh, int min_hgt, bool set_resiza
+ 
+ static bool RunMuxing(const std::string& dest_path, const std::string& args)
+ {
+-    Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).leaf() % bf::stop);
++    Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).filename().string() % bf::stop);
+     SetDialogStrict(dlg, 400, -1);
+ 
+     Gtk::TextView& txt_view = NewManaged<Gtk::TextView>();
+diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp
+index db4df17..0425a9b 100644
+--- a/src/mgui/project/add.cpp
++++ b/src/mgui/project/add.cpp
+@@ -420,7 +420,7 @@ void TryAddMediaQuiet(const std::string& fname, const std::string& desc)
+ static std::string StandFNameOut(const fs::path& pth)
+ {
+     return "<span style=\"italic\" underline=\"low\">" + 
+-                    pth.leaf() + "</span>";
++                    pth.filename().string() + "</span>";
+ }
+ 
+ #if GTK_CHECK_VERSION(2,18,0)
+@@ -454,7 +454,7 @@ StorageItem CheckExists(const fs::path& pth, RefPtr<MediaStore> ms)
+ 
+ void OneMediaError(const fs::path& err_pth, const std::string& desc)
+ {
+-    AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.leaf() % bf::stop, desc);
++    AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.filename().string() % bf::stop, desc);
+ }
+ 
+ void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
+@@ -465,7 +465,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
+     {
+         const std::string fname = paths[0];
+         fs::path pth(fname); 
+-        std::string leaf = pth.leaf();
++        std::string leaf = pth.filename().string();
+         {
+             static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-9]).VOB", 
+                                               re::pattern::perl|re::pattern::icase);
+diff --git a/src/mgui/project/mconstructor.cpp b/src/mgui/project/mconstructor.cpp
+index 12e2f49..7ad2546 100644
+--- a/src/mgui/project/mconstructor.cpp
++++ b/src/mgui/project/mconstructor.cpp
+@@ -961,7 +961,7 @@ void RunConstructor(const std::string& prj_file_name, bool ask_save_on_exit)
+         static const fs::directory_iterator end_itr;
+         for( fs::directory_iterator itr(DataDirPath("bmd-icons"));
+             itr != end_itr; ++itr )
+-            pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string()));
++            pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().string()));
+         Gtk::Window::set_default_icon_list(pix_lst);
+     
+         ActionFunctor after_fnr = BuildConstructor(app, prj_file_name);
+diff --git a/src/mgui/project/serialize.cpp b/src/mgui/project/serialize.cpp
+index 12b3c3a..2340b0b 100644
+--- a/src/mgui/project/serialize.cpp
++++ b/src/mgui/project/serialize.cpp
+@@ -71,7 +71,7 @@ static std::string MakeProjectTitle(bool with_path_breakdown = false)
+         return "untitled.bmd";
+ 
+     fs::path full_path(db.GetProjectFName());
+-    std::string res_str = full_path.leaf();
++    std::string res_str = full_path.filename().string();
+     if( with_path_breakdown )
+         res_str += " (" + full_path.branch_path().string() + ")";
+     return res_str;
+diff --git a/src/mgui/win_utils.cpp b/src/mgui/win_utils.cpp
+index 28ad9dd..175e241 100644
+--- a/src/mgui/win_utils.cpp
++++ b/src/mgui/win_utils.cpp
+@@ -418,7 +418,7 @@ bool CheckKeepOrigin(const std::string& fname)
+     bool res = false;
+     if( fs::exists(fname) && 
+         (Gtk::RESPONSE_OK != MessageBox(BF_("A file named \"%1%\" already exists. Do you want to replace it?")
+-                                        % fs::path(fname).leaf() % bf::stop,
++                                        % fs::path(fname).filename().string() % bf::stop,
+                                         Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, 
+                                         _("Replacing the file overwrite its contents."),
+                                         true)) )
+diff --git a/src/mlib/filesystem.cpp b/src/mlib/filesystem.cpp
+index bb84860..5d4f39c 100644
+--- a/src/mlib/filesystem.cpp
++++ b/src/mlib/filesystem.cpp
+@@ -47,7 +47,7 @@ const char* FindExtDot(const char* name)
+ 
+ std::string get_basename(const fs::path& pth)
+ {
+-    std::string name_s = pth.leaf();
++    std::string name_s = pth.filename().string();
+     const char* name = name_s.c_str();
+ 
+     //if( const char* dot = strstr(name, ".") )
+@@ -58,24 +58,13 @@ std::string get_basename(const fs::path& pth)
+ 
+ std::string get_extension(const fs::path& pth)
+ {
+-    std::string name_s = pth.leaf();
++    std::string name_s = pth.filename().string();
+ 
+     if( const char* dot = FindExtDot(name_s.c_str()) )
+         return std::string(dot+1);
+     return std::string();
+ }
+ 
+-// глобальная установка проверки имен файлов
+-class tune_boost_filesystem
+-{
+-    public:
+-    tune_boost_filesystem()
+-    {
+-        // чтоб любые символы в именах файлов позволялись, для utf8
+-        fs::path::default_name_check(fs::native);
+-    }
+-} tune_boost_filesystem_obj;
+-
+ namespace Project
+ {
+ 
+-- 
+1.7.11.7
+