Package list mozc / 6b2e755
Update kfreebsd patch Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> Nobuhiro Iwamatsu 9 years ago
1 changed file(s) with 119 addition(s) and 128 deletion(s). Raw diff Collapse all Expand all
00 diff --git a/base/cpu_stats.cc b/base/cpu_stats.cc
1 index ef7ee3d..59094d9 100755
1 index e915b35..1dcd91c 100755
22 --- a/base/cpu_stats.cc
33 +++ b/base/cpu_stats.cc
44 @@ -122,7 +122,7 @@ float CPUStats::GetSystemCPULoad() {
2929 return 1;
3030 #endif // OS_LINUX
3131 diff --git a/base/flags.h b/base/flags.h
32 index 18b9c58..fdb210d 100755
32 index 4b2004f..838f2e5 100755
3333 --- a/base/flags.h
3434 +++ b/base/flags.h
3535 @@ -75,7 +75,7 @@ extern void InitGoogleInternal(const char *arg0,
4242 CrashReportHandler::Initialize(false);
4343 }
4444 diff --git a/base/iconv.cc b/base/iconv.cc
45 index 79976b2..568395c 100755
45 index ee05938..da0f058 100755
4646 --- a/base/iconv.cc
4747 +++ b/base/iconv.cc
4848 @@ -52,7 +52,11 @@ void IconvHelper(iconv_t ic, const string &input, string *output) {
5858 return;
5959 }
6060 diff --git a/base/logging.cc b/base/logging.cc
61 index 6acf323..4a3e094 100755
61 index ffeb703..5d0d104 100755
6262 --- a/base/logging.cc
6363 +++ b/base/logging.cc
6464 @@ -212,7 +212,7 @@ string Logging::GetLogMessageHeader() {
7171 #else
7272 "%lu",
7373 diff --git a/base/mutex.cc b/base/mutex.cc
74 index 433d954..2b3b01a 100755
74 index 14c110f..55045bd 100755
7575 --- a/base/mutex.cc
7676 +++ b/base/mutex.cc
7777 @@ -44,7 +44,8 @@ namespace mozc {
8585 inline int InterlockedCompareExchange(volatile int *target,
8686 int new_value,
8787 diff --git a/base/mutex.h b/base/mutex.h
88 index 5af82b9..07e280b 100755
88 index 7bbcfb3..f77148e 100755
8989 --- a/base/mutex.h
9090 +++ b/base/mutex.h
9191 @@ -86,10 +86,14 @@ class Mutex {
105105 pthread_mutexattr_init(&attr);
106106 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_VALUE);
107107 diff --git a/base/password_manager.cc b/base/password_manager.cc
108 index cf0b422..61a381f 100755
108 index aa8b6b4..d508c5d 100755
109109 --- a/base/password_manager.cc
110110 +++ b/base/password_manager.cc
111111 @@ -363,7 +363,7 @@ class DeprecatedMacPasswordManager : public PasswordManagerInterface {
118118 #endif
119119
120120 diff --git a/base/process.cc b/base/process.cc
121 index c230b31..2d5859a 100755
121 index 51eae95..aca659c 100755
122122 --- a/base/process.cc
123123 +++ b/base/process.cc
124124 @@ -51,7 +51,7 @@
158158 const string arg = "--mode=error_message_dialog --error_type=" + error_type;
159159 size_t pid = 0;
160160 diff --git a/base/run_level.cc b/base/run_level.cc
161 index cd7a42b..b82354b 100755
161 index 3523b04..777dcad 100755
162162 --- a/base/run_level.cc
163163 +++ b/base/run_level.cc
164164 @@ -38,7 +38,7 @@
171171 #include <sys/types.h>
172172 #endif
173173 diff --git a/base/stopwatch.cc b/base/stopwatch.cc
174 index 15afad3..8ff2e29 100755
174 index 04edac3..d9ed9a8 100755
175175 --- a/base/stopwatch.cc
176176 +++ b/base/stopwatch.cc
177177 @@ -39,7 +39,7 @@
202202 if (-1 == clock_gettime(CLOCK_REALTIME, &timestamp)) {
203203 return 0;
204204 diff --git a/base/thread.h b/base/thread.h
205 index 681c3f6..e1d9ecf 100755
205 index 25417e1..98e2e60 100755
206206 --- a/base/thread.h
207207 +++ b/base/thread.h
208208 @@ -58,10 +58,10 @@
219219
220220 // OSX doesn't support Thread Local Storage.
221221 diff --git a/base/util.cc b/base/util.cc
222 index 484cd63..d44e002 100755
222 index 24a7258..0ddf669 100755
223223 --- a/base/util.cc
224224 +++ b/base/util.cc
225 @@ -2592,7 +2592,7 @@ string Util::GetServerDirectory() {
225 @@ -2636,7 +2636,7 @@ string Util::GetServerDirectory() {
226226 return MacUtil::GetServerDirectory();
227227 #endif // OS_MACOSX
228228
231231 return "/usr/lib/mozc";
232232 #endif // OS_LINUX
233233 }
234 @@ -2671,7 +2671,7 @@ string GetObjectNameAsString(HANDLE handle) {
234 @@ -2715,7 +2715,7 @@ string GetObjectNameAsString(HANDLE handle) {
235235 #endif
236236
237237 string Util::GetDesktopNameAsString() {
240240 const char *display = getenv("DISPLAY");
241241 if (display == NULL) {
242242 return "";
243 @@ -3167,7 +3167,7 @@ bool Util::IsPlatformSupported() {
243 @@ -3211,7 +3211,7 @@ bool Util::IsPlatformSupported() {
244244 #if defined(OS_MACOSX)
245245 // TODO(yukawa): support Mac.
246246 return true;
249249 // TODO(yukawa): support Linux.
250250 return true;
251251 #elif defined(OS_WINDOWS)
252 @@ -3587,18 +3587,19 @@ string Util::GetOSVersionString() {
252 @@ -3631,18 +3631,19 @@ string Util::GetOSVersionString() {
253253 } else {
254254 LOG(WARNING) << "GetVersionEx failed";
255255 }
273273 }
274274
275275 void Util::DisableIME() {
276 @@ -3632,7 +3633,7 @@ uint64 Util::GetTotalPhysicalMemory() {
276 @@ -3676,7 +3677,7 @@ uint64 Util::GetTotalPhysicalMemory() {
277277 return 0;
278278 }
279279 return total_memory;
282282 #if defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
283283 const long page_size = sysconf(_SC_PAGESIZE);
284284 const long number_of_phyisical_pages = sysconf(_SC_PHYS_PAGES);
285 @@ -3658,7 +3659,7 @@ void Util::PreloadMappedRegion(const void *begin,
285 @@ -3702,7 +3703,7 @@ void Util::PreloadMappedRegion(const void *begin,
286286 ::ZeroMemory(&system_info, sizeof(system_info));
287287 ::GetSystemInfo(&system_info);
288288 const size_t page_size = system_info.dwPageSize;
292292 const size_t page_size = sysconf(_SC_PAGESIZE);
293293 #else
294294 diff --git a/build_mozc.py b/build_mozc.py
295 index a08f8c5..5adcbfa 100755
295 index 63c75e7..bc0f0f3 100755
296296 --- a/build_mozc.py
297297 +++ b/build_mozc.py
298298 @@ -72,6 +72,14 @@ def IsLinux():
337337 gyp_file_names.extend(glob.glob('%s/unix/*/*.gyp' % SRC_DIR))
338338 # Add ibus.gyp if ibus is installed.
339339 # Ubuntu 8.04 (Hardy) does not contain ibus package.
340 @@ -362,6 +372,7 @@ def AddCommonOptions(parser):
340 @@ -366,6 +376,7 @@ def AddCommonOptions(parser):
341341 help='If you want ChromeOS build, specify "ChromeOS"')
342342 parser.add_option('--language', dest='language', default='japanese',
343343 help='Specify the target language to build.')
345345 return parser
346346
347347
348 @@ -459,7 +470,7 @@ def ExpandMetaTarget(meta_target_name, target_platform):
348 @@ -485,7 +496,7 @@ def ExpandMetaTarget(meta_target_name, target_platform):
349349 targets = ['%s/unix/ibus/ibus.gyp:ibus_mozc',
350350 '%s/server/server.gyp:mozc_server',
351351 '%s/gui/gui.gyp:mozc_tool']
354354 targets = ['%s/unix/ibus/ibus.gyp:ibus_mozc',
355355 '%s/server/server.gyp:mozc_server',
356356 '%s/gui/gui.gyp:mozc_tool']
357 @@ -579,6 +590,9 @@ def GypMain(options, unused_args):
357 @@ -600,6 +611,9 @@ def GypMain(options, unused_args):
358358 else:
359359 command_line.extend(['-D', 'use_wix=NO'])
360360
364364 command_line.extend(['-D', 'build_base=%s' % GetBuildBaseName(options)])
365365
366366
367 @@ -616,7 +630,7 @@ def GypMain(options, unused_args):
367 @@ -658,7 +672,7 @@ def GypMain(options, unused_args):
368368 # command for pkg-config. Here we catch the environment variable
369369 # and use the specified command instead of actual pkg-config
370370 # command.
373373 command_line.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()])
374374 else:
375375 command_line.extend(['-D', 'pkg_config_command='])
376 @@ -714,6 +728,42 @@ def BuildOnLinux(options, targets, unused_original_directory_name):
376 @@ -763,6 +777,42 @@ def BuildOnLinux(options, targets, unused_original_directory_name):
377377
378378 RunOrDie([make_command] + build_args + target_names)
379379
416416
417417 def CheckFileOrDie(file_name):
418418 """Check the file exists or dies if not."""
419 @@ -877,6 +927,8 @@ def BuildMain(options, targets, original_directory_name):
419 @@ -928,6 +978,8 @@ def BuildMain(options, targets, original_directory_name):
420420 BuildOnMac(options, targets, original_directory_name)
421421 elif IsLinux():
422422 BuildOnLinux(options, targets, original_directory_name)
425425 elif IsWindows():
426426 BuildOnWindows(options, targets, original_directory_name)
427427 else:
428 @@ -1000,7 +1052,7 @@ def CleanBuildFilesAndDirectories(options, unused_args):
428 @@ -1052,7 +1104,7 @@ def CleanBuildFilesAndDirectories(options, unused_args):
429429 elif IsMac():
430430 directory_names.extend(glob.glob(os.path.join(gyp_directory_name,
431431 '*.xcodeproj')))
434434 file_names.extend(glob.glob(os.path.join(gyp_directory_name,
435435 '*.target.mk')))
436436 file_names.extend(glob.glob(os.path.join(gyp_directory_name,
437 @@ -1019,6 +1071,10 @@ def CleanBuildFilesAndDirectories(options, unused_args):
437 @@ -1072,6 +1124,10 @@ def CleanBuildFilesAndDirectories(options, unused_args):
438438 file_names.append('Makefile')
439439 elif IsWindows():
440440 file_names.append('third_party/breakpad/breakpad.gyp')
445445 # Remove files.
446446 for file_name in file_names:
447447 RemoveFile(file_name)
448 @@ -1045,7 +1101,6 @@ def ShowHelpAndExit():
448 @@ -1098,7 +1154,6 @@ def ShowHelpAndExit():
449449 print 'See also the comment in the script for typical usage.'
450450 sys.exit(1)
451451
454454 if len(sys.argv) < 2:
455455 ShowHelpAndExit()
456456 diff --git a/build_tools/mozc_version.py b/build_tools/mozc_version.py
457 index 04d644b..b3ed870 100755
457 index 9f49021..1951dd9 100755
458458 --- a/build_tools/mozc_version.py
459459 +++ b/build_tools/mozc_version.py
460460 @@ -58,6 +58,13 @@ def IsLinux():
482482 if last_digit:
483483 return revision[0:-1] + last_digit
484484
485 diff --git a/chrome/skk/skk.gyp b/chrome/skk/skk.gyp
486 index 578bb5a..ef5c74a 100755
487 --- a/chrome/skk/skk.gyp
488 +++ b/chrome/skk/skk.gyp
489 @@ -42,7 +42,7 @@
490 'configuration_nacl_i686': '<(CONFIGURATION_NAME)_NaCl_i686',
491 'configuration_nacl_x86_64': '<(CONFIGURATION_NAME)_NaCl_x86-64',
492 'conditions': [
493 - ['OS=="linux"', {
494 + ['OS=="linux" or OS=="gnu-kfreebsd"', {
495 # We need to copy binaries for NaCl i686 and x86-64 into a single skk
496 # directory across configurations. The following variables must be
497 # the same as <(PRODUCT_DIR) for each configuration.
485498 diff --git a/config/stats_config_util_test.cc b/config/stats_config_util_test.cc
486 index a49dd08..61fda2e 100755
499 index c13fdeb..de22cee 100755
487500 --- a/config/stats_config_util_test.cc
488501 +++ b/config/stats_config_util_test.cc
489502 @@ -690,7 +690,7 @@ TEST_F(StatsConfigUtilTestWin, IsEnabled) {
496509 EXPECT_FALSE(mozc::StatsConfigUtil::IsEnabled());
497510 }
498511 diff --git a/gui/base/locale_util.cc b/gui/base/locale_util.cc
499 index 827fd28..52c881b 100755
512 index 8089f8e..4f411a7 100755
500513 --- a/gui/base/locale_util.cc
501514 +++ b/gui/base/locale_util.cc
502515 @@ -198,7 +198,7 @@ TranslationDataImpl::TranslationDataImpl()
509522 // Even if the locale is not English nor Japanese, load translation
510523 // file to translate common messages like "OK" and "Cancel".
511524 diff --git a/gui/config_dialog/config_dialog.cc b/gui/config_dialog/config_dialog.cc
512 index 5aee977..4df1942 100755
525 index c3dff57..460c94f 100755
513526 --- a/gui/config_dialog/config_dialog.cc
514527 +++ b/gui/config_dialog/config_dialog.cc
515528 @@ -73,11 +73,11 @@ ConfigDialog::ConfigDialog()
526539 #endif // NO_LOGGING
527540
528541 #if !defined(GOOGLE_JAPANESE_INPUT_BUILD)
529 @@ -277,7 +277,7 @@ ConfigDialog::ConfigDialog()
542 @@ -273,7 +273,7 @@ ConfigDialog::ConfigDialog()
530543 dictionaryPreloadingAndUACLabel->setVisible(false);
531544 #endif // OS_WINDOWS
532545
535548 // On Linux, disable all fields for UsageStats
536549 usageStatsLabel->setEnabled(false);
537550 usageStatsLabel->setVisible(false);
538 @@ -364,7 +364,7 @@ bool ConfigDialog::Update() {
551 @@ -362,7 +362,7 @@ bool ConfigDialog::Update() {
539552 }
540553
541554
545558 static_cast<int>(config.preedit_method()) ||
546559 initial_use_keyboard_to_change_preedit_method_ !=
547560 diff --git a/gui/config_dialog/keybinding_editor.cc b/gui/config_dialog/keybinding_editor.cc
548 index c17efc6..1239316 100755
561 index a28310a..fd3f01e 100755
549562 --- a/gui/config_dialog/keybinding_editor.cc
550563 +++ b/gui/config_dialog/keybinding_editor.cc
551 @@ -443,7 +443,7 @@ bool KeyBindingFilter::eventFilter(QObject *obj, QEvent *event) {
564 @@ -472,7 +472,7 @@ bool KeyBindingFilter::eventFilter(QObject *obj, QEvent *event) {
552565 KeyBindingEditor::KeyBindingEditor(QWidget *parent, QWidget *trigger_parent)
553566 : QDialog(parent), trigger_parent_(trigger_parent) {
554567 setupUi(this);
558571 // Seems that even after clicking the button for the keybinding dialog,
559572 // the edit is not raised. This might be a bug of setFocusProxy.
560573 diff --git a/gui/config_dialog/keymap_editor.cc b/gui/config_dialog/keymap_editor.cc
561 index 5bc096d..c3b45d3 100755
574 index 33ab590..4f8e217 100755
562575 --- a/gui/config_dialog/keymap_editor.cc
563576 +++ b/gui/config_dialog/keymap_editor.cc
564 @@ -94,7 +94,7 @@ class KeyMapValidator {
565 invisible_commands_.insert(kReportBugCommand);
566 // Old command name.
567 invisible_commands_.insert(kEditInsertCommand);
568 -#if defined(OS_MACOSX) || defined(OS_LINUX)
569 +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_GNU_KFREEBSD) || defined(OS_FREEBSD)
570 // On Mac/Linux, we cannot customize keybindings for IME ON/OFF
571 // So we do not show them.
572 // TODO(toshiyuki): remove them after implimenting IME ON/OFF for Mac
573577 @@ -447,7 +447,7 @@ bool KeyMapEditorDialog::Update() {
574578 *keymap_table += invisible_keymap_table_;
575579
580584 this,
581585 tr("Mozc settings"),
582586 diff --git a/gui/dictionary_tool/dictionary_tool.cc b/gui/dictionary_tool/dictionary_tool.cc
583 index b66f13e..20c3461 100755
587 index 2f60969..ac3bee8 100755
584588 --- a/gui/dictionary_tool/dictionary_tool.cc
585589 +++ b/gui/dictionary_tool/dictionary_tool.cc
586590 @@ -317,7 +317,7 @@ DictionaryTool::DictionaryTool(QWidget *parent)
593597 // TODO(taku): investigate the cause of the crashes
594598 setCentralWidget(splitter_);
595599 diff --git a/gui/gui.gyp b/gui/gui.gyp
596 index 37e4e44..bef1334 100755
600 index 038d204..e5efe44 100755
597601 --- a/gui/gui.gyp
598602 +++ b/gui/gui.gyp
599603 @@ -378,7 +378,7 @@
606610 'USE_LIBZINNIA',
607611 ],
608612 diff --git a/gui/qt_libraries.gypi b/gui/qt_libraries.gypi
609 index b406bc6..b564c1c 100755
613 index ba5bf3e..4f90f7d 100755
610614 --- a/gui/qt_libraries.gypi
611615 +++ b/gui/qt_libraries.gypi
612616 @@ -86,7 +86,7 @@
619623 ['qt_dir', {
620624 'libraries': [
621625 diff --git a/gui/zinnia.gyp b/gui/zinnia.gyp
622 index b4cd01c..481b280 100755
626 index e4d323a..dc6d8a9 100755
623627 --- a/gui/zinnia.gyp
624628 +++ b/gui/zinnia.gyp
625629 @@ -45,7 +45,7 @@
632636 ['use_libzinnia==1', {
633637 'link_settings': {
634638 diff --git a/gyp/common.gypi b/gyp/common.gypi
635 index 551f8bd..c0e0a5f 100755
639 index 3d70455..8e37814 100755
636640 --- a/gyp/common.gypi
637641 +++ b/gyp/common.gypi
638 @@ -238,7 +238,7 @@
642 @@ -261,7 +261,7 @@
639643 },
640644 },
641645 'conditions': [
644648 'cflags': [
645649 '<@(debug_extra_cflags)',
646650 ],
647 @@ -277,7 +277,7 @@
651 @@ -317,7 +317,7 @@
648652 },
649653 },
650654 'conditions': [
653657 'cflags': [
654658 '<@(release_extra_cflags)',
655659 ],
656 @@ -532,6 +532,51 @@
660 @@ -588,6 +588,51 @@
657661 }],
658662 ],
659663 }],
705709 ['OS=="mac"', {
706710 'defines': [
707711 'OS_MACOSX',
708 @@ -586,7 +631,7 @@
712 @@ -642,7 +687,7 @@
709713 # Linux gyp (into scons) doesn't like target_conditions?
710714 # TODO(team): track down why 'target_conditions' doesn't work
711715 # on Linux gyp into scons like it does on Mac gyp into xcodeproj.
714718 'cflags': [ '-ftest-coverage',
715719 '-fprofile-arcs' ],
716720 'link_settings': { 'libraries': [ '-lgcov' ] },
721 diff --git a/handwriting/handwriting.gyp b/handwriting/handwriting.gyp
722 index 1009837..422cdf8 100755
723 --- a/handwriting/handwriting.gyp
724 +++ b/handwriting/handwriting.gyp
725 @@ -39,7 +39,7 @@
726 '../base/base.gyp:base',
727 '../gui/zinnia.gyp:zinnia',
728 ],
729 - 'conditions': [['use_libzinnia==1 and OS=="linux"', {
730 + 'conditions': [['use_libzinnia==1 and (OS=="linux" or OS=="gnu-kfreebsd")', {
731 'defines': [
732 'USE_LIBZINNIA',
733 ],
717734 diff --git a/ipc/ipc_path_manager.cc b/ipc/ipc_path_manager.cc
718 index db5b5d7..ab4091b 100755
735 index a5a62fb..bcdaf81 100755
719736 --- a/ipc/ipc_path_manager.cc
720737 +++ b/ipc/ipc_path_manager.cc
721738 @@ -274,7 +274,7 @@ bool IPCPathManager::GetPathName(string *ipc_name) {
746763 LOG(WARNING) << server_path << " on disk is modified";
747764 // If a user updates the server binary on disk during the server is running,
748765 diff --git a/ipc/ipc_path_manager_test.cc b/ipc/ipc_path_manager_test.cc
749 index 82cea4a..4b24fb8 100755
766 index f0b5fcc..4abb655 100755
750767 --- a/ipc/ipc_path_manager_test.cc
751768 +++ b/ipc/ipc_path_manager_test.cc
752769 @@ -108,7 +108,7 @@ TEST_F(IPCPathManagerTest, IPCPathManagerTest) {
759776 ASSERT_FALSE(path.empty());
760777 EXPECT_EQ('\0', path[0]);
761778 diff --git a/ipc/unix_ipc.cc b/ipc/unix_ipc.cc
762 index 3085320..37ff133 100755
779 index acdc334..213e762 100755
763780 --- a/ipc/unix_ipc.cc
764781 +++ b/ipc/unix_ipc.cc
765782 @@ -28,7 +28,8 @@
815832 -#endif // OS_LINUX
816833 +#endif // defined(OS_LINUX) || defined(OS_MACOSX) ||
817834 + // defined(OS_FREEBSD) || defined(OS_GNU_KFREEBSD)
835 diff --git a/languages/chewing/chewing.gyp b/languages/chewing/chewing.gyp
836 index 18fa842..0160ad6 100755
837 --- a/languages/chewing/chewing.gyp
838 +++ b/languages/chewing/chewing.gyp
839 @@ -61,7 +61,7 @@
840 }
841 ],
842 'conditions': [
843 - ['OS=="linux"', {
844 + ['OS=="linux" or OS=="gnu-kfreebsd"', {
845 'targets': [
846 {
847 'target_name': 'ibus_mozc_chewing_metadata',
848 diff --git a/languages/hangul/hangul.gyp b/languages/hangul/hangul.gyp
849 index 6a7a9e4..084cc4c 100755
850 --- a/languages/hangul/hangul.gyp
851 +++ b/languages/hangul/hangul.gyp
852 @@ -59,7 +59,7 @@
853 },
854 ],
855 'conditions': [
856 - ['OS=="linux"', {
857 + ['OS=="linux" or OS=="gnu-kfreebsd"', {
858 'targets': [
859 {
860 'target_name': 'ibus_mozc_hangul_metadata',
861 diff --git a/languages/japanese/lang_dep_spec.cc b/languages/japanese/lang_dep_spec.cc
862 index df794a9..b4d1da2 100755
863 --- a/languages/japanese/lang_dep_spec.cc
864 +++ b/languages/japanese/lang_dep_spec.cc
865 @@ -48,7 +48,7 @@ string LangDepSpecJapanese::GetServerExecName() const {
866 #endif // GOOGLE_JAPANESE_INPUT_BUILD
867 #elif OS_MACOSX
868 return kProductPrefix "Converter.app";
869 -#elif OS_LINUX
870 +#elif defined(OS_LINUX) || defined(OS_GNU_KFREEBSD)
871 return "mozc_server";
872 #else
873 #error "Unsupported platform. Windows, Mac OS X, and GNU/Linux are supported."
818874 diff --git a/protobuf/genproto.gypi b/protobuf/genproto.gypi
819 index 38d8eef..b821e7c 100755
875 index d197312..e26f517 100755
820876 --- a/protobuf/genproto.gypi
821877 +++ b/protobuf/genproto.gypi
822878 @@ -39,7 +39,7 @@
829885 'protoc_command%': '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
830886 },
831887 diff --git a/protobuf/protobuf.gyp b/protobuf/protobuf.gyp
832 index 6072864..a619ddc 100755
888 index 17de9f5..31a4fcf 100755
833889 --- a/protobuf/protobuf.gyp
834890 +++ b/protobuf/protobuf.gyp
835891 @@ -116,7 +116,7 @@
851907 '../gyp/install_build_tool.gypi',
852908 ],
853909 diff --git a/session/session_converter_interface.h b/session/session_converter_interface.h
854 index be5bf45..c6cc2d0 100755
910 index f410edd..0b63f47 100755
855911 --- a/session/session_converter_interface.h
856912 +++ b/session/session_converter_interface.h
857913 @@ -56,7 +56,7 @@ struct OperationPreferences {
864920 use_cascading_window = false;
865921 #else
866922 diff --git a/session/session_test.cc b/session/session_test.cc
867 index ff8fece..1153dff 100755
923 index 195e4ba..e5da4fd 100755
868924 --- a/session/session_test.cc
869925 +++ b/session/session_test.cc
870926 @@ -2089,7 +2089,7 @@ TEST_F(SessionTest, OutputAllCandidateWords) {
886942 // candidate words is different from other platform.
887943 // TODO(komatsu): Modify the client for Linux to explicitly change
888944 diff --git a/testing/testing.gyp b/testing/testing.gyp
889 index 58d1cf3..34a59d6 100755
945 index f43dd30..9593e5e 100755
890946 --- a/testing/testing.gyp
891947 +++ b/testing/testing.gyp
892948 @@ -53,7 +53,7 @@
898954 'dependencies': [
899955 'testing',
900956 ],
901 diff --git a/languages/japanese/lang_dep_spec.cc b/languages/japanese/lang_dep_spec.cc
902 index 675a8f5..fd4a4dc 100755
903 --- a/languages/japanese/lang_dep_spec.cc
904 +++ b/languages/japanese/lang_dep_spec.cc
905 @@ -48,7 +48,7 @@ string LangDepSpecJapanese::GetServerExecName() const {
906 #endif // GOOGLE_JAPANESE_INPUT_BUILD
907 #elif OS_MACOSX
908 return kProductPrefix "Converter.app";
909 -#elif OS_LINUX
910 +#elif defined(OS_LINUX) || defined(OS_GNU_KFREEBSD)
911 return "mozc_server";
912 #else
913 #error "Unsupported platform. Windows, Mac OS X, and GNU/Linux are supported."
914 diff --git a/chrome/skk/skk.gyp b/chrome/skk/skk.gyp
915 index ac6817a..f914e67 100755
916 --- a/chrome/skk/skk.gyp
917 +++ b/chrome/skk/skk.gyp
918 @@ -42,7 +42,7 @@
919 'configuration_nacl_i686': '<(CONFIGURATION_NAME)_NaCl_i686',
920 'configuration_nacl_x86_64': '<(CONFIGURATION_NAME)_NaCl_x86-64',
921 'conditions': [
922 - ['OS=="linux"', {
923 + ['OS=="linux" or OS=="gnu-kfreebsd"', {
924 # We need to copy binaries for NaCl i686 and x86-64 into a single skk
925 # directory across configurations. The following variables must be
926 # the same as <(PRODUCT_DIR) for each configuration.
927 diff --git a/handwriting/handwriting.gyp b/handwriting/handwriting.gyp
928 index 062f018..425c6d4 100755
929 --- a/handwriting/handwriting.gyp
930 +++ b/handwriting/handwriting.gyp
931 @@ -39,7 +39,7 @@
932 '../base/base.gyp:base',
933 '../gui/zinnia.gyp:zinnia',
934 ],
935 - 'conditions': [['use_libzinnia==1 and OS=="linux"', {
936 + 'conditions': [['use_libzinnia==1 and (OS=="linux" or OS=="gnu-kfreebsd")', {
937 'defines': [
938 'USE_LIBZINNIA',
939 ],
940 diff --git a/languages/chewing/chewing.gyp b/languages/chewing/chewing.gyp
941 index 353f240..c7e5ef0 100755
942 --- a/languages/chewing/chewing.gyp
943 +++ b/languages/chewing/chewing.gyp
944 @@ -61,7 +61,7 @@
945 }
946 ],
947 'conditions': [
948 - ['OS=="linux"', {
949 + ['OS=="linux" or OS=="gnu-kfreebsd"', {
950 'targets': [
951 {
952 'target_name': 'ibus_mozc_chewing_metadata',
953 diff --git a/languages/hangul/hangul.gyp b/languages/hangul/hangul.gyp
954 index 452bde8..72a049f 100755
955 --- a/languages/hangul/hangul.gyp
956 +++ b/languages/hangul/hangul.gyp
957 @@ -59,7 +59,7 @@
958 },
959 ],
960 'conditions': [
961 - ['OS=="linux"', {
962 + ['OS=="linux" or OS=="gnu-kfreebsd"', {
963 'targets': [
964 {
965 'target_name': 'ibus_mozc_hangul_metadata',