Commit f120bb26b403a016ceb79cc7dde868a57d58bf4c - mozc

Update debian/patches/support-kfreebsd.patch Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> Nobuhiro Iwamatsu 13 years ago

1 changed file(s) with 64 addition(s) and 111 deletion(s). Raw diff Collapse all Expand all

+64

-111

debian/patches/support-kfreebsd.patch less more

0		From c962ec1fc61ef5cae36ec2494bf419bd604694c0 Mon Sep 17 00:00:00 2001
1		From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
2		Date: Sat, 9 Oct 2010 08:15:18 +0900
3		Subject: [PATCH] Add support kfreebsd
4
5		Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
6		---
7		base/const.h \| 2 +-
8		base/cpu_stats.cc \| 6 +-
9		base/flags.h \| 2 +-
10		base/iconv.cc \| 4 ++
11		base/logging.cc \| 2 +-
12		base/mutex.cc \| 3 +-
13		base/mutex.h \| 6 ++-
14		base/password_manager.cc \| 2 +-
15		base/process.cc \| 8 ++--
16		base/run_level.cc \| 2 +-
17		base/stats_config_util.cc \| 2 +-
18		base/stats_config_util_test.cc \| 2 +-
19		base/stopwatch.cc \| 6 +-
20		base/util.cc \| 19 +++++----
21		build_mozc.py \| 66 +++++++++++++++++++++++++++++--
22		build_tools/mozc_version.py \| 11 +++++
23		client/session.cc \| 2 +-
24		dictionary/dictionary_preloader.cc \| 4 +-
25		gui/base/locale_util.cc \| 2 +-
26		gui/config_dialog/config_dialog.cc \| 8 ++--
27		gui/config_dialog/keybinding_editor.cc \| 2 +-
28		gui/config_dialog/keymap_editor.cc \| 4 +-
29		gui/dictionary_tool/dictionary_tool.cc \| 2 +-
30		gui/qt_common.gypi \| 2 +-
31		gui/qt_libraries.gypi \| 2 +-
32		gui/qt_moc.gypi \| 2 +-
33		gui/qt_rcc.gypi \| 2 +-
34		gui/qt_target_default.gypi \| 2 +-
35		gui/qt_uic.gypi \| 2 +-
36		gyp/common.gypi \| 51 +++++++++++++++++++++++-
37		ipc/ipc_path_manager.cc \| 6 +-
38		ipc/unix_ipc.cc \| 12 +++--
39		protobuf/genproto.gypi \| 2 +-
40		protobuf/protobuf.gyp \| 4 +-
41		testing/testing.gyp \| 2 +-
42		35 files changed, 190 insertions(+), 66 deletions(-)
43
44	0	diff --git a/base/const.h b/base/const.h
45		index 3d76bc9..16e041b 100755
	1	index dd6d3e9..e252ae9 100755
46	2	--- a/base/const.h
47	3	+++ b/base/const.h
48		@@ -109,7 +109,7 @@ const char kEventPathPrefix[] = "GoogleJapaneseInput.event.";
	4	@@ -107,7 +107,7 @@ const char kEventPathPrefix[] = "GoogleJapaneseInput.event.";
49	5	#else
50	6	const char kEventPathPrefix[] = "Mozc.event.";
51	7	#endif // GOOGLE_JAPANESE_INPUT_BUILD

55	11	const char kEventPathPrefix[] = "mozc.event.";
56	12	const char kMozcTool[] = "mozc_tool";
57	13	diff --git a/base/cpu_stats.cc b/base/cpu_stats.cc
58		index 7279ff6..3b785ca 100755
	14	index ef7ee3d..59094d9 100755
