* [gentoo-commits] repo/gentoo:master commit in: app-i18n/librime/files/
@ 2016-08-11 8:09 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2016-08-11 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 7706c043135fb1be1db80cf1a67c2a7eed9b8b18
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 17:05:50 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 08:07:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7706c043
app-i18n/librime: remove unused patch
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../files/librime-1.1-BOOST_NO_SCOPED_ENUMS.patch | 224 ---------------------
1 file changed, 224 deletions(-)
diff --git a/app-i18n/librime/files/librime-1.1-BOOST_NO_SCOPED_ENUMS.patch b/app-i18n/librime/files/librime-1.1-BOOST_NO_SCOPED_ENUMS.patch
deleted file mode 100644
index 3f33efd..0000000
--- a/app-i18n/librime/files/librime-1.1-BOOST_NO_SCOPED_ENUMS.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-Index: librime-1.1git20140306/include/rime/lever/customizer.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/lever/customizer.h
-+++ librime-1.1git20140306/include/rime/lever/customizer.h
-@@ -8,6 +8,9 @@
- #define RIME_CUSTOMIZER_H_
-
- #include <string>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #define BOOST_NO_CXX11_SCOPED_ENUMS
- #include <boost/filesystem.hpp>;
-
-Index: librime-1.1git20140306/include/rime/lever/switcher_settings.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/lever/switcher_settings.h
-+++ librime-1.1git20140306/include/rime/lever/switcher_settings.h
-@@ -9,6 +9,9 @@
-
- #include <string>
- #include <vector>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include "custom_settings.h"
-
-Index: librime-1.1git20140306/include/rime/lever/user_dict_manager.h
-===================================================================
---- librime-1.1git20140306.orig/include/rime/lever/user_dict_manager.h
-+++ librime-1.1git20140306/include/rime/lever/user_dict_manager.h
-@@ -9,6 +9,9 @@
-
- #include <string>
- #include <vector>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
-
- namespace rime {
-Index: librime-1.1git20140306/src/core_module.cc
-===================================================================
---- librime-1.1git20140306.orig/src/core_module.cc
-+++ librime-1.1git20140306/src/core_module.cc
-@@ -5,6 +5,9 @@
- // 2013-10-17 GONG Chen <chen.sst@gmail.com>
- //
-
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime_api.h>
- #include <rime/common.h>
-Index: librime-1.1git20140306/src/dict/db.cc
-===================================================================
---- librime-1.1git20140306.orig/src/dict/db.cc
-+++ librime-1.1git20140306/src/dict/db.cc
-@@ -5,6 +5,9 @@
- // 2011-11-02 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime_version.h>
- #include <rime/common.h>
-Index: librime-1.1git20140306/src/dict/dict_compiler.cc
-===================================================================
---- librime-1.1git20140306.orig/src/dict/dict_compiler.cc
-+++ librime-1.1git20140306/src/dict/dict_compiler.cc
-@@ -7,6 +7,9 @@
- #include <fstream>
- #include <map>
- #include <set>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/algo/algebra.h>
- #include <rime/algo/utilities.h>
-Index: librime-1.1git20140306/src/dict/dictionary.cc
-===================================================================
---- librime-1.1git20140306.orig/src/dict/dictionary.cc
-+++ librime-1.1git20140306/src/dict/dictionary.cc
-@@ -5,6 +5,9 @@
- // 2011-07-05 GONG Chen <chen.sst@gmail.com>
- //
- #include <utility>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/common.h>
- #include <rime/schema.h>
-Index: librime-1.1git20140306/src/dict/mapped_file.cc
-===================================================================
---- librime-1.1git20140306.orig/src/dict/mapped_file.cc
-+++ librime-1.1git20140306/src/dict/mapped_file.cc
-@@ -7,6 +7,9 @@
- // 2011-06-30 GONG Chen <chen.sst@gmail.com>
- //
- #include <fstream>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/interprocess/file_mapping.hpp>
- #include <boost/interprocess/mapped_region.hpp>
-Index: librime-1.1git20140306/src/dict/preset_vocabulary.cc
-===================================================================
---- librime-1.1git20140306.orig/src/dict/preset_vocabulary.cc
-+++ librime-1.1git20140306/src/dict/preset_vocabulary.cc
-@@ -4,6 +4,9 @@
- //
- // 2011-11-27 GONG Chen <chen.sst@gmail.com>
- //
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/lexical_cast.hpp>
- #include <utf8.h>
-Index: librime-1.1git20140306/src/dict/tree_db.cc
-===================================================================
---- librime-1.1git20140306.orig/src/dict/tree_db.cc
-+++ librime-1.1git20140306/src/dict/tree_db.cc
-@@ -4,6 +4,9 @@
- //
- // 2011-11-02 GONG Chen <chen.sst@gmail.com>
- //
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #if defined(_MSC_VER)
- #pragma warning(disable: 4244)
-Index: librime-1.1git20140306/src/gear/simplifier.cc
-===================================================================
---- librime-1.1git20140306.orig/src/gear/simplifier.cc
-+++ librime-1.1git20140306/src/gear/simplifier.cc
-@@ -7,6 +7,9 @@
- #include <string>
- #include <vector>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <opencc/opencc.h>
- #include <stdint.h>
-Index: librime-1.1git20140306/src/lever/custom_settings.cc
-===================================================================
---- librime-1.1git20140306.orig/src/lever/custom_settings.cc
-+++ librime-1.1git20140306/src/lever/custom_settings.cc
-@@ -5,6 +5,9 @@
- // 2012-02-26 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/config.h>
- #include <rime/deployer.h>
-Index: librime-1.1git20140306/src/lever/deployment_tasks.cc
-===================================================================
---- librime-1.1git20140306.orig/src/lever/deployment_tasks.cc
-+++ librime-1.1git20140306/src/lever/deployment_tasks.cc
-@@ -5,6 +5,9 @@
- // 2011-12-10 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #define BOOST_NO_CXX11_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/uuid/random_generator.hpp>
-Index: librime-1.1git20140306/src/lever/switcher_settings.cc
-===================================================================
---- librime-1.1git20140306.orig/src/lever/switcher_settings.cc
-+++ librime-1.1git20140306/src/lever/switcher_settings.cc
-@@ -6,6 +6,9 @@
- //
- #include <utility>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/config.h>
- #include <rime/deployer.h>
-Index: librime-1.1git20140306/src/lever/user_dict_manager.cc
-===================================================================
---- librime-1.1git20140306.orig/src/lever/user_dict_manager.cc
-+++ librime-1.1git20140306/src/lever/user_dict_manager.cc
-@@ -6,6 +6,9 @@
- //
- #include <fstream>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/scope_exit.hpp>
- #include <rime/common.h>
-Index: librime-1.1git20140306/src/lever/userdb_recovery_task.cc
-===================================================================
---- librime-1.1git20140306.orig/src/lever/userdb_recovery_task.cc
-+++ librime-1.1git20140306/src/lever/userdb_recovery_task.cc
-@@ -5,6 +5,9 @@
- // 2013-04-22 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/scope_exit.hpp>
- #include <rime/deployer.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/librime/files/
@ 2022-10-30 11:13 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-10-30 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 77b0a0316df65691d88c97f206477c8dec0c501d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:12:36 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 11:12:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77b0a031
app-i18n/librime: [QA] use git-format-patch style patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-i18n/librime/files/librime-1.6.0-boost-1.76.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
index 5ed1447359d6..31eff9268bfc 100644
--- a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
+++ b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
@@ -2,8 +2,8 @@ https://github.com/rime/librime/issues/462
https://github.com/rime/librime/pull/463
https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
---- /src/rime/gear/script_translator.cc
-+++ /src/rime/gear/script_translator.cc
+--- a/src/rime/gear/script_translator.cc
++++ b/src/rime/gear/script_translator.cc
@@ -8,6 +8,7 @@
//
#include <algorithm>
@@ -12,8 +12,8 @@ https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
#include <boost/algorithm/string/join.hpp>
#include <boost/range/adaptor/reversed.hpp>
#include <rime/composition.h>
---- /src/rime/gear/table_translator.cc
-+++ /src/rime/gear/table_translator.cc
+--- a/src/rime/gear/table_translator.cc
++++ b/src/rime/gear/table_translator.cc
@@ -6,6 +6,7 @@
//
#include <boost/algorithm/string.hpp>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/librime/files/
@ 2025-02-23 22:19 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2025-02-23 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 00c67c8d13146c14c6e2fda582eb1596b3a3afed
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 9 08:54:02 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 22:16:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c67c8d
app-i18n/librime: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../librime/files/librime-1.6.0-boost-1.76.patch | 24 ----------------------
.../librime/files/librime-1.7.3-boost-1.85.patch | 24 ----------------------
2 files changed, 48 deletions(-)
diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
deleted file mode 100644
index 31eff9268bfc..000000000000
--- a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/rime/librime/issues/462
-https://github.com/rime/librime/pull/463
-https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
-
---- a/src/rime/gear/script_translator.cc
-+++ b/src/rime/gear/script_translator.cc
-@@ -8,6 +8,7 @@
- //
- #include <algorithm>
- #include <stack>
-+#include <cmath>
- #include <boost/algorithm/string/join.hpp>
- #include <boost/range/adaptor/reversed.hpp>
- #include <rime/composition.h>
---- a/src/rime/gear/table_translator.cc
-+++ b/src/rime/gear/table_translator.cc
-@@ -6,6 +6,7 @@
- //
- #include <boost/algorithm/string.hpp>
- #include <boost/range/adaptor/reversed.hpp>
-+#include <cmath>
- #include <utf8.h>
- #include <rime/candidate.h>
- #include <rime/common.h>
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
deleted file mode 100644
index cfb191ddc319..000000000000
--- a/app-i18n/librime/files/librime-1.7.3-boost-1.85.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 '"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-23 22:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-30 11:13 [gentoo-commits] repo/gentoo:master commit in: app-i18n/librime/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2025-02-23 22:19 Conrad Kostecki
2016-08-11 8:09 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox