Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inputmethod/mozc-server/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.16 2014/02/12 23:18:04 tron Exp $
# $NetBSD: Makefile,v 1.21 2014/08/07 03:03:32 obache Exp $
PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/}
PKGREVISION= 2
INSTALLATION_DIRS+= libexec
do-build:
cd ${WRKSRC} && env ${MAKE_ENV} \
${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
${_MAKE_JOBS} \
server/server.gyp:mozc_server
do-install:

27
inputmethod/mozc-server/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.8 2014/03/27 19:28:33 ryoon Exp $
# $NetBSD: Makefile.common,v 1.18 2015/02/17 23:55:58 ryoon Exp $
# used by inputmethod/ibus-mozc/Makefile
# used by inputmethod/mozc-elisp/Makefile
# used by inputmethod/mozc-server/Makefile
@@ -7,10 +7,10 @@
# used by inputmethod/uim-mozc/Makefile
#
DISTNAME= mozc-1.13.1651.102
DISTNAME= mozc-2.16.2037.102
CATEGORIES= inputmethod
MASTER_SITES= http://mozc.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.xz
MAINTAINER= ryoon@NetBSD.org
HOMEPAGE= http://code.google.com/p/mozc/
@@ -21,17 +21,19 @@ DISTINFO_FILE= ${.CURDIR}/../../inputmethod/mozc-server/distinfo
PATCHDIR= ${.CURDIR}/../../inputmethod/mozc-server/patches
BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gyp
USE_LANGUAGES= c c++
# nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later
GCC_REQD+= 4.7
CXXFLAGS+= -std=c++11
# nullptr requires -std=c++11, and -std=c++11 requires gcc 4.6 or later
GCC_REQD+= 4.6
CXXFLAGS+= -std=c++03
USE_TOOLS+= gmake pkg-config
FIND_PREFIX:= GYPDIR=${PYPKGPREFIX}-gyp
#FIND_PREFIX:= NINJADIR=ninja
.include "../../mk/find-prefix.mk"
OPENSSL_CFLAGS= -I${BUILDLINK_PREFIX.openssl}/include
@@ -47,6 +49,7 @@ SUBST_FILES.gyp+= base/process.cc
SUBST_FILES.gyp+= base/system_util.cc
SUBST_FILES.gyp+= handwriting/zinnia_handwriting.cc
SUBST_FILES.gyp+= unix/ibus/gen_mozc_xml.py
SUBST_FILES.gyp+= unix/ibus/ibus.gyp
SUBST_FILES.gyp+= gyp/common.gypi
SUBST_VARS.gyp+= OPENSSL_CFLAGS OPENSSL_INC OPENSSL_LDFLAGS OPENSSL_LIBS
SUBST_VARS.gyp+= PREFIX QTDIR
@@ -64,18 +67,18 @@ OSDEST= linux
MOZC_BUILD_MODE= Release # or Debug
do-configure:
cd ${WRKSRC} && env ${MAKE_ENV} \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
GYP_DEFINES="use_libprotobuf=1" \
${PYTHONBIN} build_mozc.py gyp \
--gypdir=${GYPDIR}/bin && \
${PYTHONBIN} build_mozc.py build_tools -c ${MOZC_BUILD_MODE} \
${_MAKE_JOBS}
${PYTHONBIN} build_mozc.py \
gyp \
--gypdir=${GYPDIR}/bin
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/protobuf/buildlink3.mk"
# gmock is not used yet...
#.include "../../devel/gmock/buildlink3.mk"
.include "../../inputmethod/zinnia/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"

37
inputmethod/mozc-server/distinfo
View File

@@ -1,25 +1,23 @@
$NetBSD: distinfo,v 1.6 2014/01/20 10:39:29 ryoon Exp $
$NetBSD: distinfo,v 1.13 2015/02/17 23:55:58 ryoon Exp $
SHA1 (mozc-1.13.1651.102.tar.bz2) = 24680b3d350e5332f2235b9c1342127f6ef0fd63
RMD160 (mozc-1.13.1651.102.tar.bz2) = 260a23c2f9f3b909aefe63c865f3b87013d2fb53
Size (mozc-1.13.1651.102.tar.bz2) = 31635636 bytes
SHA1 (uim-mozc-331.tar.xz) = 760d1deb5964358d1dc064e44d45eec38d94d9ec
RMD160 (uim-mozc-331.tar.xz) = db4df92b8adc0e6202cf7f61c326b1503e157d9b
Size (uim-mozc-331.tar.xz) = 30580 bytes
SHA1 (patch-base_base.gyp) = 329bd8614282aca28fcba30b2e593f488801118d
SHA1 (mozc-2.16.2037.102.tar.xz) = 74c088a81572588d8e60aaf25d066cc74b6fc989
RMD160 (mozc-2.16.2037.102.tar.xz) = b26f8f58ef2e2f27e5ce42804c6559cb59d33aa9
Size (mozc-2.16.2037.102.tar.xz) = 37548784 bytes
SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91
RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e
Size (uim-mozc-334.tar.xz) = 30544 bytes
SHA1 (patch-base_base.gyp) = 437fa7ef6c84448a2a8fb049af773ab9df64dc81
SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
SHA1 (patch-base_crash__report__handler.cc) = 28e581ffef8a108aff372c79b3578686472cb464
SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8
SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31
SHA1 (patch-base_mutex.h) = 6c3c8f0845f0fdad815c4877026894000d5eac2c
SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f96
SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
SHA1 (patch-base_run__level.cc) = 8aa169a8be51674898906740cb8f6103b99021b4
SHA1 (patch-base_run__level.cc) = ead96536246093bd3d44f59a80085da2f39904e8
SHA1 (patch-base_system__util.cc) = f3ef575a15cd518fe7d29264b39f775ccf502802
SHA1 (patch-base_thread.h) = 8aaacbb1421cf0e886f3b58dfd2c653f3d82ef70
SHA1 (patch-base_util.cc) = c473cb595535075b53c9c235fc28f5e7da26d087
SHA1 (patch-build__mozc.py) = a8b4596c9c5f86ca8dbbf3ea03e1873ff86baa00
SHA1 (patch-build__mozc.py) = 2e5448bb1bc07cdf9410ce1adf918416a1302db4
SHA1 (patch-build__tools_mozc__version.py) = a6ff8a82b1328086b7d758f73a7d3c31e87bccc9
SHA1 (patch-build__tools_util.py) = 6416884ba288d60eb8e558e8c5de7ef6e538b82e
SHA1 (patch-client_client.cc) = 7ca43dde3f207331005599653c6520667e3ca93c
@@ -27,12 +25,11 @@ SHA1 (patch-config_stats__config__util__test.cc) = db51e6619c5c04ac8fa5089082520
SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b
SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a
SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
SHA1 (patch-gui_config__dialog_keymap__editor.cc) = a78a4fb5c484e672b0cfecf38c6713cf74007cb5
SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 0ce41d4522c837836bad345cf82cb4741e7af4d0
SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a
SHA1 (patch-gui_qt__libraries.gypi) = 2b00307c22380d0d1c60b5d98ce08970b0e74f09
SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
SHA1 (patch-gyp_common.gypi) = 69095a357de9d871c93fc8effda95568068bedab
SHA1 (patch-gyp_common.gypi) = c9d93e9ff9c917f759694ed94568d3996e355c6c
SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
@@ -41,10 +38,10 @@ SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2
SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f
SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
SHA1 (patch-protobuf_genproto.gypi) = 601165a376bcd05983f87733285737ee043c13fe
SHA1 (patch-protobuf_protobuf.gyp) = 60abe727c1475e50295a5e811dccf8deb710e18a
SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 9d7e1da07854c2244a22ffe5034fabb25d16d266
SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e
SHA1 (patch-third__party_protobuf_post__process__dist.sh) = c54363572de0afc2c49b4ed06bc0eb329e4ad237
SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 566d567ae4f911766309e035697a23350f24bbf5
SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96

35
inputmethod/mozc-server/patches/patch-base_base.gyp
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-base_base.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
$NetBSD: patch-base_base.gyp,v 1.5 2014/11/07 23:28:36 ryoon Exp $
--- base/base.gyp.orig 2013-07-17 02:38:04.000000000 +0000
--- base/base.gyp.orig 2014-11-03 05:13:02.000000000 +0000
+++ base/base.gyp
@@ -86,7 +86,7 @@
@@ -78,7 +78,7 @@
# shared among *host* binaries and *target* binaries. This means that
# you should implement *host* binaries by using limited libraries
# which are also available on NDK.
@@ -11,32 +11,3 @@ $NetBSD: patch-base_base.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
'not (target_platform=="NaCl" and _toolset=="target")', {
'defines': [
'HAVE_LIBRT=1',
@@ -287,23 +287,23 @@
],
},
}],
- ['OS=="linux" and target_platform!="Android" and '
+ ['OS=="netbsd" or (OS=="linux" and target_platform!="Android") and '
'not (target_platform=="NaCl" and _toolset=="target")', {
'cflags': [
- '<!@(<(pkg_config_command) --cflags-only-other openssl)',
+ '@OPENSSL_CFLAGS@',
],
'defines': [
'HAVE_OPENSSL=1',
],
'include_dirs': [
- '<!@(<(pkg_config_command) --cflags-only-I openssl)',
+ '@OPENSSL_INC@',
],
'link_settings': {
'ldflags': [
- '<!@(<(pkg_config_command) --libs-only-L openssl)',
+ '@OPENSSL_LDFLAGS@',
],
'libraries': [
- '<!@(<(pkg_config_command) --libs-only-l openssl)',
+ '@OPENSSL_LIBS@',
],
},
}],

19
inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc
View File

@@ -1,19 +0,0 @@
$NetBSD: patch-base_crash__report__handler.cc,v 1.3 2014/01/19 01:18:50 ryoon Exp $
--- base/crash_report_handler.cc.orig 2014-01-06 07:10:31.000000000 +0000
+++ base/crash_report_handler.cc
@@ -346,7 +346,7 @@ void CrashReportHandler::SetCriticalSect
} // namespace mozc
-#else
+#elif defined(OS_LINUX) || defined(OS_NETBSD) // OS_WIN
namespace mozc {
@@ -372,4 +372,4 @@ void CrashReportHandler::SetCriticalSect
} // namespace mozc
-#endif
+#endif // OS_WIN OS_LINUX OS_NETBSD