59	15	--- a/base/cpu_stats.cc
60	16	+++ b/base/cpu_stats.cc
61	17	@@ -122,7 +122,7 @@ float CPUStats::GetSystemCPULoad() {

86	42	return 1;
87	43	#endif // OS_LINUX
88	44	diff --git a/base/flags.h b/base/flags.h
89		index 2767113..81567c4 100755
	45	index cc524c3..b2d8e79 100755
90	46	--- a/base/flags.h
91	47	+++ b/base/flags.h
92	48	@@ -76,7 +76,7 @@ namespace {

99	55	CrashReportHandler::Initialize(false);
100	56	}
101	57	diff --git a/base/iconv.cc b/base/iconv.cc
102		index e61031a..3ebd0eb 100755
	58	index 79976b2..568395c 100755
103	59	--- a/base/iconv.cc
104	60	+++ b/base/iconv.cc
105	61	@@ -52,7 +52,11 @@ void IconvHelper(iconv_t ic, const string &input, string *output) {

115	71	return;
116	72	}
117	73	diff --git a/base/logging.cc b/base/logging.cc
118		index 3ba399b..cdba4a2 100755
	74	index 6acf323..4a3e094 100755
119	75	--- a/base/logging.cc
120	76	+++ b/base/logging.cc
121	77	@@ -212,7 +212,7 @@ string Logging::GetLogMessageHeader() {

128	84	#else
129	85	"%lu",
130	86	diff --git a/base/mutex.cc b/base/mutex.cc
131		index 36f4dc3..79ed9b3 100755
	87	index 433d954..2b3b01a 100755
132	88	--- a/base/mutex.cc
133	89	+++ b/base/mutex.cc
134	90	@@ -44,7 +44,8 @@ namespace mozc {

142	98	inline int InterlockedCompareExchange(volatile int *target,
143	99	int new_value,
144	100	diff --git a/base/mutex.h b/base/mutex.h
145		index 6d2d1e4..0f19a80 100755
	101	index 5af82b9..07e280b 100755
146	102	--- a/base/mutex.h
147	103	+++ b/base/mutex.h
148	104	@@ -86,10 +86,14 @@ class Mutex {

162	118	pthread_mutexattr_init(&attr);
163	119	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_VALUE);
164	120	diff --git a/base/password_manager.cc b/base/password_manager.cc
165		index ce4cbdb..93f4490 100755
	121	index 2a25e28..6b3b37e 100755
166	122	--- a/base/password_manager.cc
167	123	+++ b/base/password_manager.cc
168	124	@@ -358,7 +358,7 @@ class MacPasswordManager : public PasswordManagerInterface {

175	131	#endif
176	132
177	133	diff --git a/base/process.cc b/base/process.cc
178		index 57fb70e..b9c134d 100755
	134	index 8f30cc4..7381959 100755
179	135	--- a/base/process.cc
180	136	+++ b/base/process.cc
181	137	@@ -52,7 +52,7 @@

215	171	const string arg = "--mode=error_message_dialog --error_type=" + error_type;
216	172	size_t pid = 0;
217	173	diff --git a/base/run_level.cc b/base/run_level.cc
218		index 87b0f0a..1578ad8 100755
	174	index 6e9d53a..8652937 100755
219	175	--- a/base/run_level.cc
220	176	+++ b/base/run_level.cc
221	177	@@ -38,7 +38,7 @@

228	184	#include <sys/types.h>
229	185	#endif
230	186	diff --git a/base/stats_config_util.cc b/base/stats_config_util.cc
231		index d6a15ab..3588905 100755
	187	index 9c53383..057280a 100755
232	188	--- a/base/stats_config_util.cc
233	189	+++ b/base/stats_config_util.cc
234	190	@@ -336,7 +336,7 @@ bool MacStatsConfigUtilImpl::SetEnabled(bool val) {

241	197	// TODO(toshiyuki): implement this
242	198	public:
243	199	diff --git a/base/stats_config_util_test.cc b/base/stats_config_util_test.cc
244		index 3052d86..fab4aa2 100755
	200	index 9e15918..461e9ef 100755
245	201	--- a/base/stats_config_util_test.cc
246	202	+++ b/base/stats_config_util_test.cc
247	203	@@ -840,7 +840,7 @@ TEST_F(StatsConfigUtilTestWin,

254	210	EXPECT_FALSE(mozc::StatsConfigUtil::IsEnabled());
255	211	}
256	212	diff --git a/base/stopwatch.cc b/base/stopwatch.cc
257		index 5224b36..1b512d9 100755
	213	index 15afad3..8ff2e29 100755
258	214	--- a/base/stopwatch.cc
259	215	+++ b/base/stopwatch.cc
260	216	@@ -39,7 +39,7 @@

285	241	if (-1 == clock_gettime(CLOCK_REALTIME, &timestamp)) {
286	242	return 0;
287	243	diff --git a/base/util.cc b/base/util.cc
288		index 6053277..f3be423 100755
	244	index 047df55..58064df 100755
289	245	--- a/base/util.cc
290	246	+++ b/base/util.cc
291		@@ -1724,7 +1724,7 @@ string Util::GetServerDirectory() {
	247	@@ -1831,7 +1831,7 @@ string Util::GetServerDirectory() {
292	248	return MacUtil::GetServerDirectory();
293	249	#endif // OS_MACOSX
294	250

297	253	return "/usr/lib/mozc";
298	254	#endif // OS_LINUX
299	255	}
300		@@ -1804,7 +1804,7 @@ string GetObjectNameAsString(HANDLE handle) {
	256	@@ -1911,7 +1911,7 @@ string GetObjectNameAsString(HANDLE handle) {
301	257	#endif
302	258
303	259	string Util::GetDesktopNameAsString() {

306	262	const char *display = getenv("DISPLAY");
307	263	if (display == NULL) {
308	264	return "";
309		@@ -2248,7 +2248,7 @@ bool Util::IsPlatformSupported() {
	265	@@ -2379,7 +2379,7 @@ bool Util::IsPlatformSupported() {
310	266	#if defined(OS_MACOSX)
311	267	// TODO(yukawa): support Mac.
312	268	return true;

315	271	// TODO(yukawa): support Linux.
316	272	return true;
317	273	#elif defined(OS_WINDOWS)
318		@@ -2619,18 +2619,19 @@ string Util::GetOSVersionString() {
	274	@@ -2750,18 +2750,19 @@ string Util::GetOSVersionString() {
319	275	} else {
320	276	LOG(WARNING) << "GetVersionEx failed";
321	277	}

339	295	}
340	296
341	297	void Util::DisableIME() {
342		@@ -2664,7 +2665,7 @@ uint64 Util::GetTotalPhysicalMemory() {
	298	@@ -2795,7 +2796,7 @@ uint64 Util::GetTotalPhysicalMemory() {
343	299	return 0;
344	300	}
345	301	return total_memory;

348	304	#if defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
349	305	const long page_size = sysconf(_SC_PAGESIZE);
350	306	const long number_of_phyisical_pages = sysconf(_SC_PHYS_PAGES);
351		@@ -2690,7 +2691,7 @@ void Util::PreloadMappedRegion(const void *begin,
	307	@@ -2821,7 +2822,7 @@ void Util::PreloadMappedRegion(const void *begin,
352	308	::ZeroMemory(&system_info, sizeof(system_info));
353	309	::GetSystemInfo(&system_info);
354	310	const size_t page_size = system_info.dwPageSize;

358	314	const size_t page_size = sysconf(_SC_PAGESIZE);
359	315	#else
360	316	diff --git a/build_mozc.py b/build_mozc.py
361		index 3ac32e4..0eb8445 100755
	317	index 8e64c3e..88147e8 100755
362	318	--- a/build_mozc.py
363	319	+++ b/build_mozc.py
364		@@ -71,6 +71,14 @@ def IsLinux():
	320	@@ -72,6 +72,14 @@ def IsLinux():
365	321	"""Returns true if the platform is Linux."""
366	322	return os.name == 'posix' and os.uname()[0] == 'Linux'
367	323

376	332
377	333	# TODO(yukawa): Move this function to util.py (b/2715400)
378	334	def GetNumberOfProcessors():
379		@@ -86,7 +94,7 @@ def GetNumberOfProcessors():
	335	@@ -87,7 +95,7 @@ def GetNumberOfProcessors():
380	336	commands = ['sysctl', '-n', 'hw.ncpu']
381	337	process = subprocess.Popen(commands, stdout=subprocess.PIPE)
382	338	return int(process.communicate()[0])

385	341	# Count the number of 'vendor_id' in /proc/cpuinfo, assuming that
386	342	# each line corresponds to one logical CPU.
387	343	cpuinfo = open('/proc/cpuinfo', 'r')
388		@@ -183,7 +191,7 @@ def GetGypFileNames():
	344	@@ -184,7 +192,7 @@ def GetGypFileNames():
389	345	gyp_file_names.extend(glob.glob('%s/win32//.gyp' % SRC_DIR))
390	346	gyp_file_names.extend(glob.glob('third_party/breakpad/*.gyp'))
391	347	gyp_file_names.append('third_party/mozc/sandbox/sandbox.gyp')

394	350	gyp_file_names.extend(glob.glob('%s/unix//.gyp' % SRC_DIR))
395	351	# Add ibus.gyp if ibus is installed.
396	352	# Ubuntu 8.04 (Hardy) does not contain ibus package.
397		@@ -256,7 +264,7 @@ def CleanBuildFilesAndDirectories():
	353	@@ -257,7 +265,7 @@ def CleanBuildFilesAndDirectories():
398	354	elif IsMac():
399	355	directory_names.extend(glob.glob(os.path.join(gyp_directory_name,
400	356	'*.xcodeproj')))

403	359	file_names.extend(glob.glob(os.path.join(gyp_directory_name,
404	360	'*.target.mk')))
405	361	file_names.append('%s/mozc_version.txt' % SRC_DIR)
406		@@ -270,6 +278,10 @@ def CleanBuildFilesAndDirectories():
	362	@@ -271,6 +279,10 @@ def CleanBuildFilesAndDirectories():
407	363	file_names.append('Makefile')
408	364	elif IsWindows():
409	365	file_names.append('third_party/breakpad/breakpad.gyp')

414	370	# Remove files.
415	371	for file_name in file_names:
416	372	RemoveFile(file_name)
417		@@ -351,6 +363,8 @@ def GypMain(deps_file_name):
	373	@@ -357,6 +369,8 @@ def GypMain(deps_file_name):
418	374	command_line.extend(['-D', 'use_qt=NO'])
419	375	if options.coverage:
420	376	command_line.extend(['-D', 'coverage=1'])

423	379
424	380	command_line.extend(['-D', 'build_base=%s' % GetBuildBaseName(options)])
425	381
426		@@ -393,6 +407,8 @@ def RunTests(configuration, calculate_coverage):
	382	@@ -402,6 +416,8 @@ def RunTests(configuration, unused_calculate_coverage):
427	383	base_path = os.path.join('out_linux', configuration)
428	384	elif IsWindows():
429	385	base_path = os.path.join('out_win', configuration)

432	388	else:
433	389	logging.error('Unsupported platform: %s', os.name)
434	390	return
435		@@ -536,13 +552,14 @@ def ParseGypOptions():
436		parser.add_option('--build_base', dest='build_base',
437		help='specify the base directory of the built binaries.')
	391	@@ -550,13 +566,14 @@ def ParseGypOptions():
	392	'This flag is false by default because it may require you '
	393	'to install libchewing in your environment.')
438	394
439	395	-
440	396	# Linux environment can build both for Linux and ChromeOS.

448	404	(options, unused_args) = parser.parse_args()
449	405	return options
450	406
451		@@ -655,6 +672,7 @@ def BuildOnLinux(options, targets):
	407	@@ -674,6 +691,7 @@ def BuildOnLinux(options, targets):
452	408	target_names.append(target_name)
453	409
454	410	make_command = os.getenv('BUILD_COMMAND', 'make')

456	412	# flags for building in Chrome OS chroot environment
457	413	envvars = [
458	414	'CFLAGS',
459		@@ -669,7 +687,7 @@ def BuildOnLinux(options, targets):
	415	@@ -688,7 +706,7 @@ def BuildOnLinux(options, targets):
460	416	for envvar in envvars:
461	417	if envvar in os.environ:
462	418	os.environ[envvar] = os.getenv(envvar)

465	421	# set output directory
466	422	os.environ['builddir_name'] = 'out_linux'
467	423
468		@@ -679,6 +697,42 @@ def BuildOnLinux(options, targets):
	424	@@ -698,6 +716,42 @@ def BuildOnLinux(options, targets):
469	425
470	426	RunOrDie([make_command] + build_args + target_names)
471	427

508	464
509	465	def CheckFileOrDie(file_name):
510	466	"""Check the file exists or dies if not."""
511		@@ -771,6 +825,8 @@ def BuildMain(original_directory_name):
	467	@@ -790,6 +844,8 @@ def BuildMain(original_directory_name):
512	468	BuildOnMac(options, targets, original_directory_name)
513	469	elif IsLinux():
514	470	BuildOnLinux(options, targets)

518	474	BuildOnWindows(options, targets, original_directory_name)
519	475	else:
520	476	diff --git a/build_tools/mozc_version.py b/build_tools/mozc_version.py
521		index 42af980..700cf53 100755
	477	index 0717592..52d8477 100755
522	478	--- a/build_tools/mozc_version.py
523	479	+++ b/build_tools/mozc_version.py
524	480	@@ -57,6 +57,13 @@ def IsLinux():

547	503	return revision[0:-1] + last_digit
548	504
549	505	diff --git a/client/session.cc b/client/session.cc
550		index 4557a0a..72c10f6 100755
	506	index 9b113d1..8d36ef5 100755
551	507	--- a/client/session.cc
552	508	+++ b/client/session.cc
553		@@ -847,7 +847,7 @@ bool Session::LaunchTool(const string &mode, const string &extra_arg) {
	509	@@ -848,7 +848,7 @@ bool Session::LaunchTool(const string &mode, const string &extra_arg) {
554	510	return false;
555	511	}
556	512

560	516	if (!extra_arg.empty()) {
561	517	arg += " ";
562	518	diff --git a/dictionary/dictionary_preloader.cc b/dictionary/dictionary_preloader.cc
563		index c9a7044..b023ffc 100755
	519	index 5c08288..baf8858 100755
564	520	--- a/dictionary/dictionary_preloader.cc
565	521	+++ b/dictionary/dictionary_preloader.cc
566	522	@@ -89,7 +89,7 @@ bool IsPreloadable(const char *image, size_t size) {

582	538	return;
583	539	}
584	540	diff --git a/gui/base/locale_util.cc b/gui/base/locale_util.cc
585		index 2e32f21..a825086 100755
	541	index 827fd28..52c881b 100755
586	542	--- a/gui/base/locale_util.cc
587	543	+++ b/gui/base/locale_util.cc
588	544	@@ -198,7 +198,7 @@ TranslationDataImpl::TranslationDataImpl()

595	551	// Even if the locale is not English nor Japanese, load translation
596	552	// file to translate common messages like "OK" and "Cancel".
597	553	diff --git a/gui/config_dialog/config_dialog.cc b/gui/config_dialog/config_dialog.cc
598		index bb0f4ee..74e08fd 100755
	554	index 9ca0af8..02b13ed 100755
599	555	--- a/gui/config_dialog/config_dialog.cc
600	556	+++ b/gui/config_dialog/config_dialog.cc
601	557	@@ -74,11 +74,11 @@ ConfigDialog::ConfigDialog()

631	587	static_cast<int>(config.preedit_method()) \|\|
632	588	initial_use_keyboard_to_change_preedit_method_ !=
633	589	diff --git a/gui/config_dialog/keybinding_editor.cc b/gui/config_dialog/keybinding_editor.cc
634		index 6749dcb..17d90da 100755
	590	index f3301d0..9247dcd 100755
635	591	--- a/gui/config_dialog/keybinding_editor.cc
636	592	+++ b/gui/config_dialog/keybinding_editor.cc
637	593	@@ -443,7 +443,7 @@ bool KeyBindingFilter::eventFilter(QObject obj, QEvent event) {

644	600	// Seems that even after clicking the button for the keybinding dialog,
645	601	// the edit is not raised. This might be a bug of setFocusProxy.
646	602	diff --git a/gui/config_dialog/keymap_editor.cc b/gui/config_dialog/keymap_editor.cc
647		index adfe645..ebbe3f2 100755
	603	index 5bc096d..c3b45d3 100755
648	604	--- a/gui/config_dialog/keymap_editor.cc
649	605	+++ b/gui/config_dialog/keymap_editor.cc
650		@@ -93,7 +93,7 @@ class KeyMapValidator {
	606	@@ -94,7 +94,7 @@ class KeyMapValidator {
651	607	invisible_commands_.insert(kReportBugCommand);
652	608	// Old command name.
653	609	invisible_commands_.insert(kEditInsertCommand);

656	612	// On Mac/Linux, we cannot customize keybindings for IME ON/OFF
657	613	// So we do not show them.
658	614	// TODO(toshiyuki): remove them after implimenting IME ON/OFF for Mac
659		@@ -446,7 +446,7 @@ bool KeyMapEditorDialog::Update() {
	615	@@ -447,7 +447,7 @@ bool KeyMapEditorDialog::Update() {
660	616	*keymap_table += invisible_keymap_table_;
661	617
662	618	if (new_ime_switch_keymap != ime_switch_keymap_) {

666	622	this,
667	623	tr("Mozc settings"),
668	624	diff --git a/gui/dictionary_tool/dictionary_tool.cc b/gui/dictionary_tool/dictionary_tool.cc
669		index 44e6b12..a18ca29 100755
	625	index 3bfc372..525b4ff 100755
670	626	--- a/gui/dictionary_tool/dictionary_tool.cc
671	627	+++ b/gui/dictionary_tool/dictionary_tool.cc
672		@@ -304,7 +304,7 @@ DictionaryTool::DictionaryTool(QWidget *parent)
	628	@@ -305,7 +305,7 @@ DictionaryTool::DictionaryTool(QWidget *parent)
673	629	}
674	630
675	631	// main window

679	635	// TODO(taku): investigate the cause of the crashes
680	636	setCentralWidget(splitter_);
681	637	diff --git a/gui/qt_common.gypi b/gui/qt_common.gypi
682		index 66112ed..6d82f54 100755
	638	index ba6989a..ff9a5c5 100755
683	639	--- a/gui/qt_common.gypi
684	640	+++ b/gui/qt_common.gypi
685	641	@@ -33,7 +33,7 @@

692	648	},{ # OS!="linux"
693	649	'qt_cflags': '<(qt_basepath)/include',
694	650	diff --git a/gui/qt_libraries.gypi b/gui/qt_libraries.gypi
695		index c1b905a..597daa1 100755
	651	index 8b035cf..731b7ce 100755
696	652	--- a/gui/qt_libraries.gypi
697	653	+++ b/gui/qt_libraries.gypi
698	654	@@ -44,7 +44,7 @@

705	661	'libraries': [
706	662	' <!@(pkg-config --libs QtCore QtGui)',
707	663	diff --git a/gui/qt_moc.gypi b/gui/qt_moc.gypi
708		index f0992a2..bef23fe 100755
	664	index 81e6015..d768b10 100755
709	665	--- a/gui/qt_moc.gypi
710	666	+++ b/gui/qt_moc.gypi
711	667	@@ -31,7 +31,7 @@

718	674	},{ # OS!="linux"
719	675	'moc_path': '<(qt_basepath)/bin/moc<(EXECUTABLE_SUFFIX)',
720	676	diff --git a/gui/qt_rcc.gypi b/gui/qt_rcc.gypi
721		index 2dd06c6..d163695 100755
	677	index 0649510..33637da 100755
722	678	--- a/gui/qt_rcc.gypi
723	679	+++ b/gui/qt_rcc.gypi
724	680	@@ -31,7 +31,7 @@

731	687	'rcc_path': '<!(pkg-config --variable=exec_prefix QtGui)/bin/rcc',
732	688	},{ # OS!="linux"
733	689	diff --git a/gui/qt_target_default.gypi b/gui/qt_target_default.gypi
734		index c168f75..b1aa629 100755
	690	index 855da5f..2a437af 100755
735	691	--- a/gui/qt_target_default.gypi
736	692	+++ b/gui/qt_target_default.gypi
737	693	@@ -91,7 +91,7 @@

744	700	'configurations': {
745	701	'Common_Base': {
746	702	diff --git a/gui/qt_uic.gypi b/gui/qt_uic.gypi
747		index cfaa397..1157c0e 100755
	703	index 8cb765d..c61af9f 100755
748	704	--- a/gui/qt_uic.gypi
749	705	+++ b/gui/qt_uic.gypi
750	706	@@ -31,7 +31,7 @@

757	713	},{ # OS!="linux"
758	714	'uic_path': '<(qt_basepath)/bin/uic<(EXECUTABLE_SUFFIX)',
759	715	diff --git a/gyp/common.gypi b/gyp/common.gypi
760		index bb8213f..3efd0fd 100755
	716	index 6a7e7a6..651469e 100755
761	717	--- a/gyp/common.gypi
762	718	+++ b/gyp/common.gypi
763		@@ -202,7 +202,7 @@
	719	@@ -206,7 +206,7 @@
764	720	},
765	721	},
766	722	'conditions': [

769	725	'cflags': [
770	726	'<@(debug_extra_cflags)',
771	727	],
772		@@ -241,7 +241,7 @@
	728	@@ -245,7 +245,7 @@
773	729	},
774	730	},
775	731	'conditions': [

778	734	'cflags': [
779	735	'<@(release_extra_cflags)',
780	736	],
781		@@ -453,6 +453,51 @@
	737	@@ -457,6 +457,51 @@
782	738	}],
783	739	],
784	740	}],

830	786	['OS=="mac"', {
831	787	'defines': [
832	788	'OS_MACOSX',
833		@@ -508,7 +553,7 @@
	789	@@ -512,7 +557,7 @@
834	790	# Linux gyp (into scons) doesn't like target_conditions?
835	791	# TODO(team): track down why 'target_conditions' doesn't work
836	792	# on Linux gyp into scons like it does on Mac gyp into xcodeproj.

840	796	'-fprofile-arcs' ],
841	797	'link_settings': { 'libraries': [ '-lgcov' ] },
842	798	diff --git a/ipc/ipc_path_manager.cc b/ipc/ipc_path_manager.cc
843		index 392ee0d..60924cb 100755
	799	index da0fa0c..2c9590c 100755
844	800	--- a/ipc/ipc_path_manager.cc
845	801	+++ b/ipc/ipc_path_manager.cc
846	802	@@ -265,7 +265,7 @@ bool IPCPathManager::GetPathName(string *ipc_name) {

871	827	LOG(WARNING) << server_path << " on disk is modified";
872	828	// If a user updates the server binary on disk during the server is running,
873	829	diff --git a/ipc/unix_ipc.cc b/ipc/unix_ipc.cc
874		index dce1541..158e872 100755
	830	index 3085320..5e8c080 100755
875	831	--- a/ipc/unix_ipc.cc
876	832	+++ b/ipc/unix_ipc.cc
877	833	@@ -28,7 +28,8 @@

919	875	+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\|\
920	876	+ // defined(OS_FREEBSD) \|\| defined(OS_GNU_KFREEBSD)
921	877	diff --git a/protobuf/genproto.gypi b/protobuf/genproto.gypi
922		index b5aba7f..8f209cb 100755
	878	index 38d8eef..b821e7c 100755
923	879	--- a/protobuf/genproto.gypi
924	880	+++ b/protobuf/genproto.gypi
925	881	@@ -39,7 +39,7 @@

932	888	'protoc_command%': '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
933	889	},
934	890	diff --git a/protobuf/protobuf.gyp b/protobuf/protobuf.gyp
935		index 0b8ca63..449167c 100755
	891	index 40fc11f..67b244a 100755
936	892	--- a/protobuf/protobuf.gyp
937	893	+++ b/protobuf/protobuf.gyp
938	894	@@ -116,7 +116,7 @@

954	910	'../gyp/install_build_tool.gypi',
955	911	],
956	912	diff --git a/testing/testing.gyp b/testing/testing.gyp
957		index 22a659c..1dd505c 100755
	913	index ac62b03..03a99f5 100755
958	914	--- a/testing/testing.gyp
959	915	+++ b/testing/testing.gyp
960	916	@@ -49,7 +49,7 @@

966	922	'dependencies': [
967	923	'testing',
968	924	],
969		--
970		1.7.4.1
971