wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mozc: statically link against vendored prootbuf

Browse source 
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.
This commit is contained in:
John 2023-06-27 12:02:57 +02:00 • committed by John Zimmermann
parent e74618435c
commit 34e6b3edbe
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
srcpkgs/mozc/template
View file

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