1 |
commit: 2dde117d786ededb83e8c60ab7601976b55c897a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 30 11:12:37 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 30 11:12:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dde117d |
7 |
|
8 |
app-i18n/mozc/files: [QA] use git-format-patch style patches |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
.../mozc-2.26.4220-environmental_variables.patch | 4 +-- |
13 |
.../files/mozc-2.26.4220-server_path_check.patch | 4 +-- |
14 |
.../files/mozc-2.26.4220-system_abseil-cpp.patch | 32 +++++++++++----------- |
15 |
.../mozc/files/mozc-2.26.4220-system_gtest.patch | 8 +++--- |
16 |
.../mozc/files/mozc-2.26.4220-system_jsoncpp.patch | 12 ++++---- |
17 |
5 files changed, 30 insertions(+), 30 deletions(-) |
18 |
|
19 |
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch |
20 |
index dccdff76f15d..44a60ed4fc9f 100644 |
21 |
--- a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch |
22 |
+++ b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch |
23 |
@@ -1,7 +1,7 @@ |
24 |
https://github.com/google/mozc/issues/470 |
25 |
|
26 |
---- /src/base/system_util.cc |
27 |
-+++ /src/base/system_util.cc |
28 |
+--- a/src/base/system_util.cc |
29 |
++++ b/src/base/system_util.cc |
30 |
@@ -226,6 +226,11 @@ |
31 |
|
32 |
std::string UserProfileDirectoryImpl::GetUserProfileDirectory() const { |
33 |
|
34 |
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch |
35 |
index 8dbabeac0038..b12c3d370e37 100644 |
36 |
--- a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch |
37 |
+++ b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch |
38 |
@@ -1,7 +1,7 @@ |
39 |
https://github.com/google/mozc/issues/471 |
40 |
|
41 |
---- /src/ipc/ipc_path_manager.cc |
42 |
-+++ /src/ipc/ipc_path_manager.cc |
43 |
+--- a/src/ipc/ipc_path_manager.cc |
44 |
++++ b/src/ipc/ipc_path_manager.cc |
45 |
@@ -340,9 +340,21 @@ |
46 |
return false; |
47 |
} |
48 |
|
49 |
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch |
50 |
index 33f72b8f7a63..da6b40265804 100644 |
51 |
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch |
52 |
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch |
53 |
@@ -1,7 +1,7 @@ |
54 |
https://github.com/google/mozc/issues/490 |
55 |
|
56 |
---- /src/base/absl.gyp |
57 |
-+++ /src/base/absl.gyp |
58 |
+--- a/src/base/absl.gyp |
59 |
++++ b/src/base/absl.gyp |
60 |
@@ -28,119 +28,209 @@ |
61 |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
62 |
|
63 |
@@ -301,8 +301,8 @@ https://github.com/google/mozc/issues/490 |
64 |
], |
65 |
}, |
66 |
], |
67 |
---- /src/config/config_test.gyp |
68 |
-+++ /src/config/config_test.gyp |
69 |
+--- a/src/config/config_test.gyp |
70 |
++++ b/src/config/config_test.gyp |
71 |
@@ -36,6 +36,7 @@ |
72 |
'config_handler_test.cc', |
73 |
], |
74 |
@@ -319,8 +319,8 @@ https://github.com/google/mozc/issues/490 |
75 |
'../testing/testing.gyp:gtest_main', |
76 |
'config.gyp:character_form_manager', |
77 |
], |
78 |
---- /src/gyp/common.gypi |
79 |
-+++ /src/gyp/common.gypi |
80 |
+--- a/src/gyp/common.gypi |
81 |
++++ b/src/gyp/common.gypi |
82 |
@@ -194,7 +194,13 @@ |
83 |
'include_dirs': [ |
84 |
'<(abs_depth)', |
85 |
@@ -336,8 +336,8 @@ https://github.com/google/mozc/issues/490 |
86 |
], |
87 |
'mac_framework_headers': [], |
88 |
'target_conditions': [ |
89 |
---- /src/gyp/common_win.gypi |
90 |
-+++ /src/gyp/common_win.gypi |
91 |
+--- a/src/gyp/common_win.gypi |
92 |
++++ b/src/gyp/common_win.gypi |
93 |
@@ -307,10 +307,16 @@ |
94 |
'include_dirs': [ |
95 |
'<(abs_depth)', |
96 |
@@ -356,8 +356,8 @@ https://github.com/google/mozc/issues/490 |
97 |
'msvs_configuration_attributes': { |
98 |
'CharacterSet': '<(win_char_set_unicode)', |
99 |
}, |
100 |
---- /src/gyp/defines.gypi |
101 |
-+++ /src/gyp/defines.gypi |
102 |
+--- a/src/gyp/defines.gypi |
103 |
++++ b/src/gyp/defines.gypi |
104 |
@@ -63,6 +63,10 @@ |
105 |
# use_libibus represents if ibus library is used or not. |
106 |
# This option is only for Linux. |
107 |
@@ -369,8 +369,8 @@ https://github.com/google/mozc/issues/490 |
108 |
}, |
109 |
'target_defaults': { |
110 |
'defines': [ |
111 |
---- /src/gyp/directories.gypi |
112 |
-+++ /src/gyp/directories.gypi |
113 |
+--- a/src/gyp/directories.gypi |
114 |
++++ b/src/gyp/directories.gypi |
115 |
@@ -31,7 +31,12 @@ |
116 |
'variables': { |
117 |
# Top directory of third party libraries. |
118 |
@@ -385,8 +385,8 @@ https://github.com/google/mozc/issues/490 |
119 |
|
120 |
# Top directory of additional third party libraries. |
121 |
'ext_third_party_dir%': '<(abs_depth)/third_party', |
122 |
---- /src/session/session_test.gyp |
123 |
-+++ /src/session/session_test.gyp |
124 |
+--- a/src/session/session_test.gyp |
125 |
++++ b/src/session/session_test.gyp |
126 |
@@ -221,6 +221,7 @@ |
127 |
'internal/key_event_transformer_test.cc', |
128 |
], |
129 |
@@ -395,8 +395,8 @@ https://github.com/google/mozc/issues/490 |
130 |
'../base/base.gyp:base', |
131 |
'../converter/converter_base.gyp:converter_mock', |
132 |
'../engine/engine.gyp:mock_converter_engine', |
133 |
---- /src/storage/storage_test.gyp |
134 |
-+++ /src/storage/storage_test.gyp |
135 |
+--- a/src/storage/storage_test.gyp |
136 |
++++ b/src/storage/storage_test.gyp |
137 |
@@ -41,6 +41,7 @@ |
138 |
'tiny_storage_test.cc', |
139 |
], |
140 |
|
141 |
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch |
142 |
index 47891fab9b47..0d52bcab9e10 100644 |
143 |
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch |
144 |
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch |
145 |
@@ -1,7 +1,7 @@ |
146 |
https://github.com/google/mozc/issues/490 |
147 |
|
148 |
---- /src/gyp/defines.gypi |
149 |
-+++ /src/gyp/defines.gypi |
150 |
+--- a/src/gyp/defines.gypi |
151 |
++++ b/src/gyp/defines.gypi |
152 |
@@ -67,6 +67,10 @@ |
153 |
# use_system_abseil_cpp represents if system version or bundled version |
154 |
# of abseil-cpp library is used. |
155 |
@@ -13,8 +13,8 @@ https://github.com/google/mozc/issues/490 |
156 |
}, |
157 |
'target_defaults': { |
158 |
'defines': [ |
159 |
---- /src/testing/testing.gyp |
160 |
-+++ /src/testing/testing.gyp |
161 |
+--- a/src/testing/testing.gyp |
162 |
++++ b/src/testing/testing.gyp |
163 |
@@ -59,54 +59,76 @@ |
164 |
'targets': [ |
165 |
{ |
166 |
|
167 |
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch |
168 |
index 7ff132eaa591..479759ba6e40 100644 |
169 |
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch |
170 |
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch |
171 |
@@ -1,7 +1,7 @@ |
172 |
https://github.com/google/mozc/issues/490 |
173 |
|
174 |
---- /src/gyp/defines.gypi |
175 |
-+++ /src/gyp/defines.gypi |
176 |
+--- a/src/gyp/defines.gypi |
177 |
++++ b/src/gyp/defines.gypi |
178 |
@@ -71,6 +71,10 @@ |
179 |
# use_system_gtest represents if system version or bundled version |
180 |
# of gtest library is used. |
181 |
@@ -13,8 +13,8 @@ https://github.com/google/mozc/issues/490 |
182 |
}, |
183 |
'target_defaults': { |
184 |
'defines': [ |
185 |
---- /src/net/jsoncpp.gyp |
186 |
-+++ /src/net/jsoncpp.gyp |
187 |
+--- a/src/net/jsoncpp.gyp |
188 |
++++ b/src/net/jsoncpp.gyp |
189 |
@@ -31,32 +31,60 @@ |
190 |
'targets': [ |
191 |
{ |
192 |
@@ -101,8 +101,8 @@ https://github.com/google/mozc/issues/490 |
193 |
}, |
194 |
], |
195 |
} |
196 |
---- /src/net/jsoncpp.h |
197 |
-+++ /src/net/jsoncpp.h |
198 |
+--- a/src/net/jsoncpp.h |
199 |
++++ b/src/net/jsoncpp.h |
200 |
@@ -35,7 +35,11 @@ |
201 |
// Mozc basically disables C++ exception. |
202 |
#define JSON_USE_EXCEPTION 0 |