mozc: bump version, Support x86_gcc2 environment (#2438)

app-i18n/mozc/mozc-2.23.2785.102.4.recipe

@@ -6,7 +6,7 @@ COPYRIGHT="2010-2018 Google Inc."
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/hanya/mozc/releases/download/v$portVersion/mozc-v$portVersion.tar.bz2"
-CHECKSUM_SHA256="263d91081011f16b3b16a87cd679c6ee473fe57feb4d6e0e1ee992cc306a68b1"
+CHECKSUM_SHA256="7e79d1bb0f684e63afa90fbe7647eb9162395c65f03ae2350d4bc4c539338615"
 SOURCE_DIR="mozc"
 if [ "$effectiveTargetArchitecture" = x86 ]; then
 	PATCHES="mozc-$portVersion-x86.patch"
@@ -16,16 +16,17 @@ SOURCE_URI_2="https://downloads.sourceforge.net/zinnia/zinnia-tomoe-$zinniaTomoe
 CHECKSUM_SHA256_2="fd1a264b8aeea0ebec59e8c8765864a9543a75fb2dba349745bb3a3587790927"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	mozc$secondaryArchSuffix
-	addon:mozc$secondaryArchSuffix
+	addon:mozc
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libprotobuf$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libprotobuf$secondaryArchSuffix
@@ -40,6 +41,11 @@ BUILD_PREREQUIRES="
 	cmd:which
 	cmd:xres
 	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+BUILD_PREREQUIRES+="
+	cmd:g++
+	"
+fi
 
 BUILD()
 {
@@ -48,8 +54,9 @@ BUILD()
 	GYP_DEFINES="document_dir=$dataDir/mozc \
 		zinnia_model_file=$dataDir/mozc/zinnia/handwriting-ja.model \
 		zinnia_tomoe_dir=$sourceDir2/zinnia-tomoe-$zinniaTomoeVersion \
-		enable_gtk_renderer=0" \
-		$portPackageLinksDir/cmd~python2/bin/python2 build_mozc.py gyp \
+		enable_gtk_renderer=0 \
+		target_x86_gcc2=$targetArchitecture" \
+	$portPackageLinksDir/cmd~python2/bin/python2 build_mozc.py gyp \
 		--target_platform=Linux --variant=Haiku --noqt \
 		--server_dir=$dataDir/mozc
 
@@ -66,23 +73,30 @@ INSTALL()
 {
 	MozcOutDir=src/out_linux/Release
 	MozcDataDir=$dataDir/mozc
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	InputMethodDir=$addOnsDir/../input_server/methods
+else
+	InputMethodDir=$addOnsDir/input_server/methods
+fi
 	mkdir -p $MozcDataDir
 	mkdir -p $MozcDataDir/zinnia
 	mkdir -p $MozcDataDir/images
 	mkdir -p $dataDir/locale/catalogs/x-vnd.Mozc-InputMethod
 	mkdir -p $dataDir/locale/catalogs/x-vnd.Mozc-MozcTool
-	mkdir -p $addOnsDir/input_server/methods
-
-	cp $MozcOutDir/mozc $addOnsDir/input_server/methods/mozc
+	mkdir -p $InputMethodDir
 
+	cp $MozcOutDir/mozc $InputMethodDir/mozc
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	cp $MozcOutDir/mozc_task $MozcDataDir/mozc_task
+fi
 	cp $MozcOutDir/mozc_server $MozcDataDir/mozc_server
 	cp $MozcOutDir/mozc_tool_haiku $MozcDataDir/mozc_tool
 	cp $MozcOutDir/handwriting-ja.model \
-			$MozcDataDir/zinnia/handwriting-ja.model
+		$MozcDataDir/zinnia/handwriting-ja.model
 	cp $MozcOutDir/mozc_emacs_helper $MozcDataDir/mozc_emacs_helper
 	cp src/data/installer/credits_en.html $MozcDataDir/credits_en.html
 	cp src/data/images/product_icon_32bpp-128.png \
-			$MozcDataDir/images/product_icon_32bpp-128.png
+		$MozcDataDir/images/product_icon_32bpp-128.png
 
 	cp $MozcOutDir/x-vnd.Mozc-InputMethod/* \
 		$dataDir/locale/catalogs/x-vnd.Mozc-InputMethod