10
inputmethod/mozc-server/patches/patch-base_run__level.cc
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-base_run__level.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
$NetBSD: patch-base_run__level.cc,v 1.3 2014/11/07 23:28:36 ryoon Exp $
--- base/run_level.cc.orig 2013-03-29 04:33:43.000000000 +0000
--- base/run_level.cc.orig 2014-11-03 05:13:02.000000000 +0000
+++ base/run_level.cc
@@ -34,10 +34,10 @@
#include <aclapi.h>
#endif // OS_WIN
@@ -38,10 +38,10 @@
#include <unistd.h>
#endif // OS_MACOSX
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_NETBSD)

18
inputmethod/mozc-server/patches/patch-base_thread.h
View File

@@ -1,18 +0,0 @@
$NetBSD: patch-base_thread.h,v 1.2 2013/07/20 04:34:53 ryoon Exp $
--- base/thread.h.orig 2013-07-17 02:38:04.000000000 +0000
+++ base/thread.h
@@ -55,11 +55,11 @@
// Andorid NDK and NaCl don't support TLS.
#if defined(OS_LINUX) && !defined(OS_ANDROID) && \
- !defined(__native_client__) && (defined(__GNUC__) || defined(__clang__))
+ !defined(__native_client__) && (defined(__GNUC__) || defined(__clang__)) || defined(OS_NETBSD)
// GCC and Clang support TLS.
#define TLS_KEYWORD __thread
#define HAVE_TLS 1
-#endif // OS_LINUX && !OS_ANDROID && (__GNUC__ || __clang__)
+#endif // OS_LINUX && !OS_ANDROID && (__GNUC__ || __clang__) || OS_NETBSD
#if defined(OS_MACOSX) && MOZC_GCC_VERSION_GE(4, 5)

