From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C305F138330 for ; Tue, 9 Jan 2018 01:55:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDE0CE0922; Tue, 9 Jan 2018 01:55:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F6A4E0921 for ; Tue, 9 Jan 2018 01:55:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44949335CA3 for ; Mon, 8 Jan 2018 21:31:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 903AF1AD for ; Mon, 8 Jan 2018 21:31:42 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1515446977.35c797b137b17993e8491610b2ed56f919fe7eda.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/mozc/mozc-2.20.2673.102.ebuild app-i18n/mozc/mozc-9999.ebuild X-VCS-Directories: app-i18n/mozc/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 35c797b137b17993e8491610b2ed56f919fe7eda X-VCS-Branch: master Date: Mon, 8 Jan 2018 21:31:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 82ec283d-7fba-4c9e-a866-e9f8142b199b X-Archives-Hash: e83ecc0b2f23bf2a4607906ffe52cb56 commit: 35c797b137b17993e8491610b2ed56f919fe7eda Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Jan 8 19:13:10 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jan 8 21:29:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c797b1 app-i18n/mozc: In live ebuild, use live version of Fcitx-Mozc patch. app-i18n/mozc/mozc-2.20.2673.102.ebuild | 21 +++++++++++++++------ app-i18n/mozc/mozc-9999.ebuild | 22 ++++++++++++++++------ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild index ee84afb7d91..907a92420d3 100644 --- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild +++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -15,19 +15,18 @@ else MOZC_GIT_REVISION="280e38fe3d9db4df52f0713acf2ca65898cd697a" JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684" JAPANESE_USAGE_DICTIONARY_DATE="20120416091336" + FCITX_PATCH_VERSION="2.18.2612.102.1" fi -FCITX_PATCH_VERSION="2.18.2612.102.1" - DESCRIPTION="Mozc - Japanese input method editor" HOMEPAGE="https://github.com/google/mozc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" else SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz - 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" + 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 + fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" fi -SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" # Mozc: BSD # src/data/dictionary_oss: ipadic, public-domain @@ -83,6 +82,12 @@ execute() { src_unpack() { if [[ "${PV}" == "9999" ]]; then git-r3_src_unpack + + if use fcitx4; then + local EGIT_SUBMODULES=() + git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx + git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc" + fi else unpack ${P}.tar.gz mv mozc-${MOZC_GIT_REVISION} ${P} || die @@ -99,7 +104,11 @@ src_prepare() { eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" if use fcitx4; then - eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" + if [[ "${PV}" == "9999" ]]; then + cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die + else + eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" + fi fi eapply_user diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild index 35e9ab69f40..388857a1862 100644 --- a/app-i18n/mozc/mozc-9999.ebuild +++ b/app-i18n/mozc/mozc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -15,19 +15,18 @@ else MOZC_GIT_REVISION="" JAPANESE_USAGE_DICTIONARY_GIT_REVISION="" JAPANESE_USAGE_DICTIONARY_DATE="" + FCITX_PATCH_VERSION="" fi -FCITX_PATCH_VERSION="2.18.2612.102.1" - DESCRIPTION="Mozc - Japanese input method editor" HOMEPAGE="https://github.com/google/mozc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" else SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz - 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" + 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 + fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" fi -SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" # Mozc: BSD # src/data/dictionary_oss: ipadic, public-domain @@ -83,6 +82,12 @@ execute() { src_unpack() { if [[ "${PV}" == "9999" ]]; then git-r3_src_unpack + + if use fcitx4; then + local EGIT_SUBMODULES=() + git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx + git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc" + fi else unpack ${P}.tar.gz mv mozc-${MOZC_GIT_REVISION} ${P} || die @@ -99,7 +104,11 @@ src_prepare() { eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" if use fcitx4; then - eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" + if [[ "${PV}" == "9999" ]]; then + cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die + else + eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" + fi fi eapply_user @@ -157,6 +166,7 @@ src_configure() { gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown) fi + gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO)) gyp_arguments+=(-D use_libgtest=$(usex test 1 0)) gyp_arguments+=(-D use_libibus=$(usex ibus 1 0)) gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))