Commit 3fa93fef2103ce475f82b6a29eeea92e63c1f3e9 - mozc

+4

-7

debian/README.source less more

10	10	mozc debian source package deletes some source codes.
11	11
12	12	The deleted source code is the following directories.
13		* ./protobuf
14		* ./third_party/gtest/
	13	* ./third_party/gyp
15	14
16	15	These have already become Debian pakcage and are not necessary.
17		* protobuf
18		http://packages.qa.debian.org/p/protobuf.html
19		* gtest
20		http://packages.qa.debian.org/g/gtest.html
	16	* gyp
	17	http://packages.qa.debian.org/g/gyp.html
21	18
22		-- Nobuhiro Iwamatsu <iwamatsu@debian.org> Fri, 14 May 2010 06:34:06 +0900
	19	-- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 14 Jul 2010 21:22:51 +0900

+17

-0

debian/changelog less more

	0	mozc (0.12.410.102-1) unstable; urgency=low
	1
	2	* New upstream release (Closes: #588971).
	3	- Add mozc-server, mozc-utils-gui and scim-mozc packages.
	4	* Update debian/rules.
	5	Add --gypdir option to build_mozc.py.
	6	* Update debian/control.
	7	- Bumped standards-version to 3.9.0.
	8	- Update description.
	9	* Add mozc icon (Closes: #588972).
	10	* Add patch which revises issue 18.
	11	ibus_mozc_issue18.patch
	12	* kFreeBSD build support.
	13	support_kfreebsd.patch
	14
	15	-- Nobuhiro Iwamatsu <iwamatsu@debian.org> Wed, 14 Jul 2010 03:26:47 +0900
	16
0	17	mozc (0.11~svn13-1) unstable; urgency=low
1	18
2	19	* Initial release (Closes: #581158)

+52

-8

debian/control less more

2	2	Priority: optional
3	3	Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org>
4	4	Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~),
5		libibus-dev (>= 1.2), libcurl4-openssl-dev, gyp, pkg-config,
	5	libibus-dev (>= 1.2), libcurl4-openssl-dev, pkg-config,
6	6	python-dev, gyp (>=0.1~svn824), protobuf-compiler, libgtest-dev,
7		libprotobuf-dev
8		Standards-Version: 3.8.4
	7	libprotobuf-dev, libqt4-dev, libscim-dev
	8	Standards-Version: 3.9.0
9	9	Homepage: http://code.google.com/p/mozc/
10	10
11	11	Package: ibus-mozc
12	12	Architecture: any
13		Depends: ${misc:Depends}, ${shlibs:Depends}, ibus (>= 1.2)
14		Description: Mozc engine for IBus
	13	Depends: ${misc:Depends}, ${shlibs:Depends}, ibus (>= 1.2),
	14	mozc-server (= ${binary:Version}), mozc-utils-gui (= ${binary:Version})
	15	Description: Mozc engine for IBus - Client of the Mozc input method
15	16	IBus is an Intelligent Input Bus. It is a new input framework for Linux OS.
16	17	It provides full featured and user friendly input method user interface.
17	18	It also may help developers to develop input method easily.
18	19	.
19		IBus-Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
20		such as Chromium OS, Windows, Mac and Linux.
	20	Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
	21	such as Chromium OS, Windows, Mac and Linux.
21	22	.
22		This open-source project originates from Google Japanese Input.
	23	ibus-mozc provides client part of the Mozc input method.
	24	.
	25	This open-source project originates from Google Japanese Input.
	26
	27	Package: scim-mozc
	28	Architecture: any
	29	Depends: ${misc:Depends}, ${shlibs:Depends}, scim, mozc-server (= ${binary:Version})
	30	Description: Mozc engine for SCIM - Client of the Mozc input method
	31	Smart Common Input Method (SCIM) is an input method (IM) platform.
	32	Input methods are needed to enter complex characters in many non-latin
	33	languages. SCIM provides a common platform for various plugin modules and
	34	independent IM programs, as well as a set of modules and programs on its own.
	35	It is highly modularized and exposes abstract interfaces, so that plugin
	36	modules with different functions can easily communicate with each other.
	37	.
	38	Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
	39	such as Chromium OS, Windows, Mac and Linux.
	40	.
	41	scim-mozc provides client part of the Mozc input method.
	42	.
	43	This open-source project originates from Google Japanese Input.
	44
	45	Package: mozc-server
	46	Architecture: any
	47	Depends: ${misc:Depends}, ${shlibs:Depends}
	48	Description: Server of the Mozc input method
	49	Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
	50	such as Chromium OS, Windows, Mac and Linux.
	51	.
	52	mozc-server provides client part of the Mozc input method.
	53	.
	54	This open-source project originates from Google Japanese Input.
	55
	56	Package: mozc-utils-gui
	57	Architecture: any
	58	Depends: ${misc:Depends}, ${shlibs:Depends}, mozc-server (= ${binary:Version})
	59	Description: GUI uitilities of the Mozc input method
	60	Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
	61	such as Chromium OS, Windows, Mac and Linux.
	62	.
	63	mozc-server provides GUI uitilities of the Mozc input method.
	64	This uses GUI and can set ibus-mozc and the user's dictionary.
	65	.
	66	This open-source project originates from Google Japanese Input.

+60

-6

debian/copyright less more

18	18
19	19	- data/unicode/*
20	20	Copyright (c) 1991-1999 Unicode, Inc.
	21
	22	- debian/product_icon.png.
	23	Copyright (c) 2002-2010:
	24	Ulisse Perusin <uli.peru@gmail.com>
	25	Riccardo Buzzotta <raozuzu@yahoo.it>
	26	Josef Vybíral <cornelius@vybiral.info>
	27	Hylke Bons <h.bons@student.rug.nl>
	28	Ricardo González <rick@jinlabs.com>
	29	Lapo Calamandrei <calamandrei@gmail.com>
	30	Rodney Dawes <dobey@novell.com>
	31	Luca Ferretti <elle.uca@libero.it>
	32	Tuomas Kuosmanen <tigert@gimp.org>
	33	Andreas Nilsson <nisses.mail@home.se>
	34	Jakub Steiner <jimmac@novell.com>
	35
	36	Copy and Modify from gnome-icon-theme-2.30.3/gnome/22x22/apps/accessories-character-map.png
21	37
22	38	License:
23	39	- mozc

62	78	(copy from http://unicode.org/copyright.html)
63	79	UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
64	80
65		Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/ . Unicode Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
	81	Unicode Data Files include all data files under the directories
	82	http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
	83	http://www.unicode.org/cldr/data/ . Unicode Software includes any source
	84	code published in the Unicode Standard or under the directories
	85	http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
	86	http://www.unicode.org/cldr/data/.
66	87
67		NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
	88	NOTICE TO USER: Carefully read the following legal agreement.
	89	BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
	90	DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY
	91	ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS
	92	AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE
	93	OR USE THE DATA FILES OR SOFTWARE.
68	94
69	95	COPYRIGHT AND PERMISSION NOTICE
70	96
71		Copyright © 1991-2010 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
	97	Copyright © 1991-2010 Unicode, Inc. All rights reserved. Distributed under
	98	the Terms of Use in http://www.unicode.org/copyright.html.
72	99
73		Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
	100	Permission is hereby granted, free of charge, to any person obtaining a
	101	copy of the Unicode data files and any associated documentation
	102	(the "Data Files") or Unicode software and any associated documentation
	103	(the "Software") to deal in the Data Files or Software without
	104	restriction, including without limitation the rights to use, copy, modify,
	105	merge, publish, distribute, and/or sell copies of the Data Files or
	106	Software, and to permit persons to whom the Data Files or Software are
	107	furnished to do so, provided that (a) the above copyright notice(s) and
	108	this permission notice appear with all copies of the Data Files or
	109	Software, (b) both the above copyright notice(s) and this permission
	110	notice appear in associated documentation, and (c) there is clear notice
	111	in each modified Data File or in the Software as well as in the
	112	documentation associated with the Data File(s) or Software that the data
	113	or software has been modified.
74	114
75		THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
	115	THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
	116	KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	117	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
	118	THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
	119	INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
	120	OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
	121	OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
	122	OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
	123	PERFORMANCE OF THE DATA FILES OR SOFTWARE.
76	124
77		Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
	125	Except as contained in this notice, the name of a copyright holder shall
	126	not be used in advertising or otherwise to promote the sale, use or other
	127	dealings in these Data Files or Software without prior written
	128	authorization of the copyright holder.
	129
	130	- debian/product_icon.png
	131	License: GPLv2
78	132
79	133	The Debian packaging is:
80	134

+0

-15

~~debian/patches/build.patch~~ less more

0		# Change two_pass_build.
1		# This patch is suitable workaround.
2
3		--- a/build_mozc.py 2010-05-13 05:44:19.000000000 +0900
4		+++ b/build_mozc.py 2010-05-13 05:44:36.000000000 +0900
5		@@ -268,8 +268,7 @@
6		'--no-circular-check',
7		'--depth=.',
8		'--include=%s/gyp/common.gypi' % SRC_DIR]
9		- if options.onepass:
10		- command_line.extend(['-D', 'two_pass_build=0'])
11		+ command_line.extend(['-D', 'two_pass_build=1'])
12		command_line.extend(gyp_file_names)
13
14		if options.branding:

+0

-16

~~debian/patches/gyp.patch~~ less more

0		# Copyright 2010 Nobuhiro Iwamatsu <iwamatsu@debian.org>
1		#
2		# Change to use the debian package
3
4		--- a/build_mozc.py 2010-05-11 05:06:46.000000000 +0900
5		+++ b/build_mozc.py 2010-05-11 05:07:33.000000000 +0900
6		@@ -256,7 +256,8 @@
7		for file_name in gyp_file_names:
8		print '- %s' % file_name
9		# We use the one in mozc_build_tools/gyp
10		- gyp_script = 'mozc_build_tools/gyp/gyp'
11		+ #gyp_script = 'mozc_build_tools/gyp/gyp'
12		+ gyp_script = '/usr/bin/gyp'
13		# If we don't have a copy of gyp, download it.
14		if not os.path.isfile(gyp_script):
15		# SVN creates mozc_build_tools directory if it's not present.

+34

-0

debian/patches/ibus_mozc_issue18.patch less more

	0	Index: unix/ibus/mozc_engine.cc
	1	===================================================================
	2	--- a/unix/ibus/mozc_engine.cc (リビジョン 35)
	3	+++ b/unix/ibus/mozc_engine.cc (作業コピー)
	4	@@ -499,17 +499,19 @@
	5	IBusProperty *prop = NULL;
	6
	7	#ifndef OS_CHROMEOS
	8	- DCHECK(prop_mozc_tool_);
	9	- while (prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++)) {
	10	- if (!g_strcmp0(property_name, prop->key)) {
	11	- const MozcEngineToolProperty *entry =
	12	- reinterpret_cast<const MozcEngineToolProperty*>(
	13	- g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
	14	- DCHECK(entry->mode);
	15	- if (!session_->LaunchTool(entry->mode, "")) {
	16	- LOG(ERROR) << "cannot launch: " << entry->mode;
	17	+ if (IsMozcToolAvailable()) {
	18	+ DCHECK(prop_mozc_tool_);
	19	+ while (prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++)) {
	20	+ if (!g_strcmp0(property_name, prop->key)) {
	21	+ const MozcEngineToolProperty *entry =
	22	+ reinterpret_cast<const MozcEngineToolProperty*>(
	23	+ g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
	24	+ DCHECK(entry->mode);
	25	+ if (!session_->LaunchTool(entry->mode, "")) {
	26	+ LOG(ERROR) << "cannot launch: " << entry->mode;
	27	+ }
	28	+ return;
	29	}
	30	- return;
	31	}
	32	}
	33	#endif

+0

-27

~~debian/patches/ibus_pkgconfig.patch~~ less more

0		--- a/unix/ibus/ibus.gyp 2010-05-13 05:11:01.000000000 +0900
1		+++ b/unix/ibus/ibus.gyp 2010-05-13 05:12:45.000000000 +0900
2		@@ -51,21 +51,13 @@
3		'../../usage_stats/usage_stats.gyp:usage_stats',
4		],
5		'ibus_include_dirs': [
6		- '<(sysroot)/usr/include/dbus-1.0',
7		- '<(sysroot)/usr/include/glib-2.0',
8		- '<(sysroot)/usr/include/ibus-1.0',
9		- '<(sysroot)/usr/lib/dbus-1.0/include',
10		- '<(sysroot)/usr/lib/glib-2.0/include'
11		+ ' <!@(pkg-config --cflags-only-I ibus-1.0)'
12		],
13		'ibus_libraries': [
14		- '-lcurl',
15		- '-ldbus-1',
16		- '-lglib-2.0',
17		- '-lgobject-2.0',
18		- '-libus',
19		+ ' <!@(pkg-config --libs ibus-1.0)'
20		],
21		'ibus_ldflags': [
22		- '-L<(sysroot)/usr/lib',
23		+ ' <!@(pkg-config --libs-only-L ibus-1.0)'
24		],
25		},
26		'targets': [

+0

-75

~~debian/patches/protobuf.patch~~ less more

0		# Copyright Nobuhiro Iwamatsu <iwamatsu@debian.org>
1		#
2		# Disable protbuf build and replace to debian package
3
4		--- a/build_tools/primitive_tools/primitive_tools.gyp 2010-05-12 05:03:47.000000000 +0900
5		+++ b/build_tools/primitive_tools/primitive_tools.gyp 2010-05-12 05:03:57.000000000 +0900
6		@@ -39,7 +39,6 @@
7		'dependencies': [
8		'../../converter/converter.gyp:install_gen_pos_data_main',
9		'../../prediction/prediction.gyp:install_gen_suggestion_filter_main',
10		- '../../protobuf/protobuf.gyp:install_protoc',
11		],
12		},
13		],
14		--- a/usage_stats/usage_stats.gyp 2010-05-13 06:49:56.000000000 +0900
15		+++ b/usage_stats/usage_stats.gyp 2010-05-13 06:50:03.000000000 +0900
16		@@ -42,7 +42,6 @@
17		'usage_stats.cc',
18		],
19		'dependencies': [
20		- '../protobuf/protobuf.gyp:protobuf',
21		'../base/base.gyp:base',
22		'../net/net.gyp:net',
23		'../storage/storage.gyp:storage',
24		--- a/ipc/ipc.gyp 2010-05-13 06:48:53.000000000 +0900
25		+++ b/ipc/ipc.gyp 2010-05-13 06:49:14.000000000 +0900
26		@@ -47,7 +47,6 @@
27		'win32_ipc.cc',
28		],
29		'dependencies': [
30		- '../protobuf/protobuf.gyp:protobuf',
31		'../base/base.gyp:base',
32		'genproto_ipc',
33		],
34		--- a/session/session.gyp 2010-05-13 06:56:40.000000000 +0900
35		+++ b/session/session.gyp 2010-05-13 06:56:55.000000000 +0900
36		@@ -50,7 +50,6 @@
37		'session_watch_dog.cc',
38		],
39		'dependencies': [
40		- '../protobuf/protobuf.gyp:protobuf',
41		'../base/base.gyp:base',
42		'../client/client.gyp:client',
43		'../composer/composer.gyp:composer',
44		@@ -131,7 +130,6 @@
45		'<(proto_out_dir)/<(relative_dir)/state.pb.cc',
46		],
47		'dependencies': [
48		- '../protobuf/protobuf.gyp:protobuf',
49		'genproto_session'
50		],
51		},
52		--- a/gyp/common.gypi 2010-05-13 06:24:09.000000000 +0900
53		+++ b/gyp/common.gypi 2010-05-13 06:24:32.000000000 +0900
54		@@ -288,7 +288,7 @@
55		'<(DEPTH)/third_party/breakpad/src',
56		'<(SHARED_INTERMEDIATE_DIR)',
57		'<(SHARED_INTERMEDIATE_DIR)/proto_out',
58		- '../protobuf/files/src',
59		+ '/usr/include',
60		],
61		'conditions': [
62		['OS=="win"', {
63		--- a/unix/ibus/ibus.gyp 2010-05-13 05:00:43.000000000 +0900
64		+++ b/unix/ibus/ibus.gyp 2010-05-13 06:03:06.000000000 +0900
65		@@ -54,7 +54,8 @@
66		' <!@(pkg-config --cflags-only-I ibus-1.0)'
67		],
68		'ibus_libraries': [
69		- ' <!@(pkg-config --libs ibus-1.0)'
70		+ ' <!@(pkg-config --libs ibus-1.0)',
71		+ '/usr/lib/libprotobuf.a',
72		],
73		'ibus_ldflags': [
74		' <!@(pkg-config --libs-only-L ibus-1.0)'

+0

-59

~~debian/patches/protoc.patch~~ less more

0		# Copyright Nobuhiro Iwamatsu <iwamatsu@debian.org>
1		#
2		# Change to use the debian package
3
4		--- a/dictionary/dictionary.gyp 2010-05-12 05:12:21.000000000 +0900
5		+++ b/dictionary/dictionary.gyp 2010-05-12 05:14:25.000000000 +0900
6		@@ -105,7 +105,7 @@
7		'action': [
8		'python', '../build_tools/run_after_chdir.py',
9		'<(DEPTH)',
10		- '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
11		+ 'protoc<(EXECUTABLE_SUFFIX)',
12		'<(relative_dir)/<(RULE_INPUT_NAME)',
13		'--cpp_out=<(proto_out_dir)',
14		],
15		--- a/session/session.gyp 2010-05-12 05:13:56.000000000 +0900
16		+++ b/session/session.gyp 2010-05-12 05:14:16.000000000 +0900
17		@@ -114,7 +114,7 @@
18		'action': [
19		'python', '../build_tools/run_after_chdir.py',
20		'<(DEPTH)',
21		- '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
22		+ 'protoc<(EXECUTABLE_SUFFIX)',
23		'<(relative_dir)/<(RULE_INPUT_NAME)',
24		'--cpp_out=<(proto_out_dir)',
25		],
26		--- a/ipc/ipc.gyp 2010-05-11 05:40:51.000000000 +0900
27		+++ b/ipc/ipc.gyp 2010-05-12 05:15:18.000000000 +0900
28		@@ -78,7 +78,7 @@
29		'action': [
30		'python', '../build_tools/run_after_chdir.py',
31		'<(DEPTH)',
32		- '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
33		+ 'protoc<(EXECUTABLE_SUFFIX)',
34		'<(relative_dir)/<(RULE_INPUT_NAME)',
35		'--cpp_out=<(proto_out_dir)',
36		],
37		--- a/prediction/prediction.gyp 2010-05-12 05:15:46.000000000 +0900
38		+++ b/prediction/prediction.gyp 2010-05-12 05:15:58.000000000 +0900
39		@@ -169,7 +169,7 @@
40		'action': [
41		'python', '../build_tools/run_after_chdir.py',
42		'<(DEPTH)',
43		- '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
44		+ 'protoc<(EXECUTABLE_SUFFIX)',
45		'<(relative_dir)/<(RULE_INPUT_NAME)',
46		'--cpp_out=<(proto_out_dir)',
47		],
48		--- a/usage_stats/usage_stats.gyp 2010-05-12 05:22:07.000000000 +0900
49		+++ b/usage_stats/usage_stats.gyp 2010-05-12 05:22:21.000000000 +0900
50		@@ -97,7 +97,7 @@
51		'action': [
52		'python', '../build_tools/run_after_chdir.py',
53		'<(DEPTH)',
54		- '<(relative_dir)/<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)',
55		+ 'protoc<(EXECUTABLE_SUFFIX)',
56		'<(relative_dir)/<(RULE_INPUT_NAME)',
57		'--cpp_out=<(proto_out_dir)',
58		],

+0

-12

~~debian/patches/remove_gtest.patch~~ less more

0		diff --git a/testing/base/public/gunit_prod.h b/testing/base/public/gunit_prod.h
1		index 3077667..fe051f2 100755
2		--- a/testing/base/public/gunit_prod.h
3		+++ b/testing/base/public/gunit_prod.h
4		@@ -30,6 +30,6 @@
5		#ifndef MOZC_TESTING_BASE_PUBLIC_GUNIT_PROD_H_
6		#define MOZC_TESTING_BASE_PUBLIC_GUNIT_PROD_H_
7
8		-#include "third_party/gtest/include/gtest/gtest_prod.h"
9		+#include "gtest/gtest_prod.h"
10
11		#endif // MOZC_TESTING_BASE_PUBLIC_GUNIT_PROD_H_

+2

-6

debian/patches/series less more

0		build.patch
1		ibus_pkgconfig.patch
2		gyp.patch
3		protobuf.patch
4		protoc.patch
5		remove_gtest.patch
	0	ibus_mozc_issue18.patch
	1	support_kfreebsd.patch

+11

-0

debian/patches/support_kfreebsd.patch less more

	0	--- mozc-0.12.410.102.orig/build_mozc.py
	1	+++ mozc-0.12.410.102/build_mozc.py
	2	@@ -69,7 +69,7 @@ def IsMac():
	3
	4	def IsLinux():
	5	"""Returns true if the platform is Linux."""
	6	- return os.name == 'posix' and os.uname()[0] == 'Linux'
	7	+ return os.name == 'posix' and os.uname()[0] == 'Linux' or os.uname()[0] == 'GNU/kFreeBSD'
	8
	9
	10	# TODO(yukawa): Move this function to util.py (b/2715400)

debian/product_icon.png less more

Binary diff not shown

+45

-7

debian/rules less more

0	0	#!/usr/bin/make -f
1	1	# -- makefile --
2	2	#
3		BUILD_DIR=./out
4		TARGETS=unix/ibus/ibus.gyp:ibus_mozc
	3	BUILD_DIR=./out_linux
	4	TARGETS=unix/ibus/ibus.gyp:ibus_mozc unix/scim/scim.gyp:scim_mozc\
	5	unix/scim/scim.gyp:scim_mozc_setup server/server.gyp:mozc_server\
	6	gui/gui.gyp:mozc_tool
	7
	8	# for architecture dependent variables and changelog vars
	9	vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
	10	CHANGELOG_VARS := $(shell dpkg-parsechangelog \| \
	11	sed -n 's/ /_/g;/^[^_]/s/^$[^:]$:_$.$/\1=\2/p')
	12
	13	SOURCE_VERSION := $(call vafilt,$(CHANGELOG_VARS),Version)
	14	SCIM_MODDIR=`pkg-config --variable=moduledir scim`
5	15
6	16	%:
7	17	dh --with quilt $@
8	18
9	19	override_dh_auto_configure:
10		python build_mozc.py gyp
	20	python build_mozc.py gyp --gypdir=/usr/bin
11	21	python build_mozc.py build_tools -c Release
12	22
13	23	override_dh_auto_build:

17	27	python build_mozc.py clean
18	28	rm -rf build_tools/__init__.pyc
19	29	rm -rf build_tools/mozc_version.pyc
	30	rm -rf third_party/rx/rx.Makefile
20	31
21	32	override_dh_auto_install:
22		mkdir -p $(CURDIR)/debian/ibus-mozc/usr/lib/ibus-mozc/
23		cp -p $(BUILD_DIR)/Release/ibus_mozc $(CURDIR)/debian/ibus-mozc/usr/lib/ibus-mozc/ibus-engine-mozc
24		mkdir -p $(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/
25		sed 's\|/usr/libexec/ibus-engine-mozc\|/usr/lib/ibus-mozc/ibus-engine-mozc\|' < unix/ibus/mozc.xml > $(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/mozc.xml
	33
	34	# ibus-mozc
	35	install -D -m 0755 $(BUILD_DIR)/Release/ibus_mozc \
	36	$(CURDIR)/debian/ibus-mozc/usr/lib/ibus-mozc/ibus-engine-mozc
	37	install -d $(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/
	38	sed -e 's\|/usr/libexec/ibus-engine-mozc\|/usr/lib/ibus-mozc/ibus-engine-mozc\|' \
	39	-e 's\|0\.0\.0\.0\|$(SOURCE_VERSION)\|g' < $(BUILD_DIR)/Release/obj/gen/unix/ibus/mozc.xml > \
	40	$(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/mozc.xml
	41	install -D -m 0644 $(CURDIR)/debian/product_icon.png \
	42	$(CURDIR)/debian/ibus-mozc/usr/share/ibus-mozc/product_icon.png
	43	ln -s /usr/share/ibus-mozc/product_icon.png \
	44	$(CURDIR)/debian/ibus-mozc/usr/share/ibus-mozc/unknown.ico
	45
	46	# scim-mozc
	47	install -D -m 0755 $(BUILD_DIR)/Release/lib.target/libscim_mozc.so \
	48	$(CURDIR)/debian/scim-mozc/$(SCIM_MODDIR)/IMEngine/mozc.so
	49	install -D -m 0755 $(BUILD_DIR)/Release/lib.target/libscim_mozc_setup.so \
	50	$(CURDIR)/debian/scim-mozc/$(SCIM_MODDIR)/SetupUI/mozc-setup.so
	51	install -D -m 0644 $(CURDIR)/debian/product_icon.png \
	52	$(CURDIR)/debian/scim-mozc/usr/share/scim/icons/scim-mozc.png
	53	install -D -m 0644 $(CURDIR)/debian/product_icon.png \
	54	$(CURDIR)/debian/scim-mozc/usr/share/scim/icons/scim-mozc-tool.png
	55
	56	# mozc-server
	57	install -D -m 0755 $(BUILD_DIR)/Release/mozc_server \
	58	$(CURDIR)/debian/mozc-server/usr/lib/mozc/mozc_server
	59
	60	# mozc-tool
	61	install -D -m 0755 $(BUILD_DIR)/Release/mozc_tool \
	62	$(CURDIR)/debian/mozc-utils-gui/usr/lib/mozc/mozc_tool
	63

+1

-0

debian/source/include-binaries less more

0

debian/product_icon.png