From 34e6b3edbee18e211e2bc15b81c3f4699d19a4f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 27 Jun 2023 12:02:57 +0200
Subject: [PATCH] mozc: statically link against vendored prootbuf

protobuf 23+ links against abseil, which conflicts with the vendored
abseil version in mozc. The build system does not have a flag to use
system abseil.
---
 srcpkgs/mozc/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 3fdb986b321..e7735cb57f4 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -3,16 +3,17 @@ pkgname=mozc
 # src/data/version/mozc_version_template.bzl
 # revision is always 102, template always says 100 ;)
 version=2.28.4800.102
-revision=1
+revision=2
 _commit=056163a5fddbb261b258beb8444998e4882f0cc5
 _abseil=20211102.0
+_protobuf_commit=cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97
 _gyp=0.1+20220404git9ecf45e
 _jpn_dict=e5b3425575734c323e1d947009dd74709437b684
 create_wrksrc=yes
 build_wrksrc=mozc/src
-hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel
+hostmakedepends="gettext ninja pkg-config
  python3-six which qt5-qmake qt5-host-tools"
-makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel
+makedepends="gtk+-devel ibus-devel libzinnia-devel qt5-devel
  fcitx-devel libfcitx5-devel"
 depends="tegaki-zinnia-japanese>=0.3 mozc-base-${version}_${revision}"
 short_desc="Japanese IME (Open Source version of Google Japanese Input)"
@@ -22,11 +23,13 @@ homepage="https://github.com/google/mozc"
 distfiles="
  https://github.com/fcitx/mozc/archive/$_commit.tar.gz
  https://github.com/abseil/abseil-cpp/archive/refs/tags/$_abseil.tar.gz
+ https://github.com/protocolbuffers/protobuf/archive/$_protobuf_commit.tar.gz
  ${DEBIAN_SITE}/main/g/gyp/gyp_$_gyp.orig.tar.xz
  https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/$_jpn_dict.tar.gz
 "
 checksum="259d87bfd7535ad03bd554185677d7345a90166353a6db0b6a3606183ad2923d
  dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
+ 863e27f6d24f40bce2bbfe5adcf365f2af5479ea917f254331ee60ce88f8c8a5
  0325006f012db66dfa27bf7bb048f3fe38f96e512ebe065930cbc70bcdc06bc9
  0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1"
 
@@ -47,7 +50,8 @@ post_extract() {
 	# symlink "submodules" into place
 	for _src_dest in gyp \
 		abseil-cpp \
-		japanese-usage-dictionary:japanese_usage_dictionary
+		japanese-usage-dictionary:japanese_usage_dictionary \
+		protobuf
 	do
 		_src=${_src_dest%:*}
 		_dst=${_src_dest#*:}
@@ -61,7 +65,6 @@ do_configure() {
 	GYP_DEFINES="
 	 document_dir=/usr/share/licenses/${pkgname}
 	 ibus_mozc_path=/usr/libexec/ibus-engine-mozc
-	 use_libprotobuf=1
 	 use_libzinnia=1
 	 ${XBPS_TARGET_NO_ATOMIC8:+use_libatomic=1}
 	" python3 build_mozc.py gyp --target_platform=Linux