v=2.30.5448.102.20240426,r=3

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8cff69eac4b7..d6f9abeadfa0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mozc-ut
 	pkgdesc = The Open Source edition of Google Japanese Input bundled with the UT dictionary
 	pkgver = 2.30.5448.102.20240426
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/google/mozc
 	arch = x86_64
 	license = Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND GPL-2.0-only AND GPL-2.0-or-later AND MIT AND NAIST-2003 AND Unicode-3.0 AND LicenseRef-Okinawa-Dictionary
@@ -11,7 +11,6 @@ pkgbase = mozc-ut
 	makedepends = rsync
 	makedepends = ruby
 	makedepends = wget
-	makedepends = gcc13
 	depends = qt6-base
 	optdepends = fcitx5-mozc-ut: Fcitx5 integration
 	optdepends = ibus-mozc: IBus integration
diff --git a/PKGBUILD b/PKGBUILD
index 62a4021d4465..1150f873cbb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,13 +18,13 @@ ENABLED_DICTIONARIES=(
 
 pkgname='mozc-ut'
 pkgver=2.30.5448.102.20240426
-pkgrel=2
+pkgrel=3
 pkgdesc='The Open Source edition of Google Japanese Input bundled with the UT dictionary'
 arch=('x86_64')
 url='https://github.com/google/mozc'
 license=('Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND GPL-2.0-only AND GPL-2.0-or-later AND MIT AND NAIST-2003 AND Unicode-3.0 AND LicenseRef-Okinawa-Dictionary')
 depends=('qt6-base')
-makedepends=('bazel' 'git' 'python' 'rsync' 'ruby' 'wget' 'gcc13')
+makedepends=('bazel' 'git' 'python' 'rsync' 'ruby' 'wget')
 optdepends=('fcitx5-mozc-ut: Fcitx5 integration'
             'ibus-mozc: IBus integration'
             'emacs-mozc: Emacs integration')
@@ -97,8 +97,7 @@ build() {
     export JAVA_HOME='/usr/lib/jvm/java-11-openjdk/'
 
     # Temp fix for GCC 14
-    export CC='/usr/bin/gcc-13'
-    export CXX='/usr/bin/g++-13'
+    sed -i -e '/Werror/d' third_party/protobuf/build_defs/cpp_opts.bzl
 
     bazel build server:mozc_server gui/tool:mozc_tool --config oss_linux --compilation_mode opt
 }