| 1 |
dlan 14/08/01 06:47:06 |
| 2 |
|
| 3 |
Added: librime-1.2-BOOST_NO_SCOPED_ENUMS.patch |
| 4 |
Log: |
| 5 |
bump & drop old |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-i18n/librime/files/librime-1.2-BOOST_NO_SCOPED_ENUMS.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/librime/files/librime-1.2-BOOST_NO_SCOPED_ENUMS.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/librime/files/librime-1.2-BOOST_NO_SCOPED_ENUMS.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: librime-1.2-BOOST_NO_SCOPED_ENUMS.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/include/rime/lever/customizer.h b/include/rime/lever/customizer.h |
| 18 |
index 8418410..f6811d9 100644 |
| 19 |
--- a/include/rime/lever/customizer.h |
| 20 |
+++ b/include/rime/lever/customizer.h |
| 21 |
@@ -8,6 +8,9 @@ |
| 22 |
#define RIME_CUSTOMIZER_H_ |
| 23 |
|
| 24 |
#include <string> |
| 25 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 26 |
+#define BOOST_NO_SCOPED_ENUMS |
| 27 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 28 |
#include <boost/filesystem.hpp> |
| 29 |
|
| 30 |
namespace rime { |
| 31 |
diff --git a/include/rime/lever/switcher_settings.h b/include/rime/lever/switcher_settings.h |
| 32 |
index 8263e14..f7c9d1e 100644 |
| 33 |
--- a/include/rime/lever/switcher_settings.h |
| 34 |
+++ b/include/rime/lever/switcher_settings.h |
| 35 |
@@ -9,6 +9,9 @@ |
| 36 |
|
| 37 |
#include <string> |
| 38 |
#include <vector> |
| 39 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 40 |
+#define BOOST_NO_SCOPED_ENUMS |
| 41 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 42 |
#include <boost/filesystem.hpp> |
| 43 |
#include "custom_settings.h" |
| 44 |
|
| 45 |
diff --git a/include/rime/lever/user_dict_manager.h b/include/rime/lever/user_dict_manager.h |
| 46 |
index e971ad8..e765678 100644 |
| 47 |
--- a/include/rime/lever/user_dict_manager.h |
| 48 |
+++ b/include/rime/lever/user_dict_manager.h |
| 49 |
@@ -9,6 +9,9 @@ |
| 50 |
|
| 51 |
#include <string> |
| 52 |
#include <vector> |
| 53 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 54 |
+#define BOOST_NO_SCOPED_ENUMS |
| 55 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 56 |
#include <boost/filesystem.hpp> |
| 57 |
|
| 58 |
namespace rime { |
| 59 |
diff --git a/src/core_module.cc b/src/core_module.cc |
| 60 |
index 785c22f..4d078ae 100644 |
| 61 |
--- a/src/core_module.cc |
| 62 |
+++ b/src/core_module.cc |
| 63 |
@@ -5,6 +5,9 @@ |
| 64 |
// 2013-10-17 GONG Chen <chen.sst@×××××.com> |
| 65 |
// |
| 66 |
|
| 67 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 68 |
+#define BOOST_NO_SCOPED_ENUMS |
| 69 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 70 |
#include <boost/filesystem.hpp> |
| 71 |
#include <rime_api.h> |
| 72 |
#include <rime/common.h> |
| 73 |
diff --git a/src/dict/db.cc b/src/dict/db.cc |
| 74 |
index b8c46a6..eadacb9 100644 |
| 75 |
--- a/src/dict/db.cc |
| 76 |
+++ b/src/dict/db.cc |
| 77 |
@@ -5,6 +5,9 @@ |
| 78 |
// 2011-11-02 GONG Chen <chen.sst@×××××.com> |
| 79 |
// |
| 80 |
#include <boost/algorithm/string.hpp> |
| 81 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 82 |
+#define BOOST_NO_SCOPED_ENUMS |
| 83 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 84 |
#include <boost/filesystem.hpp> |
| 85 |
#include <rime_version.h> |
| 86 |
#include <rime/common.h> |
| 87 |
diff --git a/src/dict/dict_compiler.cc b/src/dict/dict_compiler.cc |
| 88 |
index 2bd9aa4..f383f7e 100644 |
| 89 |
--- a/src/dict/dict_compiler.cc |
| 90 |
+++ b/src/dict/dict_compiler.cc |
| 91 |
@@ -7,6 +7,9 @@ |
| 92 |
#include <fstream> |
| 93 |
#include <map> |
| 94 |
#include <set> |
| 95 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 96 |
+#define BOOST_NO_SCOPED_ENUMS |
| 97 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 98 |
#include <boost/filesystem.hpp> |
| 99 |
#include <rime/algo/algebra.h> |
| 100 |
#include <rime/algo/utilities.h> |
| 101 |
diff --git a/src/dict/dictionary.cc b/src/dict/dictionary.cc |
| 102 |
index 66306b5..b0d755d 100644 |
| 103 |
--- a/src/dict/dictionary.cc |
| 104 |
+++ b/src/dict/dictionary.cc |
| 105 |
@@ -5,6 +5,9 @@ |
| 106 |
// 2011-07-05 GONG Chen <chen.sst@×××××.com> |
| 107 |
// |
| 108 |
#include <utility> |
| 109 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 110 |
+#define BOOST_NO_SCOPED_ENUMS |
| 111 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 112 |
#include <boost/filesystem.hpp> |
| 113 |
#include <rime/common.h> |
| 114 |
#include <rime/schema.h> |
| 115 |
diff --git a/src/dict/mapped_file.cc b/src/dict/mapped_file.cc |
| 116 |
index 6fd21a6..cd46994 100644 |
| 117 |
--- a/src/dict/mapped_file.cc |
| 118 |
+++ b/src/dict/mapped_file.cc |
| 119 |
@@ -7,6 +7,9 @@ |
| 120 |
// 2011-06-30 GONG Chen <chen.sst@×××××.com> |
| 121 |
// |
| 122 |
#include <fstream> |
| 123 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 124 |
+#define BOOST_NO_SCOPED_ENUMS |
| 125 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 126 |
#include <boost/filesystem.hpp> |
| 127 |
#include <boost/interprocess/file_mapping.hpp> |
| 128 |
#include <boost/interprocess/mapped_region.hpp> |
| 129 |
diff --git a/src/dict/preset_vocabulary.cc b/src/dict/preset_vocabulary.cc |
| 130 |
index f74ea58..136f9fa 100644 |
| 131 |
--- a/src/dict/preset_vocabulary.cc |
| 132 |
+++ b/src/dict/preset_vocabulary.cc |
| 133 |
@@ -4,6 +4,9 @@ |
| 134 |
// |
| 135 |
// 2011-11-27 GONG Chen <chen.sst@×××××.com> |
| 136 |
// |
| 137 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 138 |
+#define BOOST_NO_SCOPED_ENUMS |
| 139 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 140 |
#include <boost/filesystem.hpp> |
| 141 |
#include <boost/lexical_cast.hpp> |
| 142 |
#include <utf8.h> |
| 143 |
diff --git a/src/dict/tree_db.cc b/src/dict/tree_db.cc |
| 144 |
index 4b6ed2e..542fe83 100644 |
| 145 |
--- a/src/dict/tree_db.cc |
| 146 |
+++ b/src/dict/tree_db.cc |
| 147 |
@@ -4,6 +4,9 @@ |
| 148 |
// |
| 149 |
// 2011-11-02 GONG Chen <chen.sst@×××××.com> |
| 150 |
// |
| 151 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 152 |
+#define BOOST_NO_SCOPED_ENUMS |
| 153 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 154 |
#include <boost/filesystem.hpp> |
| 155 |
#if defined(_MSC_VER) |
| 156 |
#pragma warning(disable: 4244) |
| 157 |
diff --git a/src/gear/simplifier.cc b/src/gear/simplifier.cc |
| 158 |
index 6bb8524..d02b979 100644 |
| 159 |
--- a/src/gear/simplifier.cc |
| 160 |
+++ b/src/gear/simplifier.cc |
| 161 |
@@ -7,6 +7,9 @@ |
| 162 |
#include <string> |
| 163 |
#include <vector> |
| 164 |
#include <boost/algorithm/string.hpp> |
| 165 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 166 |
+#define BOOST_NO_SCOPED_ENUMS |
| 167 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 168 |
#include <boost/filesystem.hpp> |
| 169 |
#include <opencc/opencc.h> |
| 170 |
#include <stdint.h> |
| 171 |
diff --git a/src/lever/custom_settings.cc b/src/lever/custom_settings.cc |
| 172 |
index 0153830..0713cbc 100644 |
| 173 |
--- a/src/lever/custom_settings.cc |
| 174 |
+++ b/src/lever/custom_settings.cc |
| 175 |
@@ -5,6 +5,9 @@ |
| 176 |
// 2012-02-26 GONG Chen <chen.sst@×××××.com> |
| 177 |
// |
| 178 |
#include <boost/algorithm/string.hpp> |
| 179 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 180 |
+#define BOOST_NO_SCOPED_ENUMS |
| 181 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 182 |
#include <boost/filesystem.hpp> |
| 183 |
#include <rime/config.h> |
| 184 |
#include <rime/deployer.h> |
| 185 |
diff --git a/src/lever/deployment_tasks.cc b/src/lever/deployment_tasks.cc |
| 186 |
index 495066f..589c883 100644 |
| 187 |
--- a/src/lever/deployment_tasks.cc |
| 188 |
+++ b/src/lever/deployment_tasks.cc |
| 189 |
@@ -5,6 +5,9 @@ |
| 190 |
// 2011-12-10 GONG Chen <chen.sst@×××××.com> |
| 191 |
// |
| 192 |
#include <boost/algorithm/string.hpp> |
| 193 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 194 |
+#define BOOST_NO_SCOPED_ENUMS |
| 195 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 196 |
#include <boost/filesystem.hpp> |
| 197 |
#include <boost/uuid/random_generator.hpp> |
| 198 |
#include <boost/uuid/uuid.hpp> |
| 199 |
diff --git a/src/lever/switcher_settings.cc b/src/lever/switcher_settings.cc |
| 200 |
index 4ee7d57..bb4dbd0 100644 |
| 201 |
--- a/src/lever/switcher_settings.cc |
| 202 |
+++ b/src/lever/switcher_settings.cc |
| 203 |
@@ -6,6 +6,9 @@ |
| 204 |
// |
| 205 |
#include <utility> |
| 206 |
#include <boost/algorithm/string.hpp> |
| 207 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 208 |
+#define BOOST_NO_SCOPED_ENUMS |
| 209 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 210 |
#include <boost/filesystem.hpp> |
| 211 |
#include <rime/config.h> |
| 212 |
#include <rime/deployer.h> |
| 213 |
diff --git a/src/lever/user_dict_manager.cc b/src/lever/user_dict_manager.cc |
| 214 |
index 601cfc2..e087739 100644 |
| 215 |
--- a/src/lever/user_dict_manager.cc |
| 216 |
+++ b/src/lever/user_dict_manager.cc |
| 217 |
@@ -6,6 +6,9 @@ |
| 218 |
// |
| 219 |
#include <fstream> |
| 220 |
#include <boost/algorithm/string.hpp> |
| 221 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 222 |
+#define BOOST_NO_SCOPED_ENUMS |
| 223 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 224 |
#include <boost/filesystem.hpp> |
| 225 |
#include <boost/scope_exit.hpp> |
| 226 |
#include <rime/common.h> |
| 227 |
diff --git a/src/lever/userdb_recovery_task.cc b/src/lever/userdb_recovery_task.cc |
| 228 |
index 818e2fd..2a25efd 100644 |
| 229 |
--- a/src/lever/userdb_recovery_task.cc |
| 230 |
+++ b/src/lever/userdb_recovery_task.cc |
| 231 |
@@ -5,6 +5,9 @@ |
| 232 |
// 2013-04-22 GONG Chen <chen.sst@×××××.com> |
| 233 |
// |
| 234 |
#include <boost/algorithm/string.hpp> |
| 235 |
+#ifndef BOOST_NO_SCOPED_ENUMS |
| 236 |
+#define BOOST_NO_SCOPED_ENUMS |
| 237 |
+#endif // BOOST_NO_SCOPED_ENUMS |
| 238 |
#include <boost/filesystem.hpp> |
| 239 |
#include <boost/scope_exit.hpp> |
| 240 |
#include <rime/deployer.h> |
Archives