79
inputmethod/mozc-server/patches/patch-build__mozc.py
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
$NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $
--- build_mozc.py.orig 2014-01-06 07:10:26.000000000 +0000
--- build_mozc.py.orig 2014-11-03 05:13:03.000000000 +0000
+++ build_mozc.py
@@ -60,6 +60,7 @@ from build_tools.util import FindFileFro
from build_tools.util import GetNumberOfProcessors
@@ -10,7 +10,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
from build_tools.util import IsMac
from build_tools.util import IsWindows
from build_tools.util import PrintErrorAndExit
@@ -120,6 +121,8 @@ def GetBuildBaseName(options, target_pla
@@ -121,6 +122,8 @@ def GetBuildShortBaseName(options, targe
build_base = 'out_mac'
elif target_platform == 'Linux':
build_base = 'out_linux'
@@ -19,7 +19,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
elif target_platform == 'Android':
build_base = 'out_android'
elif target_platform == 'NaCl':
@@ -214,6 +217,14 @@ def GetGypFileNames(options):
@@ -219,6 +222,14 @@ def GetGypFileNames(options):
if not PkgExists('ibus-1.0 >= 1.4.1'):
logging.info('removing ibus.gyp.')
gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR)
@@ -34,7 +34,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
elif options.target_platform == 'NaCl':
# Add chrome NaCl Mozc gyp scripts.
gyp_file_names.append('%s/chrome/nacl/nacl_extension.gyp' % SRC_DIR)
@@ -309,6 +320,8 @@ def AddTargetPlatformOption(parser):
@@ -314,6 +325,8 @@ def AddTargetPlatformOption(parser):
# If you want Android build, specify "Android".
if IsLinux():
default_target = 'Linux'
@@ -43,7 +43,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
elif IsWindows():
default_target = 'Windows'
elif IsMac():
@@ -506,6 +519,14 @@ def ExpandMetaTarget(options, meta_targe
@@ -511,6 +524,14 @@ def ExpandMetaTarget(options, meta_targe
SRC_DIR + '/gui/gui.gyp:mozc_tool']
if PkgExists('ibus-1.0 >= 1.4.1'):
targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
@@ -58,7 +58,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
elif target_platform == 'Mac':
targets = [SRC_DIR + '/mac/mac.gyp:DiskImage']
elif target_platform == 'Windows':
@@ -531,7 +552,7 @@ def ParseBuildOptions(args=None, values=
@@ -536,7 +557,7 @@ def ParseBuildOptions(args=None, values=
"""Parses command line options for the build command."""
parser = optparse.OptionParser(usage='Usage: %prog build [options]')
AddCommonOptions(parser)
@@ -67,16 +67,16 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
default_build_concurrency = GetNumberOfProcessors() * 2
parser.add_option('--jobs', '-j', dest='jobs',
default=('%d' % default_build_concurrency),
@@ -551,7 +572,7 @@ def ParseRunTestsOptions(args=None, valu
@@ -565,7 +586,7 @@ def ParseRunTestsOptions(args=None, valu
parser = optparse.OptionParser(
usage='Usage: %prog runtests [options] [test_targets] [-- build options]')
AddCommonOptions(parser)
- if IsLinux():
+ if IsLinux() or ISNetBSD():
+ if IsLinux() or IsNetBSD():
default_build_concurrency = GetNumberOfProcessors() * 2
parser.add_option('--jobs', '-j', dest='jobs',
default=('%d' % default_build_concurrency),
@@ -777,7 +798,8 @@ def GypMain(options, unused_args, _):
@@ -788,7 +809,8 @@ def GypMain(options, unused_args, _):
gyp_options.extend(['-D', 'channel_dev=1'])
def SetCommandLineForFeature(option_name, windows=False, mac=False,
@@ -86,7 +86,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
"""Updates an option like '--enable_foober' and add a -D argument for gyp.
This function ensures an option like '--enable_foober' exists and it has a
@@ -799,6 +821,8 @@ def GypMain(options, unused_args, _):
@@ -810,6 +832,8 @@ def GypMain(options, unused_args, _):
option on Android platform.
nacl: A boolean which replesents the default value of the target
option on NaCl.
@@ -95,7 +95,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
Raises:
ValueError: An error occurred when 'option_name' is empty.
@@ -811,6 +835,7 @@ def GypMain(options, unused_args, _):
@@ -822,6 +846,7 @@ def GypMain(options, unused_args, _):
'Mac': mac,
'Linux': linux,
'Android': android,
@@ -103,7 +103,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
'NaCl': nacl}[options.target_platform]
enable_option_name = 'enable_%s' % option_name
enabled = options.ensure_value(enable_option_name, default_enabled)
@@ -822,10 +847,12 @@ def GypMain(options, unused_args, _):
@@ -833,10 +858,12 @@ def GypMain(options, unused_args, _):
SetCommandLineForFeature(option_name='cloud_handwriting',
linux=is_official_dev,
@@ -116,7 +116,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
windows=is_official,
mac=is_official,
android=is_official,
@@ -863,7 +890,8 @@ def GypMain(options, unused_args, _):
@@ -874,7 +901,8 @@ def GypMain(options, unused_args, _):
else:
gyp_options.extend(['-D', 'use_zinnia=NO'])
@@ -126,7 +126,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
'%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names):
gyp_options.extend(['-D', 'use_libibus=1'])
@@ -896,7 +924,7 @@ def GypMain(options, unused_args, _):
@@ -907,7 +935,7 @@ def GypMain(options, unused_args, _):
# command for pkg-config. Here we catch the environment variable
# and use the specified command instead of actual pkg-config
# command.
@@ -135,49 +135,33 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
gyp_options.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()])
else:
gyp_options.extend(['-D', 'pkg_config_command='])
@@ -1049,6 +1077,41 @@ def BuildOnMac(options, targets, origina
@@ -1045,6 +1073,25 @@ def BuildOnMac(options, targets, origina
'-parallelizeTargets',
'BUILD_WITH_GYP=1'])
+def BuildOnBSD(options, targets, unused_original_directory_name):
+ """Build the targets on *BSD."""
+ """Build the targets on BSD."""
+ target_names = []
+ for target in targets:
+ (unused_gyp_file_name, target_name) = (
+ CanonicalTargetToGypFileAndTargetName(target))
+ target_names.append(target_name)
+
+ make_command = os.getenv('BUILD_COMMAND', 'make')
+
+ envvars = [
+ 'CFLAGS',
+ 'CXXFLAGS',
+ 'CXX',
+ 'CC',
+ 'AR',
+ 'AS',
+ 'RANLIB',
+ 'LD',
+ ]
+ for envvar in envvars:
+ if envvar in os.environ:
+ os.environ[envvar] = os.getenv(envvar)
+
+ # set output directory
+ os.environ['builddir_name'] = 'out_bsd'
+
+ build_args = ['-j%s' % options.jobs,
+ 'MAKE_JOBS=%s' % options.jobs,
+ 'BUILDTYPE=%s' % options.configuration]
+ build_args.append('builddir_name=%s' %
+ GetBuildBaseName(options,
+ GetMozcVersion().GetTargetPlatform()))
+ ninja = 'ninja'
+ if hasattr(options, 'android_device'):
+ # Only for android testing.
+ os.environ['ANDROID_DEVICES'] = options.android_device
+
+ short_basename = GetBuildShortBaseName(options,
+ GetMozcVersion().GetTargetPlatform())
+ make_command = ninja
+ build_args = ['-j %s' % options.jobs,
+ '-C', '%s/%s' % (short_basename, options.configuration)]
+ RunOrDie([make_command] + build_args + target_names)
def BuildOnWindows(targets):
"""Build the target on Windows."""
@@ -1076,6 +1139,8 @@ def BuildMain(options, targets, original
@@ -1072,6 +1119,8 @@ def BuildMain(options, targets, original
BuildOnMac(options, targets, original_directory_name)
elif IsLinux():
BuildOnLinux(options, targets, original_directory_name)
@@ -186,12 +170,3 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
elif IsWindows():
BuildOnWindows(targets)
else:
@@ -1341,7 +1406,7 @@ def CleanBuildFilesAndDirectories(option
elif IsMac():
directory_names.extend(glob.glob(os.path.join(gyp_directory_name,
'*.xcodeproj')))
- elif IsLinux():
+ elif IsLinux() or IsNetBSD():
file_names.extend(glob.glob(os.path.join(gyp_directory_name,
'*.target.mk')))
file_names.extend(glob.glob(os.path.join(gyp_directory_name,

20
inputmethod/mozc-server/patches/patch-gui_config__dialog_keymap__editor.cc
View File

@@ -1,20 +0,0 @@
$NetBSD: patch-gui_config__dialog_keymap__editor.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
--- gui/config_dialog/keymap_editor.cc.orig 2013-07-17 02:38:20.000000000 +0000
+++ gui/config_dialog/keymap_editor.cc
@@ -448,13 +448,13 @@ bool KeyMapEditorDialog::Update() {
*keymap_table += invisible_keymap_table_;
if (new_ime_switch_keymap != ime_switch_keymap_) {
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_NETBSD)
QMessageBox::information(
this,
windowTitle(),
tr("The keymaps for IME ON and Reconversion will be "
"applied after new applications."));
-#endif // OS_WIN || OS_LINUX
+#endif // OS_WIN || OS_LINUX || OS_NETBSD
ime_switch_keymap_ = new_ime_switch_keymap;
}

20
inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc
View File

@@ -1,22 +1,8 @@
$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $
$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.5 2014/06/15 13:08:34 ryoon Exp $
--- gui/dictionary_tool/dictionary_tool.cc.orig 2014-01-06 07:10:48.000000000 +0000
--- gui/dictionary_tool/dictionary_tool.cc.orig 2014-05-21 10:51:22.000000000 +0000
+++ gui/dictionary_tool/dictionary_tool.cc
@@ -194,11 +194,11 @@ class MultiByteTextLineIterator
}
bool IsAvailable() const {
- return *(ifs_.get());
+ return (ifs_.get())->good() || (ifs_.get())->eof();
}
bool Next(string *line) {
- if (!*(ifs_.get())) {
+ if (!IsAvailable()) {
return false;
}
@@ -341,7 +341,7 @@ DictionaryTool::DictionaryTool(QWidget *
@@ -347,7 +347,7 @@ DictionaryTool::DictionaryTool(QWidget *
#endif // !ENABLE_CLOUD_SYNC
// main window

13
inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-gui_qt__libraries.gypi,v 1.2 2013/09/07 18:42:14 ryoon Exp $
$NetBSD: patch-gui_qt__libraries.gypi,v 1.3 2014/06/15 13:08:34 ryoon Exp $
--- gui/qt_libraries.gypi.orig 2013-08-28 05:26:12.000000000 +0000
--- gui/qt_libraries.gypi.orig 2014-05-21 10:51:21.000000000 +0000
+++ gui/qt_libraries.gypi
@@ -84,7 +84,7 @@
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
@@ -11,12 +11,3 @@ $NetBSD: patch-gui_qt__libraries.gypi,v 1.2 2013/09/07 18:42:14 ryoon Exp $
'conditions': [
['qt_dir', {
'libraries': [
@@ -112,7 +112,7 @@
# Workarounds related with clang.
['clang==1', {
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="netbsd"', {
'cflags': [
# Temporal workaround against following false warning in Clang.
# http://lists.cs.uiuc.edu/pipermail/cfe-dev/2012-June/022477.html

30
inputmethod/mozc-server/patches/patch-gyp_common.gypi
View File

@@ -1,25 +1,17 @@
$NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $
$NetBSD: patch-gyp_common.gypi,v 1.6 2015/02/17 23:55:58 ryoon Exp $
--- gyp/common.gypi.orig 2014-01-06 07:10:31.000000000 +0000
--- gyp/common.gypi.orig 2015-02-17 14:35:04.000000000 +0000
+++ gyp/common.gypi
@@ -92,6 +92,7 @@
'-include base/namespace.h',
'-pipe',
'-pthread',
+ '-std=c++0x',
],
# linux_cflags will be used in Linux except for NaCl.
'linux_cflags': [
@@ -137,7 +138,7 @@
'clang_bin_dir': '/Applications/Xcode.app/Contents/Developer/Toolchains'
'/XcodeDefault.xctoolchain/usr/bin/',
@@ -158,7 +158,7 @@
'compiler_host': 'clang',
'compiler_host_version_int': 305, # Clang 3.5 or higher
}],
- ['target_platform=="Linux"', {
+ ['target_platform=="Linux" or target_platform=="NetBSD"', {
# enable_gtk_renderer represents if mozc_renderer is supported on Linux
# or not.
'enable_gtk_renderer%': 1,
@@ -195,7 +196,7 @@
'compiler_target': 'clang',
@@ -206,7 +206,7 @@
# server_dir represents the directory where mozc_server is
# installed. This option is only for Linux.
@@ -28,7 +20,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $
# Represents the directory where the source code of protobuf is
# extracted. This value is ignored when 'use_libprotobuf' is 1.
@@ -286,7 +287,7 @@
@@ -300,7 +300,7 @@
['channel_dev==1', {
'defines': ['CHANNEL_DEV'],
}],
@@ -37,7 +29,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $
'ldflags': [
'<@(linux_ldflags)',
],
@@ -451,7 +452,7 @@
@@ -513,7 +513,7 @@
},
},
'conditions': [
@@ -46,7 +38,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $
'cflags': [
'<@(debug_extra_cflags)',
],
@@ -489,7 +490,7 @@
@@ -574,7 +574,7 @@
},
},
'conditions': [
@@ -55,7 +47,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $
'cflags': [
'<@(release_extra_cflags)',
],
@@ -753,6 +754,22 @@
@@ -793,6 +793,22 @@
}],
],
}],

13
inputmethod/mozc-server/patches/patch-protobuf_genproto.gypi
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-protobuf_genproto.gypi,v 1.3 2013/09/07 18:42:14 ryoon Exp $
--- protobuf/genproto.gypi.orig 2013-08-28 05:26:13.000000000 +0000
+++ protobuf/genproto.gypi
@@ -34,7 +34,7 @@
'protoc_command': 'protoc<(EXECUTABLE_SUFFIX)',
},
'conditions': [
- ['target_platform!="Linux"', {
+ ['target_platform!="Linux" and target_platform!="NetBSD"', {
'variables': {
'protoc_wrapper_additional_options': ['--protoc_dir=<(mozc_build_tools_dir)'],
},

24
inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
View File

@@ -1,26 +1,8 @@
$NetBSD: patch-protobuf_protobuf.gyp,v 1.3 2014/01/19 01:18:50 ryoon Exp $
$NetBSD: patch-protobuf_protobuf.gyp,v 1.5 2015/01/06 10:30:54 ryoon Exp $
--- protobuf/protobuf.gyp.orig 2014-01-06 07:10:31.000000000 +0000
--- protobuf/protobuf.gyp.orig 2015-01-06 06:21:18.000000000 +0000
+++ protobuf/protobuf.gyp
@@ -161,7 +161,7 @@
],
'conditions': [
# for gcc and clang
- ['OS=="linux" or OS=="mac"', {
+ ['OS=="linux" or OS=="mac" or OS=="netbsd"', {
'cflags': [
'-Wno-conversion-null', # coded_stream.cc uses NULL to bool.
'-Wno-unused-function',
@@ -201,7 +201,7 @@
'<(protobuf_root)/src',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="netbsd"', {
'conditions': [
['use_libprotobuf!=1', {
'cflags': [
@@ -237,7 +237,7 @@
@@ -254,7 +254,7 @@
},
'conditions': [
# use system-installed protoc on Linux

13
inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.1 2014/06/15 13:08:34 ryoon Exp $
--- third_party/protobuf/post_process_dist.sh.orig 2014-05-21 10:51:38.000000000 +0000
+++ third_party/protobuf/post_process_dist.sh
@@ -15,7 +15,7 @@
# non-testdata .txt files are converted to Windows-style line endings.
# 5) Cleans up after itself.
-if [ "$1" == "" ]; then
+if [ "$1" = "" ]; then
echo "USAGE: $1 DISTFILE" >&2
exit 1
fi

22
inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py
View File

@@ -1,27 +1,9 @@
$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.6 2014/06/15 13:08:34 ryoon Exp $
* Fix for pkgsrc installation.
--- unix/ibus/gen_mozc_xml.py.orig 2014-01-06 07:10:26.000000000 +0000
--- unix/ibus/gen_mozc_xml.py.orig 2014-05-21 10:49:56.000000000 +0000
+++ unix/ibus/gen_mozc_xml.py
@@ -47,7 +47,7 @@ import sys
IBUS_COMPONENT_PROPS = {
'name': 'com.google.IBus.Mozc',
'description': '%(product_name)s Component',
- 'exec': '%(ibus_mozc_path)s --ibus',
+ 'exec': '@PREFIX@/libexec/ibus-engine-mozc --ibus',
# TODO(mazda): Generate the version number.
'version': '0.0.0.0',
'author': 'Google Inc.',
@@ -60,7 +60,7 @@ IBUS_COMPONENT_PROPS = {
IBUS_ENGINE_COMMON_PROPS = {
'description': '%(product_name)s (Japanese Input Method)',
'language': 'ja',
- 'icon': '%(ibus_mozc_icon_path)s',
+ 'icon': '@PREFIX@/share/ibus-mozc/product_icon.png',
'rank': '80',
}
@@ -93,6 +93,22 @@ IBUS_ENGINES_PROPS = {
'longname': ['%(product_name)s'],
'layout': ['default'],

15
inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-unix_ibus_ibus.gyp,v 1.1 2014/06/15 13:08:34 ryoon Exp $
--- unix/ibus/ibus.gyp.orig 2014-05-21 10:49:56.000000000 +0000
+++ unix/ibus/ibus.gyp
@@ -31,8 +31,8 @@
'variables': {
'relative_dir': 'unix/ibus',
'gen_out_dir': '<(SHARED_INTERMEDIATE_DIR)/<(relative_dir)',
- 'ibus_mozc_icon_path%': '/usr/share/ibus-mozc/product_icon.png',
- 'ibus_mozc_path%': '/usr/lib/ibus-mozc/ibus-engine-mozc',
+ 'ibus_mozc_icon_path%': '@PREFIX@/share/ibus-mozc/product_icon.png',
+ 'ibus_mozc_path%': '@PREFIX@/libexec/ibus-engine-mozc',
# enable_x11_selection_monitor represents if ibus_mozc uses X11 selection
# monitor or not.
'enable_x11_selection_monitor%': 1,

15
inputmethod/mozc-server/patches/patch-unix_ibus_mozc__engine.cc
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-unix_ibus_mozc__engine.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
* I am not sure.
--- unix/ibus/mozc_engine.cc.orig 2013-07-17 02:37:50.000000000 +0000
+++ unix/ibus/mozc_engine.cc
@@ -265,7 +265,7 @@ bool GetSurroundingText(IBusEngine *engi
}
const uint32 selection_start = min(cursor_pos, anchor_pos);
- const uint32 selection_length = abs(info->relative_selected_length);
+ const uint32 selection_length = ::abs(info->relative_selected_length);
info->preceding_text = surrounding_text.substr(0, selection_start);
Util::SubString(surrounding_text,
selection_start,