summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2009-04-07 12:23:13 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2009-04-07 12:23:13 +0000
commitd0901a77fb200d6e831147904ffd879f7c0bb729 (patch)
tree93b778940194500a876940791cf77f67f1aabf09 /print
parent- Add USE_GCC=4.3+ to fix building with boost 1.37 (diff)
- Fix building with boost 1.37
PR: ports/133044 Submitted by: amdmi3 Approved by: maintainer
Notes
Notes: svn path=/head/; revision=231777
Diffstat (limited to 'print')
-rw-r--r--print/lyx-devel/files/patch-boost-13478
-rw-r--r--print/lyx-devel/files/patch-src-support-fs_extras.C62
-rw-r--r--print/lyx-devel/files/patch-src-support-tests-convert.C12
-rw-r--r--print/lyx-devel/files/patch-src-support-tests-regfiles-convert7
-rw-r--r--print/lyx/files/patch-boost-13478
-rw-r--r--print/lyx/files/patch-src-support-fs_extras.C62
-rw-r--r--print/lyx/files/patch-src-support-tests-convert.C12
-rw-r--r--print/lyx/files/patch-src-support-tests-regfiles-convert7
-rw-r--r--print/lyx14/files/patch-boost-13478
-rw-r--r--print/lyx14/files/patch-src-support-fs_extras.C62
-rw-r--r--print/lyx14/files/patch-src-support-tests-convert.C12
-rw-r--r--print/lyx14/files/patch-src-support-tests-regfiles-convert7
-rw-r--r--print/lyx16/files/patch-boost-13478
-rw-r--r--print/lyx16/files/patch-src-support-fs_extras.C62
-rw-r--r--print/lyx16/files/patch-src-support-tests-convert.C12
-rw-r--r--print/lyx16/files/patch-src-support-tests-regfiles-convert7
16 files changed, 324 insertions, 312 deletions
diff --git a/print/lyx-devel/files/patch-boost-134 b/print/lyx-devel/files/patch-boost-134
index 9d962c0af94a..2bfe3a8f6140 100644
--- a/print/lyx-devel/files/patch-boost-134
+++ b/print/lyx-devel/files/patch-boost-134
@@ -7,84 +7,6 @@
+#if 0
#define Path(x) unnamed_Path;
#endif
---- src/support/fs_extras.C Sat May 7 10:31:16 2005
-+++ src/support/fs_extras.C Fri Jul 6 14:39:58 2007
-@@ -94,11 +94,20 @@
-
- #ifdef BOOST_POSIX
-+#include <boost/version.hpp>
- int const infile = ::open(source.string().c_str(), O_RDONLY);
- if (infile == -1) {
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -108,8 +117,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -120,8 +137,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -150,8 +175,16 @@
- if (in == -1 || out == -1)
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- #endif
- #ifdef BOOST_WINDOWS
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
diff --git a/print/lyx-devel/files/patch-src-support-fs_extras.C b/print/lyx-devel/files/patch-src-support-fs_extras.C
new file mode 100644
index 000000000000..a109e06f5b87
--- /dev/null
+++ b/print/lyx-devel/files/patch-src-support-fs_extras.C
@@ -0,0 +1,62 @@
+--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
++++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
+@@ -93,13 +93,15 @@
+ {
+
+ #ifdef BOOST_POSIX
++#include <boost/version.hpp>
+ int const infile = ::open(source.string().c_str(), O_RDONLY);
+ if (infile == -1) {
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ struct stat source_stat;
+@@ -107,10 +109,11 @@
+ if (ret == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
+@@ -119,10 +122,11 @@
+ if (outfile == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ std::size_t const buf_sz = 32768;
+@@ -149,10 +153,11 @@
+
+ if (in == -1 || out == -1)
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ #endif
+ #ifdef BOOST_WINDOWS
+ if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {
diff --git a/print/lyx-devel/files/patch-src-support-tests-convert.C b/print/lyx-devel/files/patch-src-support-tests-convert.C
new file mode 100644
index 000000000000..ca9a46941ba8
--- /dev/null
+++ b/print/lyx-devel/files/patch-src-support-tests-convert.C
@@ -0,0 +1,12 @@
+--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
+@@ -74,8 +74,7 @@
+ << convert<string>(false) << '\n'
+
+ << convert<string>('a') << '\n'
+- << convert<string>(1.0) << '\n'
+- << convert<string>(1.1) << endl;
++ << convert<string>(1.0) << endl;
+ }
+
+ int main()
diff --git a/print/lyx-devel/files/patch-src-support-tests-regfiles-convert b/print/lyx-devel/files/patch-src-support-tests-regfiles-convert
new file mode 100644
index 000000000000..a63e24103730
--- /dev/null
+++ b/print/lyx-devel/files/patch-src-support-tests-regfiles-convert
@@ -0,0 +1,7 @@
+--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
+@@ -46,4 +46,3 @@
+ false
+ a
+ 1
+-1.1
diff --git a/print/lyx/files/patch-boost-134 b/print/lyx/files/patch-boost-134
index 9d962c0af94a..2bfe3a8f6140 100644
--- a/print/lyx/files/patch-boost-134
+++ b/print/lyx/files/patch-boost-134
@@ -7,84 +7,6 @@
+#if 0
#define Path(x) unnamed_Path;
#endif
---- src/support/fs_extras.C Sat May 7 10:31:16 2005
-+++ src/support/fs_extras.C Fri Jul 6 14:39:58 2007
-@@ -94,11 +94,20 @@
-
- #ifdef BOOST_POSIX
-+#include <boost/version.hpp>
- int const infile = ::open(source.string().c_str(), O_RDONLY);
- if (infile == -1) {
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -108,8 +117,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -120,8 +137,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -150,8 +175,16 @@
- if (in == -1 || out == -1)
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- #endif
- #ifdef BOOST_WINDOWS
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
diff --git a/print/lyx/files/patch-src-support-fs_extras.C b/print/lyx/files/patch-src-support-fs_extras.C
new file mode 100644
index 000000000000..a109e06f5b87
--- /dev/null
+++ b/print/lyx/files/patch-src-support-fs_extras.C
@@ -0,0 +1,62 @@
+--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
++++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
+@@ -93,13 +93,15 @@
+ {
+
+ #ifdef BOOST_POSIX
++#include <boost/version.hpp>
+ int const infile = ::open(source.string().c_str(), O_RDONLY);
+ if (infile == -1) {
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ struct stat source_stat;
+@@ -107,10 +109,11 @@
+ if (ret == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
+@@ -119,10 +122,11 @@
+ if (outfile == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ std::size_t const buf_sz = 32768;
+@@ -149,10 +153,11 @@
+
+ if (in == -1 || out == -1)
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ #endif
+ #ifdef BOOST_WINDOWS
+ if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {
diff --git a/print/lyx/files/patch-src-support-tests-convert.C b/print/lyx/files/patch-src-support-tests-convert.C
new file mode 100644
index 000000000000..ca9a46941ba8
--- /dev/null
+++ b/print/lyx/files/patch-src-support-tests-convert.C
@@ -0,0 +1,12 @@
+--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
+@@ -74,8 +74,7 @@
+ << convert<string>(false) << '\n'
+
+ << convert<string>('a') << '\n'
+- << convert<string>(1.0) << '\n'
+- << convert<string>(1.1) << endl;
++ << convert<string>(1.0) << endl;
+ }
+
+ int main()
diff --git a/print/lyx/files/patch-src-support-tests-regfiles-convert b/print/lyx/files/patch-src-support-tests-regfiles-convert
new file mode 100644
index 000000000000..a63e24103730
--- /dev/null
+++ b/print/lyx/files/patch-src-support-tests-regfiles-convert
@@ -0,0 +1,7 @@
+--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
+@@ -46,4 +46,3 @@
+ false
+ a
+ 1
+-1.1
diff --git a/print/lyx14/files/patch-boost-134 b/print/lyx14/files/patch-boost-134
index 9d962c0af94a..2bfe3a8f6140 100644
--- a/print/lyx14/files/patch-boost-134
+++ b/print/lyx14/files/patch-boost-134
@@ -7,84 +7,6 @@
+#if 0
#define Path(x) unnamed_Path;
#endif
---- src/support/fs_extras.C Sat May 7 10:31:16 2005
-+++ src/support/fs_extras.C Fri Jul 6 14:39:58 2007
-@@ -94,11 +94,20 @@
-
- #ifdef BOOST_POSIX
-+#include <boost/version.hpp>
- int const infile = ::open(source.string().c_str(), O_RDONLY);
- if (infile == -1) {
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -108,8 +117,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -120,8 +137,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -150,8 +175,16 @@
- if (in == -1 || out == -1)
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- #endif
- #ifdef BOOST_WINDOWS
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
diff --git a/print/lyx14/files/patch-src-support-fs_extras.C b/print/lyx14/files/patch-src-support-fs_extras.C
new file mode 100644
index 000000000000..a109e06f5b87
--- /dev/null
+++ b/print/lyx14/files/patch-src-support-fs_extras.C
@@ -0,0 +1,62 @@
+--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
++++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
+@@ -93,13 +93,15 @@
+ {
+
+ #ifdef BOOST_POSIX
++#include <boost/version.hpp>
+ int const infile = ::open(source.string().c_str(), O_RDONLY);
+ if (infile == -1) {
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ struct stat source_stat;
+@@ -107,10 +109,11 @@
+ if (ret == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
+@@ -119,10 +122,11 @@
+ if (outfile == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ std::size_t const buf_sz = 32768;
+@@ -149,10 +153,11 @@
+
+ if (in == -1 || out == -1)
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ #endif
+ #ifdef BOOST_WINDOWS
+ if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {
diff --git a/print/lyx14/files/patch-src-support-tests-convert.C b/print/lyx14/files/patch-src-support-tests-convert.C
new file mode 100644
index 000000000000..ca9a46941ba8
--- /dev/null
+++ b/print/lyx14/files/patch-src-support-tests-convert.C
@@ -0,0 +1,12 @@
+--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
+@@ -74,8 +74,7 @@
+ << convert<string>(false) << '\n'
+
+ << convert<string>('a') << '\n'
+- << convert<string>(1.0) << '\n'
+- << convert<string>(1.1) << endl;
++ << convert<string>(1.0) << endl;
+ }
+
+ int main()
diff --git a/print/lyx14/files/patch-src-support-tests-regfiles-convert b/print/lyx14/files/patch-src-support-tests-regfiles-convert
new file mode 100644
index 000000000000..a63e24103730
--- /dev/null
+++ b/print/lyx14/files/patch-src-support-tests-regfiles-convert
@@ -0,0 +1,7 @@
+--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
+@@ -46,4 +46,3 @@
+ false
+ a
+ 1
+-1.1
diff --git a/print/lyx16/files/patch-boost-134 b/print/lyx16/files/patch-boost-134
index 9d962c0af94a..2bfe3a8f6140 100644
--- a/print/lyx16/files/patch-boost-134
+++ b/print/lyx16/files/patch-boost-134
@@ -7,84 +7,6 @@
+#if 0
#define Path(x) unnamed_Path;
#endif
---- src/support/fs_extras.C Sat May 7 10:31:16 2005
-+++ src/support/fs_extras.C Fri Jul 6 14:39:58 2007
-@@ -94,11 +94,20 @@
-
- #ifdef BOOST_POSIX
-+#include <boost/version.hpp>
- int const infile = ::open(source.string().c_str(), O_RDONLY);
- if (infile == -1) {
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -108,8 +117,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -120,8 +137,16 @@
- ::close(infile);
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- }
-
-@@ -150,8 +175,16 @@
- if (in == -1 || out == -1)
- boost::throw_exception(
-+#if BOOST_VERSION < 103400
- filesystem_error(
- "boost::filesystem::copy_file",
- source, target,
-- fs::detail::system_error_code()));
-+ fs::detail::system_error_code())
-+#else
-+ filesystem_path_error(
-+ "boost::filesystem::copy_file",
-+ source, target,
-+ fs::lookup_errno(errno))
-+#endif
-+ );
- #endif
- #ifdef BOOST_WINDOWS
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
diff --git a/print/lyx16/files/patch-src-support-fs_extras.C b/print/lyx16/files/patch-src-support-fs_extras.C
new file mode 100644
index 000000000000..a109e06f5b87
--- /dev/null
+++ b/print/lyx16/files/patch-src-support-fs_extras.C
@@ -0,0 +1,62 @@
+--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
++++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
+@@ -93,13 +93,15 @@
+ {
+
+ #ifdef BOOST_POSIX
++#include <boost/version.hpp>
+ int const infile = ::open(source.string().c_str(), O_RDONLY);
+ if (infile == -1) {
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ struct stat source_stat;
+@@ -107,10 +109,11 @@
+ if (ret == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
+@@ -119,10 +122,11 @@
+ if (outfile == -1) {
+ ::close(infile);
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ }
+
+ std::size_t const buf_sz = 32768;
+@@ -149,10 +153,11 @@
+
+ if (in == -1 || out == -1)
+ boost::throw_exception(
+- filesystem_error(
++ basic_filesystem_error<path>(
+ "boost::filesystem::copy_file",
+ source, target,
+- fs::detail::system_error_code()));
++ boost::system::error_code(errno, boost::system::get_system_category()))
++ );
+ #endif
+ #ifdef BOOST_WINDOWS
+ if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {
diff --git a/print/lyx16/files/patch-src-support-tests-convert.C b/print/lyx16/files/patch-src-support-tests-convert.C
new file mode 100644
index 000000000000..ca9a46941ba8
--- /dev/null
+++ b/print/lyx16/files/patch-src-support-tests-convert.C
@@ -0,0 +1,12 @@
+--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
+@@ -74,8 +74,7 @@
+ << convert<string>(false) << '\n'
+
+ << convert<string>('a') << '\n'
+- << convert<string>(1.0) << '\n'
+- << convert<string>(1.1) << endl;
++ << convert<string>(1.0) << endl;
+ }
+
+ int main()
diff --git a/print/lyx16/files/patch-src-support-tests-regfiles-convert b/print/lyx16/files/patch-src-support-tests-regfiles-convert
new file mode 100644
index 000000000000..a63e24103730
--- /dev/null
+++ b/print/lyx16/files/patch-src-support-tests-regfiles-convert
@@ -0,0 +1,7 @@
+--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
++++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
+@@ -46,4 +46,3 @@
+ false
+ a
+ 1
+-1.1