From 95b278abf7e4a784735a6eebe6ee6729e2225e37 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 5 Mar 2018 21:05:28 +0100
Subject: [PATCH] mozc: fix fcitx-mozc cross compilation

Closes: #12186 [via git-merge-pr]
---
 srcpkgs/mozc/template | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 94e7e7a6225..7d662fc788b 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -3,7 +3,8 @@ pkgname=mozc
 version=2.23.2785.102
 revision=1
 hostmakedepends="ninja pkg-config protobuf-devel python"
-makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel"
+makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel
+ fcitx-devel"
 depends="tegaki-zinnia-japanese>=0.3"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 homepage="https://github.com/google/mozc"
@@ -24,17 +25,11 @@ checksum="
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
-else
-	makedepends+=" fcitx-devel"
 fi
 
 post_extract() {
 	ln -s mozc-* mozc
-	if [ -n "$CROSS_BUILD" ]; then
-		rm -rf mozc/src/unix/fcitx*
-	else
-		rm -rf mozc/src/unix/fcitx5
-	fi
+	rm -rf mozc/src/unix/fcitx5
 
 	# symlink "submodules" into place
 	for _src_dest in gyp japanese-usage-dictionary:japanese_usage_dictionary; do
@@ -43,6 +38,11 @@ post_extract() {
 		rmdir $_dst
 		ln -sr $_src-* $_dst
 	done
+
+	if [ -n "$CROSS_BUILD" ]; then
+		# find fcitx4-config
+		sed -i -e "s;fcitx4-config;${XBPS_CROSS_BASE}/usr/bin/fcitx4-config;" mozc/src/unix/fcitx/fcitx.gyp
+	fi
 }
 
 do_configure() {
@@ -59,10 +59,8 @@ do_build() {
 	 unix/emacs/emacs.gyp:mozc_emacs_helper
 	 unix/ibus/ibus.gyp:ibus_mozc
 	 renderer/renderer.gyp:mozc_renderer
+	 unix/fcitx/fcitx.gyp:fcitx-mozc
 	"
-	if [ -z "$CROSS_BUILD" ]; then
-		targets+=" unix/fcitx/fcitx.gyp:fcitx-mozc"
-	fi
 	GYP_DEFINES="
 	 document_dir=/usr/share/licenses/${pkgname}
 	 use_libprotobuf=1
@@ -106,7 +104,6 @@ emacs-mozc_package() {
 	}
 }
 
-if [ -z "$CROSS_BUILD" ]; then
 fcitx-mozc_package() {
 	short_desc="Mozc engine for fcitx - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} fcitx>=4.2.9"
@@ -118,4 +115,3 @@ fcitx-mozc_package() {
 		install -D -m 644 unix/fcitx/mozc.conf "${PKGDESTDIR}/usr/share/fcitx/inputmethod/mozc.conf"
 	}
 }
-fi