commit: 65498d9e757c5d5393574191912a1c063bd892af Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 07:37:53 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jul 16 07:38:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65498d9e
app-i18n/librime: fix build w/ boost-1.85 Closes: https://bugs.gentoo.org/933408 Thanks-to: sjlcwn <AT> 126.com Signed-off-by: Sam James <sam <AT> gentoo.org> .../librime/files/librime-1.7.3-boost-1.85.patch | 24 ++++++++++++++++++++++ app-i18n/librime/librime-1.7.3-r1.ebuild | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch b/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch new file mode 100644 index 000000000000..cfb191ddc319 --- /dev/null +++ b/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/933408 +--- a/src/rime/lever/deployment_tasks.cc ++++ b/src/rime/lever/deployment_tasks.cc +@@ -577,7 +577,7 @@ + continue; + } + boost::system::error_code ec; +- fs::copy_file(entry, backup, fs::copy_option::overwrite_if_exists, ec); ++ fs::copy_file(entry, backup, fs::copy_options::overwrite_existing, ec); + if (ec) { + LOG(ERROR) << "error backing up file " << backup.string(); + ++failure; + +--- a/src/rime/lever/customizer.cc ++++ b/src/rime/lever/customizer.cc +@@ -94,7 +94,7 @@ + if (redistribute || (is_dirty && !missing_original_copy)) { + try { + fs::copy_file(source_path_, dest_path_, +- fs::copy_option::overwrite_if_exists); ++ fs::copy_options::overwrite_existing); + } + catch (...) { + LOG(ERROR) << "Error copying config file '" diff --git a/app-i18n/librime/librime-1.7.3-r1.ebuild b/app-i18n/librime/librime-1.7.3-r1.ebuild index 5976ce7ac04b..f32cba65e333 100644 --- a/app-i18n/librime/librime-1.7.3-r1.ebuild +++ b/app-i18n/librime/librime-1.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -44,6 +44,7 @@ DOCS=(CHANGELOG.md README.md) src_prepare() { eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch" + eapply "${FILESDIR}/${PN}-1.7.3-boost-1.85.patch" # Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto. sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die
