* [PR PATCH] Bazel + mozc: update to 2.30.5448.100.
@ 2024-05-08 16:19 sgn
0 siblings, 0 replies; only message in thread
From: sgn @ 2024-05-08 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages mozc-update
https://github.com/void-linux/void-packages/pull/50246
Bazel + mozc: update to 2.30.5448.100.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50246.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mozc-update-50246.patch --]
[-- Type: text/x-diff, Size: 37787 bytes --]
From c22887319c7c77a04c6ec16476fa325201f8ec00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 10 Mar 2024 23:02:12 +0700
Subject: [PATCH 1/3] New package: bazel-bootstrap-7.0.2
---
srcpkgs/bazel-bootstrap/patches/gettid.patch | 29 +++++++++
srcpkgs/bazel-bootstrap/patches/java.patch | 12 ++++
.../bazel-bootstrap/patches/python-3.12.patch | 22 +++++++
srcpkgs/bazel-bootstrap/template | 65 +++++++++++++++++++
4 files changed, 128 insertions(+)
create mode 100644 srcpkgs/bazel-bootstrap/patches/gettid.patch
create mode 100644 srcpkgs/bazel-bootstrap/patches/java.patch
create mode 100644 srcpkgs/bazel-bootstrap/patches/python-3.12.patch
create mode 100644 srcpkgs/bazel-bootstrap/template
diff --git a/srcpkgs/bazel-bootstrap/patches/gettid.patch b/srcpkgs/bazel-bootstrap/patches/gettid.patch
new file mode 100644
index 00000000000000..a680d831a54b3a
--- /dev/null
+++ b/srcpkgs/bazel-bootstrap/patches/gettid.patch
@@ -0,0 +1,29 @@
+--- a/src/main/java/net/starlark/java/eval/cpu_profiler_posix.cc
++++ b/src/main/java/net/starlark/java/eval/cpu_profiler_posix.cc
+@@ -41,7 +41,7 @@ Java_net_starlark_java_eval_CpuProfiler_
+
+ static int fd; // the write end of the profile event pipe
+
+-pid_t gettid(void) {
++pid_t sys_gettid(void) {
+ #ifdef __linux__
+ return (pid_t)syscall(SYS_gettid);
+ #else // darwin
+@@ -63,7 +63,7 @@ void onsigprof(int sig) {
+ }
+
+ // Send an event containing the int32be-encoded OS thread ID.
+- pid_t tid = gettid();
++ pid_t tid = sys_gettid();
+ uint32_t tid_be = htonl(tid);
+ int r = write(fd, (void *)&tid_be, sizeof tid_be);
+ if (r < 0) {
+@@ -100,7 +100,7 @@ void onsigprof(int sig) {
+ // static native jint gettid();
+ extern "C" JNIEXPORT jint JNICALL
+ Java_net_starlark_java_eval_CpuProfiler_gettid(JNIEnv *env, jclass clazz) {
+- return gettid();
++ return sys_gettid();
+ }
+
+ // makeFD: return new FileDescriptor(fd)
diff --git a/srcpkgs/bazel-bootstrap/patches/java.patch b/srcpkgs/bazel-bootstrap/patches/java.patch
new file mode 100644
index 00000000000000..a1ce8033f68f09
--- /dev/null
+++ b/srcpkgs/bazel-bootstrap/patches/java.patch
@@ -0,0 +1,12 @@
+--- a/scripts/packages/bazel.sh
++++ b/scripts/packages/bazel.sh
+@@ -104,7 +104,8 @@ function get_workspace_root() {
+
+ get_workspace_root
+
+-readonly wrapper_dir="$(dirname "$(get_realpath "${BASH_SOURCE[0]}")")"
++export JAVA_HOME=/usr/lib/jvm/openjdk11
++readonly wrapper_dir="/usr/libexec/bazel"
+ readonly os_arch_suffix="$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)"
+
+ function get_bazel_version() {
diff --git a/srcpkgs/bazel-bootstrap/patches/python-3.12.patch b/srcpkgs/bazel-bootstrap/patches/python-3.12.patch
new file mode 100644
index 00000000000000..a195555040d7b9
--- /dev/null
+++ b/srcpkgs/bazel-bootstrap/patches/python-3.12.patch
@@ -0,0 +1,22 @@
+--- a/tools/build_defs/pkg/path_test.py
++++ b/tools/build_defs/pkg/path_test.py
+@@ -14,9 +14,18 @@
+ """Testing for helper functions."""
+
+ import imp
++import importlib.util
++import importlib.machinery
+ import unittest
+
+-pkg_bzl = imp.load_source(
++def load_source(modname, filename):
++ loader = importlib.machinery.SourceFileLoader(modname, filename)
++ spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
++ module = importlib.util.module_from_spec(spec)
++ loader.exec_module(module)
++ return module
++
++pkg_bzl = load_source(
+ 'pkg_bzl',
+ 'tools/build_defs/pkg/path.bzl')
+
diff --git a/srcpkgs/bazel-bootstrap/template b/srcpkgs/bazel-bootstrap/template
new file mode 100644
index 00000000000000..8643ce13c030cc
--- /dev/null
+++ b/srcpkgs/bazel-bootstrap/template
@@ -0,0 +1,65 @@
+# Template file for 'bazel-bootstrap'
+pkgname=bazel-bootstrap
+version=7.0.2
+revision=1
+hostmakedepends="protobuf python3 unzip openjdk11 which perl grpc zip tar"
+makedepends="protobuf-devel libprotoc-devel grpc-devel libarchive-devel
+ zlib-devel"
+depends="openjdk11"
+short_desc="Fast, scalable, multi-language and extensible build system"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://bazel.build/"
+distfiles="https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"
+checksum=dea2b90575d43ef3e41c402f64c2481844ecbf0b40f8548b75a204a4d504e035
+nostrip=yes
+python_version=3
+
+nocross=yes
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*) _cpu=aarch64 ;;
+ armv7*) _cpu=armv7 ;;
+ arm*) _cpu=arm ;;
+ x86_64*) _cpu=x86_64 ;;
+ i686*) _cpu=i386 ;;
+ ppc64le*) _cpu=ppc64le ;;
+ ppc64*) _cpu=ppc ;;
+ ppc*) _cpu=ppc32 ;;
+ riscv64*) _cpu=riscv64 ;;
+ *) broken="not supported" ;;
+esac
+
+do_build() {
+ local flag
+ local _bazel_opts="-s --verbose_failures"
+ for flag in $CFLAGS; do
+ _bazel_opts+=" --conlyopt=$flag"
+ # For -fstack-protector ...
+ _bazel_opts+=" --linkopt=$flag"
+ done
+ for flag in $CXXFLAGS; do
+ _bazel_opts+=" --cxxopt=$flag"
+ _bazel_opts+=" --linkopt=$flag"
+ done
+ for flag in $LDFLAGS; do
+ _bazel_opts+=" --linkopt=$flag"
+ done
+
+ _bazel_opts+=" --define=enable_distributions=debian"
+ _bazel_opts+=" --compilation_mode=opt"
+ _bazel_opts+=" --action_env=PATH"
+ _bazel_opts+=" --java_runtime_version=local_jdk"
+ _bazel_opts+=" --tool_java_runtime_version=local_jdk"
+
+ export JAVA_HOME="/usr/lib/jvm/openjdk11"
+
+ EMBED_LABEL=${version} \
+ EXTRA_BAZEL_ARGS="$_bazel_opts" \
+ ./compile.sh
+ chmod -R u+rwX /tmp
+}
+
+do_install() {
+ vbin output/bazel
+}
From c438c67a568278ed72d7bfadf2307cf875a24c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 10 Mar 2024 23:06:01 +0700
Subject: [PATCH 2/3] New package: bazel-7.0.2
---
srcpkgs/bazel/patches/gettid.patch | 29 +++++++++
srcpkgs/bazel/patches/java.patch | 12 ++++
srcpkgs/bazel/patches/javac-version.patch | 13 ++++
srcpkgs/bazel/patches/python-3.12.patch | 22 +++++++
srcpkgs/bazel/template | 77 +++++++++++++++++++++++
5 files changed, 153 insertions(+)
create mode 100644 srcpkgs/bazel/patches/gettid.patch
create mode 100644 srcpkgs/bazel/patches/java.patch
create mode 100644 srcpkgs/bazel/patches/javac-version.patch
create mode 100644 srcpkgs/bazel/patches/python-3.12.patch
create mode 100644 srcpkgs/bazel/template
diff --git a/srcpkgs/bazel/patches/gettid.patch b/srcpkgs/bazel/patches/gettid.patch
new file mode 100644
index 00000000000000..a680d831a54b3a
--- /dev/null
+++ b/srcpkgs/bazel/patches/gettid.patch
@@ -0,0 +1,29 @@
+--- a/src/main/java/net/starlark/java/eval/cpu_profiler_posix.cc
++++ b/src/main/java/net/starlark/java/eval/cpu_profiler_posix.cc
+@@ -41,7 +41,7 @@ Java_net_starlark_java_eval_CpuProfiler_
+
+ static int fd; // the write end of the profile event pipe
+
+-pid_t gettid(void) {
++pid_t sys_gettid(void) {
+ #ifdef __linux__
+ return (pid_t)syscall(SYS_gettid);
+ #else // darwin
+@@ -63,7 +63,7 @@ void onsigprof(int sig) {
+ }
+
+ // Send an event containing the int32be-encoded OS thread ID.
+- pid_t tid = gettid();
++ pid_t tid = sys_gettid();
+ uint32_t tid_be = htonl(tid);
+ int r = write(fd, (void *)&tid_be, sizeof tid_be);
+ if (r < 0) {
+@@ -100,7 +100,7 @@ void onsigprof(int sig) {
+ // static native jint gettid();
+ extern "C" JNIEXPORT jint JNICALL
+ Java_net_starlark_java_eval_CpuProfiler_gettid(JNIEnv *env, jclass clazz) {
+- return gettid();
++ return sys_gettid();
+ }
+
+ // makeFD: return new FileDescriptor(fd)
diff --git a/srcpkgs/bazel/patches/java.patch b/srcpkgs/bazel/patches/java.patch
new file mode 100644
index 00000000000000..a1ce8033f68f09
--- /dev/null
+++ b/srcpkgs/bazel/patches/java.patch
@@ -0,0 +1,12 @@
+--- a/scripts/packages/bazel.sh
++++ b/scripts/packages/bazel.sh
+@@ -104,7 +104,8 @@ function get_workspace_root() {
+
+ get_workspace_root
+
+-readonly wrapper_dir="$(dirname "$(get_realpath "${BASH_SOURCE[0]}")")"
++export JAVA_HOME=/usr/lib/jvm/openjdk11
++readonly wrapper_dir="/usr/libexec/bazel"
+ readonly os_arch_suffix="$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)"
+
+ function get_bazel_version() {
diff --git a/srcpkgs/bazel/patches/javac-version.patch b/srcpkgs/bazel/patches/javac-version.patch
new file mode 100644
index 00000000000000..8736b644e044b8
--- /dev/null
+++ b/srcpkgs/bazel/patches/javac-version.patch
@@ -0,0 +1,13 @@
+--- a/scripts/bootstrap/BUILD.bootstrap
++++ b/scripts/bootstrap/BUILD.bootstrap
+@@ -19,8 +19,8 @@ default_java_toolchain(
+ "-XX:TieredStopAtLevel=1",
+ ],
+ singlejar = ["//src/tools/singlejar:singlejar"],
+- source_version = "8",
++ source_version = "11",
+ tags = ["manual"],
+- target_version = "8",
++ target_version = "11",
+ visibility = ["//visibility:public"],
+ )
diff --git a/srcpkgs/bazel/patches/python-3.12.patch b/srcpkgs/bazel/patches/python-3.12.patch
new file mode 100644
index 00000000000000..a195555040d7b9
--- /dev/null
+++ b/srcpkgs/bazel/patches/python-3.12.patch
@@ -0,0 +1,22 @@
+--- a/tools/build_defs/pkg/path_test.py
++++ b/tools/build_defs/pkg/path_test.py
+@@ -14,9 +14,18 @@
+ """Testing for helper functions."""
+
+ import imp
++import importlib.util
++import importlib.machinery
+ import unittest
+
+-pkg_bzl = imp.load_source(
++def load_source(modname, filename):
++ loader = importlib.machinery.SourceFileLoader(modname, filename)
++ spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
++ module = importlib.util.module_from_spec(spec)
++ loader.exec_module(module)
++ return module
++
++pkg_bzl = load_source(
+ 'pkg_bzl',
+ 'tools/build_defs/pkg/path.bzl')
+
diff --git a/srcpkgs/bazel/template b/srcpkgs/bazel/template
new file mode 100644
index 00000000000000..012007621071a2
--- /dev/null
+++ b/srcpkgs/bazel/template
@@ -0,0 +1,77 @@
+# Template file for 'bazel'
+pkgname=bazel
+version=7.0.2
+revision=1
+hostmakedepends="protobuf python3 unzip openjdk11 which perl grpc zip tar
+ bazel-bootstrap"
+makedepends="protobuf-devel libprotoc-devel grpc-devel libarchive-devel
+ zlib-devel"
+depends="openjdk11"
+short_desc="Fast, scalable, multi-language and extensible build system"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://bazel.build/"
+distfiles="https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"
+checksum=477e54f6374001f439a9471ba1de9d7824daf129db95510849ecc5e19ce88170
+checksum=dea2b90575d43ef3e41c402f64c2481844ecbf0b40f8548b75a204a4d504e035
+nostrip=yes
+python_version=3
+
+nocross="not tried yet, unsure about ijar and protoc"
+
+do_configure() {
+ cp scripts/bootstrap/BUILD.bootstrap \
+ scripts/bootstrap/BUILD
+}
+
+do_build() {
+ local flag
+ local _bazel_opts="-s --verbose_failures"
+ for flag in $CFLAGS; do
+ _bazel_opts+=" --conlyopt=$flag"
+ # For -fstack-protector ...
+ _bazel_opts+=" --linkopt=$flag"
+ done
+ for flag in $CXXFLAGS; do
+ _bazel_opts+=" --cxxopt=$flag"
+ _bazel_opts+=" --linkopt=$flag"
+ done
+ for flag in $LDFLAGS; do
+ _bazel_opts+=" --linkopt=$flag"
+ done
+
+ _bazel_opts+=" --define=enable_distributions=debian"
+ _bazel_opts+=" --compilation_mode=opt"
+ _bazel_opts+=" --action_env=PATH"
+
+ export JAVA_HOME="/usr/lib/jvm/openjdk11"
+ bazel build $_bazel_opts \
+ --extra_toolchains=//scripts/bootstrap:all \
+ --javacopt="-g -source 11 -target 11" \
+ --java_runtime_version=local_jdk \
+ --tool_java_runtime_version=local_jdk \
+ --stamp --embed_label "$version" \
+ --strategy=Javac=worker --worker_quit_after_build \
+ --ignore_unsupported_sandboxing \
+ --nojava_header_compilation \
+ src:bazel_nojdk
+ # scripts:bazel-complete.bash and scripts:fish_completion
+ # seems to requires bazel_remotejdk which is problematic on musl
+ #
+ # ./output/bazel build //scripts:bazel-complete.bash
+ # ./output/bazel build //scripts:fish_completion
+ # ./output/bazel shutdown
+ chmod -R u+rwX /tmp
+}
+
+do_install() {
+ vbin scripts/packages/bazel.sh bazel
+ vinstall bazel-bin/src/bazel_nojdk 755 \
+ usr/libexec/bazel bazel-real
+ vcompletion scripts/zsh_completion/_bazel zsh
+ vmkdir usr/share/example/bazel
+ vcopy "examples/*" usr/share/example/bazel
+ vmkdir usr/share/bazel
+ vcopy third_party usr/share/bazel
+ vcopy tools usr/share/bazel
+}
From 079e303e20391d916acd66234f1e2684214070d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 8 May 2024 23:07:09 +0700
Subject: [PATCH 3/3] mozc: update to 2.30.5448.100.
---
srcpkgs/mozc/patches/abseil.patch | 58 ----------
srcpkgs/mozc/patches/common.patch | 12 +-
srcpkgs/mozc/patches/cross.patch | 40 -------
srcpkgs/mozc/patches/cxx-stdlib.patch | 36 ------
srcpkgs/mozc/patches/fcitx.patch | 21 ++--
srcpkgs/mozc/patches/latomic.patch | 134 ----------------------
srcpkgs/mozc/patches/no-android.patch | 41 +++++++
srcpkgs/mozc/patches/no-parallel.patch | 10 --
srcpkgs/mozc/patches/pkg-config.patch | 34 ++++++
srcpkgs/mozc/template | 149 ++++++++++++++-----------
10 files changed, 177 insertions(+), 358 deletions(-)
delete mode 100644 srcpkgs/mozc/patches/abseil.patch
delete mode 100644 srcpkgs/mozc/patches/cross.patch
delete mode 100644 srcpkgs/mozc/patches/cxx-stdlib.patch
delete mode 100644 srcpkgs/mozc/patches/latomic.patch
create mode 100644 srcpkgs/mozc/patches/no-android.patch
delete mode 100644 srcpkgs/mozc/patches/no-parallel.patch
create mode 100644 srcpkgs/mozc/patches/pkg-config.patch
diff --git a/srcpkgs/mozc/patches/abseil.patch b/srcpkgs/mozc/patches/abseil.patch
deleted file mode 100644
index a41507550f950b..00000000000000
--- a/srcpkgs/mozc/patches/abseil.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-Ported from grpc's patches
-
-An all-in-one patch that fixes several issues:
-
-1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
-2) powerpc stacktrace implementation only works on glibc (disabled on musl)
-4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
-
---- a/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,8 +46,8 @@
-
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
-- defined(_M_IX86) || defined(_M_X64)
-+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-+ defined(__riscv) || defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
---- a/abseil-cpp/absl/debugging/internal/examine_stack.cc
-+++ b/abseil-cpp/absl/debugging/internal/examine_stack.cc
-@@ -27,6 +27,10 @@
- #include <csignal>
- #include <cstdio>
-
-+#if defined(__powerpc__)
-+#include <asm/ptrace.h>
-+#endif
-+
- #include "absl/base/attributes.h"
- #include "absl/base/internal/raw_logging.h"
- #include "absl/base/macros.h"
-@@ -63,8 +67,10 @@ void* GetProgramCounter(void* vuc) {
- return reinterpret_cast<void*>(context->uc_mcontext.pc);
- #elif defined(__powerpc64__)
- return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
-+#elif defined(__powerpc__) && defined(__GLIBC__)
-+ return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
- #elif defined(__powerpc__)
-- return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
-+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
- #elif defined(__riscv)
- return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
- #elif defined(__s390__) && !defined(__s390x__)
---- a/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-+++ b/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-@@ -59,7 +59,7 @@
- #elif defined(__i386__) || defined(__x86_64__)
- #define ABSL_STACKTRACE_INL_HEADER \
- "absl/debugging/internal/stacktrace_x86-inl.inc"
--#elif defined(__ppc__) || defined(__PPC__)
-+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
- #define ABSL_STACKTRACE_INL_HEADER \
- "absl/debugging/internal/stacktrace_powerpc-inl.inc"
- #elif defined(__aarch64__)
diff --git a/srcpkgs/mozc/patches/common.patch b/srcpkgs/mozc/patches/common.patch
index 1b7bb395948bf0..3f7a726d7717dc 100644
--- a/srcpkgs/mozc/patches/common.patch
+++ b/srcpkgs/mozc/patches/common.patch
@@ -1,11 +1,11 @@
---- a/mozc/src/config.bzl
-+++ b/mozc/src/config.bzl
-@@ -34,7 +34,7 @@ LINUX_MOZC_SERVER_DIR = "/usr/lib/mozc"
- LINUX_MOZC_DOCUMENT_DIR = LINUX_MOZC_SERVER_DIR + "/documents"
+--- a/src/config.bzl
++++ b/src/config.bzl
+@@ -42,7 +42,7 @@ LINUX_MOZC_DOCUMENT_DIR = LINUX_MOZC_SER
+ IBUS_COMPONENT_DIR = "/usr/share/ibus/component"
IBUS_MOZC_INSTALL_DIR = "/usr/share/ibus-mozc"
IBUS_MOZC_ICON_PATH = IBUS_MOZC_INSTALL_DIR + "/product_icon.png"
-IBUS_MOZC_PATH = "/usr/lib/ibus-mozc/ibus-engine-mozc"
+IBUS_MOZC_PATH = "/usr/libexec/ibus-engine-mozc"
+ EMACS_MOZC_CLIENT_DIR = "/usr/share/emacs/site-lisp/emacs-mozc"
+ EMACS_MOZC_HELPER_DIR = "/usr/bin"
- MACOS_BUNDLE_ID_PREFIX = "org.mozc.inputmethod.Japanese"
- MACOS_MIN_OS_VER = "10.12"
diff --git a/srcpkgs/mozc/patches/cross.patch b/srcpkgs/mozc/patches/cross.patch
deleted file mode 100644
index a7e38fd9b346e2..00000000000000
--- a/srcpkgs/mozc/patches/cross.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/mozc/src/gyp/common.gypi
-+++ b/mozc/src/gyp/common.gypi
-@@ -409,12 +409,12 @@
- 'conditions': [
- ['target_platform=="Linux"', {
- 'make_global_settings': [
-- ['AR', '<!(which ar)'],
-- ['CC', '<!(which clang)'],
-- ['CXX', '<!(which clang++)'],
-- ['LD', '<!(which ld)'],
-- ['NM', '<!(which nm)'],
-- ['READELF', '<!(which readelf)'],
-+ ['AR', '<!(which ${AR_target:-ar})'],
-+ ['CC', '<!(which ${CC_target:-cc})'],
-+ ['CXX', '<!(which ${CXX_target:-c++})'],
-+ ['LD', '<!(which ${LD_target:-ld})'],
-+ ['NM', '<!(which ${NM_target:-nm})'],
-+ ['READELF', '<!(which ${READELF_target:-readelf})'],
- ],
- }],
- ['target_platform=="Android"', {
-@@ -459,12 +459,12 @@
- ['LD', '<(ndk_bin_dir)/<(toolchain_prefix)-ld'],
- ['NM', '<(ndk_bin_dir)/<(toolchain_prefix)-nm'],
- ['READELF', '<(ndk_bin_dir)/<(toolchain_prefix)-readelf'],
-- ['AR.host', '<!(which ar)'],
-- ['CC.host', '<!(which clang)'],
-- ['CXX.host', '<!(which clang++)'],
-- ['LD.host', '<!(which ld)'],
-- ['NM.host', '<!(which nm)'],
-- ['READELF.host', '<!(which readelf)'],
-+ ['AR.host', '<!(which ${AR:-ar})'],
-+ ['CC.host', '<!(which ${CC:-cc})'],
-+ ['CXX.host', '<!(which ${CXX:-c++})'],
-+ ['LD.host', '<!(which ${LD:-ld})'],
-+ ['NM.host', '<!(which ${NM:-nm})'],
-+ ['READELF.host', '<!(which ${READELF:-readelf})'],
- ],
- }],
- ],
diff --git a/srcpkgs/mozc/patches/cxx-stdlib.patch b/srcpkgs/mozc/patches/cxx-stdlib.patch
deleted file mode 100644
index 0b77ea1f052c5c..00000000000000
--- a/srcpkgs/mozc/patches/cxx-stdlib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/mozc/src/gyp/common.gypi
-+++ b/mozc/src/gyp/common.gypi
-@@ -73,9 +73,6 @@
- '-Wno-deprecated-declarations',
- '-Wwrite-strings',
- '<@(extra_warning_cflags)',
--
-- '-Wno-unknown-warning-option',
-- '-Wno-inconsistent-missing-override',
- ],
-
- # gcc_cflags will be shared with Mac and Linux
-@@ -105,7 +102,7 @@
- ],
- # Libraries for GNU/Linux environment.
- 'linux_ldflags': [
-- '-lc++',
-+ '-lstdc++',
- '-pthread',
- ],
-
-@@ -123,10 +120,10 @@
- 'compiler_host_version_int': 304, # Clang 3.4 or higher
- }],
- ['target_platform=="Linux"', {
-- 'compiler_target': 'clang',
-- 'compiler_target_version_int': 304, # Clang 3.4 or higher
-- 'compiler_host': 'clang',
-- 'compiler_host_version_int': 304, # Clang 3.4 or higher
-+ 'compiler_target': 'gcc',
-+ 'compiler_target_version_int': 1000, # Clang 3.4 or higher
-+ 'compiler_host': 'gcc',
-+ 'compiler_host_version_int': 1000, # Clang 3.4 or higher
- }],
- ],
- },
diff --git a/srcpkgs/mozc/patches/fcitx.patch b/srcpkgs/mozc/patches/fcitx.patch
index 720e6b2c2c27a6..7926fb8bca181e 100644
--- a/srcpkgs/mozc/patches/fcitx.patch
+++ b/srcpkgs/mozc/patches/fcitx.patch
@@ -1,11 +1,10 @@
---- a/mozc/src/unix/fcitx/fcitx.gyp
-+++ b/mozc/src/unix/fcitx/fcitx.gyp
-@@ -96,7 +96,7 @@
- '<@(fcitx_dep_include_dirs)',
- ],
- 'defines': [
-- 'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
-+ 'LOCALEDIR="/usr/share/locale/"',
- ],
- },
- ],
+--- a/src/unix/fcitx/BUILD
++++ b/src/unix/fcitx/BUILD
+@@ -58,6 +58,7 @@ mozc_cc_library(
+ deps = [
+ "//base:logging",
+ "//base:port",
++ "//base:singleton",
+ "//base:vlog",
+ "//protocol:config_cc_proto",
+ "//protocol:commands_cc_proto",
diff --git a/srcpkgs/mozc/patches/latomic.patch b/srcpkgs/mozc/patches/latomic.patch
deleted file mode 100644
index 1d3aab9ab9049d..00000000000000
--- a/srcpkgs/mozc/patches/latomic.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/mozc/src/gui/gui.gyp
-+++ b/mozc/src/gui/gui.gyp
-@@ -794,6 +794,13 @@
- 'tool/mozc_tool_main_noqt.cc',
- ],
- }],
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
- # For Mac, ConfigDialog is the host app for necessary frameworks.
- ['OS=="win"', {
- 'product_name': '<(tool_product_name_win)',
---- a/mozc/src/gyp/defines.gypi
-+++ b/mozc/src/gyp/defines.gypi
-@@ -68,6 +68,9 @@
- # use_libibus represents if ibus library is used or not.
- # This option is only for Linux.
- 'use_libibus%': '0',
-+
-+ # use_libatomic represents if libatomic is required or not
-+ 'use_libatomic%': '0',
- },
- 'target_defaults': {
- 'defines': [
---- a/mozc/src/renderer/renderer.gyp
-+++ b/mozc/src/renderer/renderer.gyp
-@@ -600,6 +600,15 @@
- '../base/base.gyp:crash_report_handler',
- 'mozc_renderer_lib',
- ],
-+ 'conditions': [
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
-+ ],
- },
- {
- 'target_name': 'gtk_renderer_test',
---- a/mozc/src/server/server.gyp
-+++ b/mozc/src/server/server.gyp
-@@ -55,6 +55,13 @@
- 'mozc_server_lib',
- ],
- 'conditions': [
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
- ['OS=="mac"', {
- 'product_name': '<(branding)Converter',
- 'sources': [
---- a/mozc/src/unix/emacs/emacs.gyp
-+++ b/mozc/src/unix/emacs/emacs.gyp
-@@ -47,6 +47,15 @@
- '../../protocol/protocol.gyp:config_proto',
- 'mozc_emacs_helper_lib',
- ],
-+ 'conditions': [
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
-+ ],
- },
- {
- 'target_name': 'mozc_emacs_helper_lib',
---- a/mozc/src/unix/fcitx/fcitx.gyp
-+++ b/mozc/src/unix/fcitx/fcitx.gyp
-@@ -98,6 +98,15 @@
- 'defines': [
- 'LOCALEDIR="/usr/share/locale/"',
- ],
-+ 'conditions': [
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
-+ ],
- },
- ],
- }, {
---- a/mozc/src/unix/fcitx5/fcitx5.gyp
-+++ b/mozc/src/unix/fcitx5/fcitx5.gyp
-@@ -105,6 +105,15 @@
- 'defines': [
- 'FCITX_GETTEXT_DOMAIN="fcitx5-mozc"',
- ],
-+ 'conditions': [
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
-+ ],
- },
- ],
- }, {
---- a/mozc/src/unix/ibus/ibus.gyp
-+++ b/mozc/src/unix/ibus/ibus.gyp
-@@ -241,6 +241,15 @@
- 'ibus_mozc_lib',
- 'ibus_mozc_metadata',
- ],
-+ 'conditions': [
-+ ['use_libatomic==1', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-latomic',
-+ ],
-+ },
-+ }],
-+ ],
- },
- {
- 'target_name': 'ibus_mozc_test',
diff --git a/srcpkgs/mozc/patches/no-android.patch b/srcpkgs/mozc/patches/no-android.patch
new file mode 100644
index 00000000000000..ba91ce4be19594
--- /dev/null
+++ b/srcpkgs/mozc/patches/no-android.patch
@@ -0,0 +1,41 @@
+--- a/src/WORKSPACE.bazel
++++ b/src/WORKSPACE.bazel
+@@ -91,38 +91,6 @@ load(
+ apple_support_dependencies()
+
+
+-# Android NDK setup (2023-01-13)
+-RULES_ANDROID_NDK_COMMIT= "44dcd014f4b126f8941c29ff1b25e1584bd3eb26"
+-RULES_ANDROID_NDK_SHA = "79b1857e8e05e3007ad090a3269d2932e988b3ed176d7abd042719d45eb51500"
+-http_archive(
+- name = "rules_android_ndk",
+- url = "https://github.com/bazelbuild/rules_android_ndk/archive/%s.zip" % RULES_ANDROID_NDK_COMMIT,
+- sha256 = RULES_ANDROID_NDK_SHA,
+- strip_prefix = "rules_android_ndk-%s" % RULES_ANDROID_NDK_COMMIT,
+-)
+-
+-# Check the ANDROID_NDK_HOME envvar, if it is specified set up NDK as follows
+-# load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
+-# android_ndk_repository(name="androidndk")
+-# If it is empty, do nothing.
+-load("@//bazel:android_repository.bzl", "android_repository")
+-android_repository(name = "android_repository")
+-load("@android_repository//:setup.bzl", "android_ndk_setup")
+-android_ndk_setup()
+-
+-
+-http_archive(
+- name = "build_bazel_rules_android",
+- sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
+- strip_prefix = "rules_android-0.1.1",
+- urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
+-)
+-
+-load("@build_bazel_rules_android//android:rules.bzl", "android_sdk_repository")
+-
+-android_sdk_repository(
+- name = "androidsdk",
+-)
+
+
+ # Windows Implementation Library (WIL)
diff --git a/srcpkgs/mozc/patches/no-parallel.patch b/srcpkgs/mozc/patches/no-parallel.patch
deleted file mode 100644
index 9220808c9b319b..00000000000000
--- a/srcpkgs/mozc/patches/no-parallel.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mozc/src/build_mozc.py
-+++ b/mozc/src/build_mozc.py
-@@ -494,6 +494,7 @@ def GypMain(options, unused_args):
- gyp_options.extend(['--generator-output=.'])
- short_basename = GetBuildShortBaseName(target_platform)
- gyp_options.extend(['-G', 'output_dir=%s' % short_basename])
-+ gyp_options.extend(['--no-parallel']) # Parallel generation requires writable /dev/shm
-
- # Enable cross-compile
- # TODO(yukawa): Enable GYP_CROSSCOMPILE for Windows.
diff --git a/srcpkgs/mozc/patches/pkg-config.patch b/srcpkgs/mozc/patches/pkg-config.patch
new file mode 100644
index 00000000000000..04be7c3f87ead6
--- /dev/null
+++ b/srcpkgs/mozc/patches/pkg-config.patch
@@ -0,0 +1,34 @@
+--- a/src/bazel/pkg_config_repository.bzl
++++ b/src/bazel/pkg_config_repository.bzl
+@@ -59,9 +59,7 @@ package(
+
+ cc_library(
+ name = "{name}",
+- hdrs = glob([
+- {hdrs}
+- ]),
++ {hdrs}
+ copts = [
+ {copts}
+ ],
+@@ -96,15 +94,18 @@ def _symlinks(repo_ctx, paths):
+
+ def _pkg_config_repository_impl(repo_ctx):
+ includes = _exec_pkg_config(repo_ctx, "--cflags-only-I")
+- includes = [item[len("-I/"):] for item in includes]
++ includes = [item[len("-I/"):] for item in includes if item]
+ _symlinks(repo_ctx, includes)
+ data = {
+ "name": repo_ctx.attr.name,
+- "hdrs": _make_strlist([item + "/**" for item in includes]),
+ "copts": _make_strlist(_exec_pkg_config(repo_ctx, "--cflags-only-other")),
+ "includes": _make_strlist(includes),
+ "linkopts": _make_strlist(_exec_pkg_config(repo_ctx, "--libs-only-l")),
+ }
++ if includes:
++ data['hdrs'] = 'hdrs = glob([' + _make_strlist([item + "/**" for item in includes]) + ']),'
++ else:
++ data['hdrs'] = ''
+ build_file_data = BUILD_TEMPLATE.format(**data)
+
+ libexecdir = _exec_pkg_config(repo_ctx, "--variable=libexecdir")
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 991c06425b4363..b92c8f26598e1d 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -2,18 +2,20 @@
pkgname=mozc
# src/data/version/mozc_version_template.bzl
# revision is always 102, template always says 100 ;)
-version=2.28.4800.102
-revision=2
-_commit=056163a5fddbb261b258beb8444998e4882f0cc5
-_abseil=20211102.0
-_protobuf_commit=cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97
+version=2.30.5448.100
+revision=1
+_commit=c0bdc91234eb5afe29798876790d599f4d99f6e4
+_bazel_skylib=1.4.1
+_bazel_rule_py=0.0.1
+_abseil=20240116.1
+_protobuf=26.1
_gyp=0.1+20220404git9ecf45e
_jpn_dict=e5b3425575734c323e1d947009dd74709437b684
-create_wrksrc=yes
-build_wrksrc=mozc/src
-hostmakedepends="gettext ninja pkg-config
+# create_wrksrc=yes
+build_wrksrc=src
+hostmakedepends="gettext ninja pkg-config bazel qt6-base
python3-six which qt5-qmake qt5-host-tools"
-makedepends="gtk+-devel ibus-devel libzinnia-devel qt5-devel
+makedepends="gtk+-devel ibus-devel libzinnia-devel qt5-devel qt6-base-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,17 +24,25 @@ license="BSD-3-Clause"
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
+ https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/${_bazel_skylib}/bazel-skylib-${_bazel_skylib}.tar.gz
+ https://github.com/bazelbuild/rules_python/releases/download/${_bazel_rule_py}/rules_python-${_bazel_rule_py}.tar.gz
+ https://github.com/abseil/abseil-cpp/releases/download/${_abseil}/abseil-cpp-${_abseil}.tar.gz
+ https://github.com/protocolbuffers/protobuf/releases/download/v${_protobuf}/protobuf-${_protobuf}.tar.gz
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/$_jpn_dict.tar.gz"
+checksum="134e6f1413836c55cb200298ad077319655c3382c702fcbf771b01ebd756e984
+ b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7
+ aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161
+ 3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a
+ 4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8
0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1"
+skip_extraction="
+ bazel-skylib-${_bazel_skylib}.tar.gz
+ rules_python-${_bazel_rule_py}.tar.gz
+ abseil-cpp-$_abseil.tar.gz
+ protobuf-$_protobuf.tar.gz
+ $_jpn_dict.tar.gz"
+
CXXFLAGS="-D_GNU_SOURCE"
lib32disabled=yes
@@ -40,24 +50,29 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
broken="Does not build"
fi
+_absl="absl_algorithm absl_base absl_cleanup absl_flags absl_hash absl_log absl_memory absl_meta absl_numeric absl_status absl_strings absl_synchronization absl_time"
post_extract() {
- mv mozc-* mozc
+ vsrcextract -C src/third_party/abseil-cpp abseil-cpp-${_abseil}.tar.gz
+ vsrcextract -C src/third_party/japanese_usage_dictionary ${_jpn_dict}.tar.gz
+ vsrcextract -C src/third_party/protobuf protobuf-${_protobuf}.tar.gz
+}
- # symlink "submodules" into place
- for _src_dest in gyp \
- abseil-cpp \
- japanese-usage-dictionary:japanese_usage_dictionary \
- protobuf
- do
- _src=${_src_dest%:*}
- _dst=${_src_dest#*:}
- mv $_src-* $_dst
- rmdir mozc/src/third_party/$_dst
- ln -sr $_dst mozc/src/third_party
- done
+xpre_patch() {
+ grep --exclude="*.orig" -rl '@com_google_absl//[a-z/]*' |
+ xargs -r sed -i.orig '
+ s,@com_google_absl//absl/[-_a-z:/]*,@abseil//:abseil,
+ x
+ \,@abseil//:abseil,{x;H;}
+ x
+ \,@abseil//:abseil,!{p;s/.*//;x;d;}
+ \,@abseil//:abseil.*[]],{p;s/.*//;x;d;}
+ s=\(@abseil//:abseil.*\)[[:space:]]*"@abseil//:abseil",*=\1=
+ x
+ d
+ '
}
-do_configure() {
+xdo_configure() {
GYP_DEFINES="
document_dir=/usr/share/licenses/${pkgname}
ibus_mozc_path=/usr/libexec/ibus-engine-mozc
@@ -67,57 +82,65 @@ do_configure() {
}
do_build() {
- local _file _lang
- local _modir=out_linux/Release/gen/unix/fcitx5/po
+ local _file _lang _tool _flag
+ local _opts=(--copt=-fPIC --copt=-U_FORTIFY_SOURCE)
+ for _flag in $CFLAGS; do
+ _opts+=("--conlyopt=$_flag")
+ _opts+=("--linkopt=$_flag")
+ done
+ for _flag in $CXXFLAGS; do
+ _opts+=("--cxxopt=$_flag")
+ _opts+=("--linkopt=$_flag")
+ done
- python3 build_mozc.py build \
- --use_gyp_for_ibus_build \
- -c Release \
- server/server.gyp:mozc_server \
- gui/gui.gyp:mozc_tool \
- unix/emacs/emacs.gyp:mozc_emacs_helper \
- unix/ibus/ibus.gyp:ibus_mozc \
- renderer/renderer.gyp:mozc_renderer \
- unix/fcitx/fcitx.gyp:fcitx-mozc \
- unix/fcitx5/fcitx5.gyp:fcitx5-mozc
+ if ! bazel build -c opt ${_opts[@]} \
+ --verbose_failures \
+ --config oss_linux \
+ gui/tool:mozc_tool \
+ renderer/qt:mozc_renderer \
+ server/mozc_server \
+ unix/emacs:mozc_emacs_helper \
+ unix/ibus:ibus_mozc \
+ unix/fcitx:fcitx-mozc.so \
+ unix/fcitx5:fcitx5-mozc.so
+ then
+ bazel shutdown
+ msg_error "bazel build failed\n"
+ fi
- mkdir -p $_modir
- for _file in unix/fcitx5/po/*.po
+ for _file in unix/fcitx/po/*.po unix/fcitx5/po/*.po
do
- _lang=${_file##*/}
- _lang=${_lang%.po}
- msgfmt "$_file" -o $_modir/$_lang.mo
+ msgfmt "$_file" -o "${_file%.po}.mo"
done
msgfmt --xml -d unix/fcitx5/po \
--template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in \
- -o $_modir/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
+ -o unix/fcitx5/po/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
}
do_install() {
local f
# Base package
- vinstall out_linux/Release/mozc_server 755 usr/lib/mozc
+ vinstall bazel-bin/server/mozc_server 755 usr/lib/mozc
vlicense data/installer/credits_en.html license.html
head -n 29 unix/fcitx5/fcitx_key_translator.cc >fcitx.LICENSE
vlicense fcitx.LICENSE
# emacs
- vbin out_linux/Release/mozc_emacs_helper
+ vbin bazel-bin/unix/emacs/mozc_emacs_helper
vinstall unix/emacs/mozc.el 644 usr/share/emacs/site-lisp
- # Qt5 tools
- vinstall out_linux/Release/mozc_tool 755 usr/lib/mozc
+ # Qt tools
+ vinstall bazel-bin/gui/tool/mozc_tool 755 usr/lib/mozc
# ibus
- vinstall out_linux/Release/ibus_mozc 755 usr/libexec ibus-engine-mozc
- vinstall out_linux/Release/gen/unix/ibus/mozc.xml 644 \
- usr/share/ibus/component
+ vinstall bazel-bin/unix/ibus/ibus_mozc 755 usr/libexec ibus-engine-mozc
+ vinstall bazel-bin/unix/ibus/mozc.xml 644 usr/share/ibus/component
vinstall data/images/product_icon_32bpp-128.png 644 \
usr/share/ibus-mozc product_icon.png
for f in data/images/unix/48x48/*.png; do
vinstall "$f" 644 usr/share/ibus-mozc
done
- vinstall out_linux/Release/mozc_renderer 755 usr/lib/mozc
+ vinstall bazel-bin/renderer/qt/mozc_renderer 755 usr/lib/mozc
# fcitx
- vinstall out_linux/Release/fcitx-mozc.so 644 usr/lib/fcitx
+ vinstall bazel-bin/unix/fcitx/fcitx-mozc.so 644 usr/lib/fcitx
vinstall unix/fcitx/fcitx-mozc.conf 644 usr/share/fcitx/addon
vinstall unix/fcitx/mozc.conf 644 usr/share/fcitx/inputmethod
vinstall data/images/product_icon_32bpp-128.png 644 \
@@ -132,7 +155,7 @@ do_install() {
usr/share/fcitx/mozc/icon mozc-$f.png
done
# fcitx5
- vinstall out_linux/Release/fcitx5-mozc.so 644 usr/lib/fcitx5
+ vinstall bazel-bin/unix/fcitx5/fcitx5-mozc.so 644 usr/lib/fcitx5
vinstall unix/fcitx5/mozc-addon.conf 644 \
usr/share/fcitx5/addon mozc.conf
vinstall unix/fcitx5/mozc.conf 644 usr/share/fcitx5/inputmethod
@@ -149,7 +172,7 @@ do_install() {
vinstall data/images/unix/48x48/$f.png 644 \
usr/share/icons/hicolor/48x48/apps fcitx-mozc-${f/_/-}.png
done
- vinstall out_linux/Release/gen/unix/fcitx5/po/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml \
+ vinstall unix/fcitx5/po/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml \
644 usr/share/metainfo/
}
@@ -187,7 +210,7 @@ fcitx-mozc_package() {
vmove usr/lib/fcitx
vmove usr/share/fcitx
# vmove "usr/share/locale/*/LC_MESSAGES/fcitx-mozc.mo"
- for _file in out_linux/Release/gen/unix/fcitx/po/*.mo
+ for _file in unix/fcitx/po/*.mo
do
_lang=${_file##*/}
_lang=${_lang%.mo}
@@ -208,7 +231,7 @@ fcitx5-mozc_package() {
vmove usr/share/fcitx5
vmove usr/share/icons
# vmove "usr/share/locale/*/LC_MESSAGES/fcitx5-mozc.mo"
- for _file in out_linux/Release/gen/unix/fcitx5/po/*.mo
+ for _file in unix/fcitx5/po/*.mo
do
_lang=${_file##*/}
_lang=${_lang%.mo}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-05-08 16:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-08 16:19 [PR PATCH] Bazel + mozc: update to 2.30.5448.100 sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).