| 1 |
commit: 35c797b137b17993e8491610b2ed56f919fe7eda |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Jan 8 19:13:10 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 21:29:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c797b1 |
| 7 |
|
| 8 |
app-i18n/mozc: In live ebuild, use live version of Fcitx-Mozc patch. |
| 9 |
|
| 10 |
app-i18n/mozc/mozc-2.20.2673.102.ebuild | 21 +++++++++++++++------ |
| 11 |
app-i18n/mozc/mozc-9999.ebuild | 22 ++++++++++++++++------ |
| 12 |
2 files changed, 31 insertions(+), 12 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild |
| 15 |
index ee84afb7d91..907a92420d3 100644 |
| 16 |
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild |
| 17 |
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild |
| 18 |
@@ -1,4 +1,4 @@ |
| 19 |
-# Copyright 1999-2017 Gentoo Foundation |
| 20 |
+# Copyright 1999-2018 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
EAPI="6" |
| 24 |
@@ -15,19 +15,18 @@ else |
| 25 |
MOZC_GIT_REVISION="280e38fe3d9db4df52f0713acf2ca65898cd697a" |
| 26 |
JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684" |
| 27 |
JAPANESE_USAGE_DICTIONARY_DATE="20120416091336" |
| 28 |
+ FCITX_PATCH_VERSION="2.18.2612.102.1" |
| 29 |
fi |
| 30 |
|
| 31 |
-FCITX_PATCH_VERSION="2.18.2612.102.1" |
| 32 |
- |
| 33 |
DESCRIPTION="Mozc - Japanese input method editor" |
| 34 |
HOMEPAGE="https://github.com/google/mozc" |
| 35 |
if [[ "${PV}" == "9999" ]]; then |
| 36 |
SRC_URI="" |
| 37 |
else |
| 38 |
SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz |
| 39 |
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz" |
| 40 |
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz |
| 41 |
+ fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" |
| 42 |
fi |
| 43 |
-SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" |
| 44 |
|
| 45 |
# Mozc: BSD |
| 46 |
# src/data/dictionary_oss: ipadic, public-domain |
| 47 |
@@ -83,6 +82,12 @@ execute() { |
| 48 |
src_unpack() { |
| 49 |
if [[ "${PV}" == "9999" ]]; then |
| 50 |
git-r3_src_unpack |
| 51 |
+ |
| 52 |
+ if use fcitx4; then |
| 53 |
+ local EGIT_SUBMODULES=() |
| 54 |
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx |
| 55 |
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc" |
| 56 |
+ fi |
| 57 |
else |
| 58 |
unpack ${P}.tar.gz |
| 59 |
mv mozc-${MOZC_GIT_REVISION} ${P} || die |
| 60 |
@@ -99,7 +104,11 @@ src_prepare() { |
| 61 |
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" |
| 62 |
|
| 63 |
if use fcitx4; then |
| 64 |
- eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" |
| 65 |
+ if [[ "${PV}" == "9999" ]]; then |
| 66 |
+ cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die |
| 67 |
+ else |
| 68 |
+ eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" |
| 69 |
+ fi |
| 70 |
fi |
| 71 |
|
| 72 |
eapply_user |
| 73 |
|
| 74 |
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild |
| 75 |
index 35e9ab69f40..388857a1862 100644 |
| 76 |
--- a/app-i18n/mozc/mozc-9999.ebuild |
| 77 |
+++ b/app-i18n/mozc/mozc-9999.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2017 Gentoo Foundation |
| 80 |
+# Copyright 1999-2018 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
EAPI="6" |
| 84 |
@@ -15,19 +15,18 @@ else |
| 85 |
MOZC_GIT_REVISION="" |
| 86 |
JAPANESE_USAGE_DICTIONARY_GIT_REVISION="" |
| 87 |
JAPANESE_USAGE_DICTIONARY_DATE="" |
| 88 |
+ FCITX_PATCH_VERSION="" |
| 89 |
fi |
| 90 |
|
| 91 |
-FCITX_PATCH_VERSION="2.18.2612.102.1" |
| 92 |
- |
| 93 |
DESCRIPTION="Mozc - Japanese input method editor" |
| 94 |
HOMEPAGE="https://github.com/google/mozc" |
| 95 |
if [[ "${PV}" == "9999" ]]; then |
| 96 |
SRC_URI="" |
| 97 |
else |
| 98 |
SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz |
| 99 |
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz" |
| 100 |
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz |
| 101 |
+ fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" |
| 102 |
fi |
| 103 |
-SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" |
| 104 |
|
| 105 |
# Mozc: BSD |
| 106 |
# src/data/dictionary_oss: ipadic, public-domain |
| 107 |
@@ -83,6 +82,12 @@ execute() { |
| 108 |
src_unpack() { |
| 109 |
if [[ "${PV}" == "9999" ]]; then |
| 110 |
git-r3_src_unpack |
| 111 |
+ |
| 112 |
+ if use fcitx4; then |
| 113 |
+ local EGIT_SUBMODULES=() |
| 114 |
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx |
| 115 |
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc" |
| 116 |
+ fi |
| 117 |
else |
| 118 |
unpack ${P}.tar.gz |
| 119 |
mv mozc-${MOZC_GIT_REVISION} ${P} || die |
| 120 |
@@ -99,7 +104,11 @@ src_prepare() { |
| 121 |
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" |
| 122 |
|
| 123 |
if use fcitx4; then |
| 124 |
- eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" |
| 125 |
+ if [[ "${PV}" == "9999" ]]; then |
| 126 |
+ cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die |
| 127 |
+ else |
| 128 |
+ eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" |
| 129 |
+ fi |
| 130 |
fi |
| 131 |
|
| 132 |
eapply_user |
| 133 |
@@ -157,6 +166,7 @@ src_configure() { |
| 134 |
gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown) |
| 135 |
fi |
| 136 |
|
| 137 |
+ gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO)) |
| 138 |
gyp_arguments+=(-D use_libgtest=$(usex test 1 0)) |
| 139 |
gyp_arguments+=(-D use_libibus=$(usex ibus 1 0)) |
| 140 |
gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0)) |
Archives