Codebase list mozc / 8586ff6
Update support-kfreebsd.patch Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> Nobuhiro Iwamatsu 12 years ago
1 changed file(s) with 37 addition(s) and 37 deletion(s). Raw diff Collapse all Expand all
+37
-37
debian/patches/support-kfreebsd.patch less more
00 diff --git a/base/const.h b/base/const.h
1 index dd6d3e9..e252ae9 100755
1 index 2525bc0..22f8ae8 100755
22 --- a/base/const.h
33 +++ b/base/const.h
4 @@ -107,7 +107,7 @@ const char kEventPathPrefix[] = "GoogleJapaneseInput.event.";
4 @@ -122,7 +122,7 @@ const char kEventPathPrefix[] = "GoogleJapaneseInput.event.";
55 #else
66 const char kEventPathPrefix[] = "Mozc.event.";
77 #endif // GOOGLE_JAPANESE_INPUT_BUILD
131131 #endif
132132
133133 diff --git a/base/process.cc b/base/process.cc
134 index 8f30cc4..7381959 100755
134 index e465d69..61031e3 100755
135135 --- a/base/process.cc
136136 +++ b/base/process.cc
137137 @@ -52,7 +52,7 @@
143143 #include <fcntl.h>
144144 #include <signal.h>
145145 #include <spawn.h> // for posix_spawn().
146 @@ -201,7 +201,7 @@ bool Process::OpenBrowser(const string &url) {
146 @@ -121,7 +121,7 @@ bool Process::OpenBrowser(const string &url) {
147147 return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
148148 #endif
149149
152152 static const char kBrowserCommand[] = "/usr/bin/xdg-open";
153153 // xdg-open which uses kfmclient or gnome-open internally works both on KDE
154154 // and GNOME environments.
155 @@ -285,7 +285,7 @@ bool Process::SpawnProcess(const string &path,
155 @@ -205,7 +205,7 @@ bool Process::SpawnProcess(const string &path,
156156 }
157157 #endif
158158
161161 // Do not call posix_spawn() for obviously bad path.
162162 if (!S_ISREG(statbuf.st_mode)) {
163163 LOG(ERROR) << "Not a regular file: " << path;
164 @@ -581,7 +581,7 @@ bool Process::LaunchErrorMessageDialog(const string &error_type) {
164 @@ -482,7 +482,7 @@ bool Process::LaunchErrorMessageDialog(const string &error_type) {
165165 }
166166 #endif // OS_WINDOWS
167167
241241 if (-1 == clock_gettime(CLOCK_REALTIME, &timestamp)) {
242242 return 0;
243243 diff --git a/base/util.cc b/base/util.cc
244 index 047df55..58064df 100755
244 index acc7d6a..5110892 100755
245245 --- a/base/util.cc
246246 +++ b/base/util.cc
247 @@ -1831,7 +1831,7 @@ string Util::GetServerDirectory() {
247 @@ -2319,7 +2319,7 @@ string Util::GetServerDirectory() {
248248 return MacUtil::GetServerDirectory();
249249 #endif // OS_MACOSX
250250
253253 return "/usr/lib/mozc";
254254 #endif // OS_LINUX
255255 }
256 @@ -1911,7 +1911,7 @@ string GetObjectNameAsString(HANDLE handle) {
256 @@ -2399,7 +2399,7 @@ string GetObjectNameAsString(HANDLE handle) {
257257 #endif
258258
259259 string Util::GetDesktopNameAsString() {
262262 const char *display = getenv("DISPLAY");
263263 if (display == NULL) {
264264 return "";
265 @@ -2379,7 +2379,7 @@ bool Util::IsPlatformSupported() {
265 @@ -2867,7 +2867,7 @@ bool Util::IsPlatformSupported() {
266266 #if defined(OS_MACOSX)
267267 // TODO(yukawa): support Mac.
268268 return true;
271271 // TODO(yukawa): support Linux.
272272 return true;
273273 #elif defined(OS_WINDOWS)
274 @@ -2750,18 +2750,19 @@ string Util::GetOSVersionString() {
274 @@ -3238,18 +3238,19 @@ string Util::GetOSVersionString() {
275275 } else {
276276 LOG(WARNING) << "GetVersionEx failed";
277277 }
295295 }
296296
297297 void Util::DisableIME() {
298 @@ -2795,7 +2796,7 @@ uint64 Util::GetTotalPhysicalMemory() {
298 @@ -3283,7 +3284,7 @@ uint64 Util::GetTotalPhysicalMemory() {
299299 return 0;
300300 }
301301 return total_memory;
304304 #if defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
305305 const long page_size = sysconf(_SC_PAGESIZE);
306306 const long number_of_phyisical_pages = sysconf(_SC_PHYS_PAGES);
307 @@ -2821,7 +2822,7 @@ void Util::PreloadMappedRegion(const void *begin,
307 @@ -3309,7 +3310,7 @@ void Util::PreloadMappedRegion(const void *begin,
308308 ::ZeroMemory(&system_info, sizeof(system_info));
309309 ::GetSystemInfo(&system_info);
310310 const size_t page_size = system_info.dwPageSize;
314314 const size_t page_size = sysconf(_SC_PAGESIZE);
315315 #else
316316 diff --git a/build_mozc.py b/build_mozc.py
317 index 8e64c3e..88147e8 100755
317 index 54ca8f5..8ea9644 100755
318318 --- a/build_mozc.py
319319 +++ b/build_mozc.py
320320 @@ -72,6 +72,14 @@ def IsLinux():
350350 gyp_file_names.extend(glob.glob('%s/unix/*/*.gyp' % SRC_DIR))
351351 # Add ibus.gyp if ibus is installed.
352352 # Ubuntu 8.04 (Hardy) does not contain ibus package.
353 @@ -257,7 +265,7 @@ def CleanBuildFilesAndDirectories():
353 @@ -259,7 +267,7 @@ def CleanBuildFilesAndDirectories():
354354 elif IsMac():
355355 directory_names.extend(glob.glob(os.path.join(gyp_directory_name,
356356 '*.xcodeproj')))
358358 + elif IsLinux() or IsFreeBSD() or IsGNUkFreeBSD():
359359 file_names.extend(glob.glob(os.path.join(gyp_directory_name,
360360 '*.target.mk')))
361 file_names.append('%s/mozc_version.txt' % SRC_DIR)
362 @@ -271,6 +279,10 @@ def CleanBuildFilesAndDirectories():
361 file_names.extend(glob.glob(os.path.join(gyp_directory_name,
362 @@ -274,6 +282,10 @@ def CleanBuildFilesAndDirectories():
363363 file_names.append('Makefile')
364364 elif IsWindows():
365365 file_names.append('third_party/breakpad/breakpad.gyp')
370370 # Remove files.
371371 for file_name in file_names:
372372 RemoveFile(file_name)
373 @@ -357,6 +369,8 @@ def GypMain(deps_file_name):
373 @@ -359,6 +371,8 @@ def GypMain(deps_file_name):
374374 command_line.extend(['-D', 'use_qt=NO'])
375375 if options.coverage:
376376 command_line.extend(['-D', 'coverage=1'])
379379
380380 command_line.extend(['-D', 'build_base=%s' % GetBuildBaseName(options)])
381381
382 @@ -402,6 +416,8 @@ def RunTests(configuration, unused_calculate_coverage):
382 @@ -408,6 +422,8 @@ def RunTests(configuration, unused_calculate_coverage):
383383 base_path = os.path.join('out_linux', configuration)
384384 elif IsWindows():
385385 base_path = os.path.join('out_win', configuration)
388388 else:
389389 logging.error('Unsupported platform: %s', os.name)
390390 return
391 @@ -550,13 +566,14 @@ def ParseGypOptions():
391 @@ -556,13 +572,14 @@ def ParseGypOptions():
392392 'This flag is false by default because it may require you '
393393 'to install libchewing in your environment.')
394394
404404 (options, unused_args) = parser.parse_args()
405405 return options
406406
407 @@ -674,6 +691,7 @@ def BuildOnLinux(options, targets):
407 @@ -680,6 +697,7 @@ def BuildOnLinux(options, targets):
408408 target_names.append(target_name)
409409
410410 make_command = os.getenv('BUILD_COMMAND', 'make')
412412 # flags for building in Chrome OS chroot environment
413413 envvars = [
414414 'CFLAGS',
415 @@ -688,7 +706,7 @@ def BuildOnLinux(options, targets):
415 @@ -694,7 +712,7 @@ def BuildOnLinux(options, targets):
416416 for envvar in envvars:
417417 if envvar in os.environ:
418418 os.environ[envvar] = os.getenv(envvar)
421421 # set output directory
422422 os.environ['builddir_name'] = 'out_linux'
423423
424 @@ -698,6 +716,42 @@ def BuildOnLinux(options, targets):
424 @@ -704,6 +722,42 @@ def BuildOnLinux(options, targets):
425425
426426 RunOrDie([make_command] + build_args + target_names)
427427
464464
465465 def CheckFileOrDie(file_name):
466466 """Check the file exists or dies if not."""
467 @@ -790,6 +844,8 @@ def BuildMain(original_directory_name):
467 @@ -796,6 +850,8 @@ def BuildMain(original_directory_name):
468468 BuildOnMac(options, targets, original_directory_name)
469469 elif IsLinux():
470470 BuildOnLinux(options, targets)
587587 static_cast<int>(config.preedit_method()) ||
588588 initial_use_keyboard_to_change_preedit_method_ !=
589589 diff --git a/gui/config_dialog/keybinding_editor.cc b/gui/config_dialog/keybinding_editor.cc
590 index f3301d0..9247dcd 100755
590 index c17efc6..1239316 100755
591591 --- a/gui/config_dialog/keybinding_editor.cc
592592 +++ b/gui/config_dialog/keybinding_editor.cc
593593 @@ -443,7 +443,7 @@ bool KeyBindingFilter::eventFilter(QObject *obj, QEvent *event) {
713713 },{ # OS!="linux"
714714 'uic_path': '<(qt_basepath)/bin/uic<(EXECUTABLE_SUFFIX)',
715715 diff --git a/gyp/common.gypi b/gyp/common.gypi
716 index 6a7e7a6..651469e 100755
716 index b80245f..4fb428b 100755
717717 --- a/gyp/common.gypi
718718 +++ b/gyp/common.gypi
719 @@ -206,7 +206,7 @@
719 @@ -211,7 +211,7 @@
720720 },
721721 },
722722 'conditions': [
725725 'cflags': [
726726 '<@(debug_extra_cflags)',
727727 ],
728 @@ -245,7 +245,7 @@
728 @@ -250,7 +250,7 @@
729729 },
730730 },
731731 'conditions': [
734734 'cflags': [
735735 '<@(release_extra_cflags)',
736736 ],
737 @@ -457,6 +457,51 @@
737 @@ -459,6 +459,51 @@
738738 }],
739739 ],
740740 }],
786786 ['OS=="mac"', {
787787 'defines': [
788788 'OS_MACOSX',
789 @@ -512,7 +557,7 @@
789 @@ -514,7 +559,7 @@
790790 # Linux gyp (into scons) doesn't like target_conditions?
791791 # TODO(team): track down why 'target_conditions' doesn't work
792792 # on Linux gyp into scons like it does on Mac gyp into xcodeproj.
872872 }; // namespace mozc
873873
874874 -#endif // OS_LINUX
875 +#endif // defined(OS_LINUX) || defined(OS_MACOSX) ||\
875 +#endif // defined(OS_LINUX) || defined(OS_MACOSX) ||
876876 + // defined(OS_FREEBSD) || defined(OS_GNU_KFREEBSD)
877877 diff --git a/protobuf/genproto.gypi b/protobuf/genproto.gypi
878878 index 38d8eef..b821e7c 100755
888888 'protoc_command%': '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
889889 },
890890 diff --git a/protobuf/protobuf.gyp b/protobuf/protobuf.gyp
891 index 40fc11f..67b244a 100755
891 index e36b373..a22f11b 100755
892892 --- a/protobuf/protobuf.gyp
893893 +++ b/protobuf/protobuf.gyp
894894 @@ -116,7 +116,7 @@
900900 'conditions': [
901901 ['use_libprotobuf==1', {
902902 'link_settings': {
903 @@ -193,7 +193,7 @@
903 @@ -196,7 +196,7 @@
904904 },
905905 'conditions': [
906906 # use system-installed protoc on Linux
910910 '../gyp/install_build_tool.gypi',
911911 ],
912912 diff --git a/testing/testing.gyp b/testing/testing.gyp
913 index ac62b03..03a99f5 100755
913 index dd7b8af..2177daf 100755
914914 --- a/testing/testing.gyp
915915 +++ b/testing/testing.gyp
916 @@ -49,7 +49,7 @@
917 'base/internal/gtest_main.cc',
918 ],
916 @@ -52,7 +52,7 @@
917 '../base/base.gyp:base',
918 ],
919919 'conditions': [
920920 - ['OS!="linux"', {
921921 + ['OS!="linux" and OS!="gnu-kfreebsd"', {