Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2023-06-20 16:47:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc"
Tue Jun 20 16:47:40 2023 rev:44 rq:1093662 version:2.29.5111.102
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2023-04-15
22:33:15.825578312 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.15902/mozc.changes 2023-06-20
16:47:43.787134768 +0200
@@ -1,0 +2,18 @@
+Sat Jun 10 13:33:02 UTC 2023 - Fuminobu Takeyama <ft...@geeko.jp> -
2.29.5111.102
+
+- Upstream update to 2.29.5111.102
+ * Fix overlay of mozc-candidate-style in mozc.el
+ * Enable the candidate window to show on a secondary and later display
+ * Update dictionaries
+ * Introduce MOZC_IBUS_CANDIDATE_WINDOW to disable mozc_renderer
+ * Support Emoji 15.0
+ * Support ImeOn/ImeOff keys
+ * Update absel-cpp and protobuf
+ * Remove add-missing-include.patch
+ - Merged by upstream
+- Update fcitx-mozc
+ * Refresh fcitx-mozc-bazel-build.patch
+- Update zip code dictionaries
+ * Refresh add-sha256sum-for-zipcode-archives.patch
+
+-------------------------------------------------------------------
Old:
----
abseil-cpp-20211102.0.tar.gz
add-missing-include.patch
fcitx-mozc-27a5bd7e.tar.xz
mozc-2.28.4715.102.tar.xz
protobuf-v3.19.3.tar.gz
New:
----
abseil-cpp-20230125.3.tar.gz
bazel-rules-ruby-5cf6ff74.zip
fcitx-mozc-ebc1ce4c.tar.xz
mozc-2.29.5111.102.tar.xz
protobuf-v3.22.5.tar.gz
upb-f3149d5f.zip
utf8_range-de0b4a8f.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozc.spec ++++++
--- /var/tmp/diff_new_pack.bVSiF3/_old 2023-06-20 16:47:45.451144769 +0200
+++ /var/tmp/diff_new_pack.bVSiF3/_new 2023-06-20 16:47:45.463144841 +0200
@@ -43,14 +43,14 @@
%define server_dir %{_libdir}/mozc
%define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc
-%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png
+%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/mozc.png
%define document_dir %{_docdir}/ibus-mozc
%define use_libprotobuf 0
%define bz_cachdir %{_sourcedir}/BAZEL_CACHE
%define makebazelcache() mkdir -p
%{bz_cachdir}/content_addressable/sha256/%{?2:%2}%{?!2:$(sha256sum %1 | cut -f
1 -d ' ')}/; cp %1
%{bz_cachdir}/content_addressable/sha256/%{?2:%2}%{?!2:$(sha256sum %1 | cut -f
1 -d ' ')}/file ;
Name: mozc
-Version: 2.28.4715.102
+Version: 2.29.5111.102
Release: 0
Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License: Apache-2.0 AND BSD-3-Clause AND SUSE-Public-Domain
@@ -70,12 +70,12 @@
# License: BSD-3-Clause
#
# Bazel requires static protobuf
-# https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.19.3.tar.gz
-Source6: protobuf-v3.19.3.tar.gz
+# https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.22.5.tar.gz
+Source6: protobuf-v3.22.5.tar.gz
# abseil cpp
# License: Apache-2.0
-# https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz
-Source7: abseil-cpp-20211102.0.tar.gz
+# https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz
+Source7: abseil-cpp-20230125.3.tar.gz
#
# jigyosyo.zip and ken_all.zip are zip-code--address data provided by
# Japan Post Co., Ltd.
@@ -92,10 +92,23 @@
# https://github.com/fcitx/mozc/tree/fcitx/src/unix/fcitx{,5}
# Run ./make_archive.sh to make tar.xz
%if %{with_fcitx4} || %{with_fcitx5}
-Source20: fcitx-mozc-27a5bd7e.tar.xz
+Source20: fcitx-mozc-ebc1ce4c.tar.xz
Source21: fcitx-mozc-icons.tar.gz
Patch20: fcitx-mozc-bazel-build.patch
%endif
+#
+# Protobuf dependencies
+# protocolbuffers/bazel-rules-ruby
+# License: Apache-2.0
+#
https://github.com/protocolbuffers/rules_ruby/archive/5cf6ff74161d7f985b9bf86bb3c5fb16cef6337b.zip
+Source31: bazel-rules-ruby-5cf6ff74.zip
+# License: BSD-3-Clause
+#
https://github.com/protocolbuffers/upb/archive/f3149d5ff4564834d2c9c2661f91570b57257f8e.zip
+Source32: upb-f3149d5f.zip
+# License: MIT
+#
https://github.com/protocolbuffers/utf8_range/archive/de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip
+Source33: utf8_range-de0b4a8f.zip
+
# A script for making a source tar.xz archive
Source100: make_archive.sh
Source101: add-sha256sum-for-zipcode-archives.patch.in
@@ -107,27 +120,25 @@
# PATCH-FIX-OPENSUSE add-sha256sum-for-zipcode-archives.patch ft...@geeko.jp
-- to avoid download
# generated by ./make_archive.sh
Patch10: add-sha256sum-for-zipcode-archives.patch
-# PATCH-FIX-UPSTREAM add-missing-include.patch -- Add a missing include
<cstdint>
-Patch11: add-missing-include.patch
-BuildRequires: bazel
BuildRequires: bazel-apple-support-source
-BuildRequires: bazel-rules-apple-source
+BuildRequires: bazel-rules-android-ndk-source
+BuildRequires: bazel-rules-apple-0_32-source
BuildRequires: bazel-rules-cc-source
BuildRequires: bazel-rules-java-source
+BuildRequires: bazel-rules-pkg-source
BuildRequires: bazel-rules-proto-source
BuildRequires: bazel-rules-python-source
BuildRequires: bazel-rules-swift-source
BuildRequires: bazel-skylib-source
BuildRequires: bazel-workspaces
+BuildRequires: bazel6
%if 0%{?suse_version} == 1500
-BuildRequires: gcc8-c++
+BuildRequires: gcc10-c++
%endif
%if %{use_libprotobuf}
BuildRequires: protobuf-devel
%endif
-#BuildRequires: python3
-#BuildRequires: python3-six
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
@@ -211,7 +222,6 @@
%if %{with_fcitx4} || %{with_fcitx5}
tar xvf %{SOURCE20}
%patch20 -p1
-#patch21 -p1
%endif
%patch1 -p1
@@ -228,29 +238,49 @@
tar xvf %{SOURCE6} -C protobuf --strip-components 1
%endif
# abseil
-tar xvf %{SOURCE7}
-mv abseil-cpp-20211102.0 abseil-cpp
+mkdir abseil-cpp
+tar xvf %{SOURCE7} -C abseil-cpp --strip-components 1
cd ../..
%if %{with_fcitx5}
%patch9 -p1
%endif
%patch10 -p1
-%patch11 -p1
# fix installation, library and header path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
-sed -i -e 's|lib/x86_64-linux-gnu|%{_lib}|g' src/BUILD.ibus.bazel
sed -i -e 's|^\(LINUX_MOZC_DOCUMENT_DIR = \).*|\1 "%{_docdir}/%{name}"|'
src/config.bzl
sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).*|\1 "%{_libdir}/mozc"|'
src/config.bzl
sed -i -e 's|^\(IBUS_MOZC_PATH = \).*|\1
"%{_libdir}/ibus-mozc/ibus-engine-mozc"|' src/config.bzl
-sed -i -e 's|^\(QT_BASE_PATH = \).*|\1 "/usr/include/qt5"|' src/config.bzl
-sed -i -e 's|^\(QT_BIN_PATH = \).*|\1 "%{_libdir}/qt5/bin/"|' src/config.bzl
+sed -i -e 's|^\(IBUS_MOZC_ICON_PATH = \).*|\1 "%{ibus_mozc_icon_path}"|'
src/config.bzl
+
+echo build --override_repository="rules_python=/usr/src/bazel-rules-python" >>
src/.bazelrc
+echo build --override_repository="rules_cc=/usr/src/bazel-rules-cc" >>
src/.bazelrc
+echo build --override_repository="rules_java=/usr/src/bazel-rules-java" >>
src/.bazelrc
+echo build --override_repository="rules_proto=/usr/src/bazel-rules-proto" >>
src/.bazelrc
+echo build
--override_repository="build_bazel_rules_apple=/usr/src/bazel-rules-apple-0_32"
>> src/.bazelrc
+echo build
--override_repository="build_bazel_apple_support=/usr/src/bazel-apple-support"
>> src/.bazelrc
+echo build
--override_repository="build_bazel_rules_swift=/usr/src/bazel-rules-swift" >>
src/.bazelrc
+echo build --override_repository="bazel_skylib=/usr/src/bazel-skylib" >>
src/.bazelrc
+echo build --override_repository="zlib=/usr/share/bazel-workspaces/zlib" >>
src/.bazelrc
+echo build
--override_repository="rules_android_ndk=/usr/src/bazel-rules-android-ndk" >>
src/.bazelrc
+echo build --override_repository="rules_pkg=/usr/src/bazel-rules-pkg" >>
src/.bazelrc
+
+# set compile options from distribution
+for f in %{optflags}; do
+ case $f in
+ *FORTIFY_SOURCE*) ;; # conflicts with opts (-DFORTIFY_SOURCE
and -Werror) from source
+ *) echo echo build --copt=$f >> src/.bazelrc
+ esac
+done
# prepare zip code dictionary
%makebazelcache %{SOURCE10}
%makebazelcache %{SOURCE11}
+%makebazelcache %{SOURCE31}
+%makebazelcache %{SOURCE32}
+%makebazelcache %{SOURCE33}
# icons
tar xvf %{SOURCE12}
@@ -266,14 +296,10 @@
cd src
%if 0%{?suse_version} == 1500
-export CC=gcc-8
-export CXX=g++-8
+export CC=gcc-10
+export CXX=g++-10
%endif
-for f in %{optflags}; do
- dist_opt_flags="$dist_opt_flags --copt $f"
-done
-
# Be careful bazel cache is not cleared by `obs build`
# --output_base might help
@@ -287,22 +313,12 @@
--repository_cache=%{bz_cachdir} \
--config oss_linux \
-c opt \
- $dist_opt_flags \
--force_pic \
--jobs %{?jobs} \
--strip=never \
--sandbox_debug \
--verbose_failures \
- -s \
- --override_repository="rules_cc=/usr/src/bazel-rules-cc" \
- --override_repository="rules_java=/usr/src/bazel-rules-java" \
- --override_repository="rules_python=/usr/src/bazel-rules-python" \
- --override_repository="rules_proto=/usr/src/bazel-rules-proto" \
-
--override_repository="build_bazel_rules_apple=/usr/src/bazel-rules-apple" \
-
--override_repository="build_bazel_apple_support=/usr/src/bazel-apple-support" \
-
--override_repository="build_bazel_rules_swift=/usr/src/bazel-rules-swift" \
- --override_repository="bazel_skylib=/usr/src/bazel-skylib" \
- --override_repository="zlib=/usr/share/bazel-workspaces/zlib" \
+ -s
bazel shutdown
@@ -422,7 +438,7 @@
install -m755 -d %{buildroot}%{server_dir}
install -m755 %{output_dir}/server/mozc_server %{buildroot}%{server_dir}
install -m755 %{output_dir}/gui/tool/mozc_tool %{buildroot}%{server_dir}
-install -m755 %{output_dir}/renderer/mozc_renderer %{buildroot}%{server_dir}
+install -m755 %{output_dir}/renderer/qt/mozc_renderer %{buildroot}%{server_dir}
install -m755 -d %{buildroot}%{_bindir}
install -m755 %{output_dir}/unix/emacs/mozc_emacs_helper %{buildroot}%{_bindir}
++++++ abseil-cpp-20211102.0.tar.gz -> abseil-cpp-20230125.3.tar.gz ++++++
++++ 79909 lines of diff (skipped)
++++++ add-sha256sum-for-zipcode-archives.patch ++++++
--- /var/tmp/diff_new_pack.bVSiF3/_old 2023-06-20 16:47:46.059148423 +0200
+++ /var/tmp/diff_new_pack.bVSiF3/_new 2023-06-20 16:47:46.063148447 +0200
@@ -2,17 +2,17 @@
===================================================================
--- mozc-2.28.4715.102.orig/src/WORKSPACE.bazel
+++ mozc-2.28.4715.102/src/WORKSPACE.bazel
-@@ -197,10 +197,12 @@ http_archive(
+@@ -181,10 +181,12 @@ http_archive(
name = "zip_code_ken_all",
build_file_content = "exports_files([\"KEN_ALL.CSV\"])",
url = "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip";,
-+ sha256 =
"509c94df91e51c6f6ae95d133b26a2d57e0d257e47a0aa54945c1cdb8afd0134"
++ sha256 =
"88fcc0cd3c453a0d9b6dc8811c330515e9d992e7e3a5d27f31a2a3c47a1adb97"
)
http_archive(
name = "zip_code_jigyosyo",
build_file_content = "exports_files([\"JIGYOSYO.CSV\"])",
url =
"https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip";,
-+ sha256 =
"6e7925ac9f5dd0bc457a7682fc2eeecba141d2d2916ffc3507a2f44eb009740f"
++ sha256 =
"767cc05bb9325288f7288aed51d75291b8b25b464d8f4d8ffd44184aad95c70d"
)
++++++ add-sha256sum-for-zipcode-archives.patch.in ++++++
--- /var/tmp/diff_new_pack.bVSiF3/_old 2023-06-20 16:47:46.075148519 +0200
+++ /var/tmp/diff_new_pack.bVSiF3/_new 2023-06-20 16:47:46.079148543 +0200
@@ -1,7 +1,7 @@
-diff --git a/src/WORKSPACE.bazel b/src/WORKSPACE.bazel
-index 3538db2d..849cbc4f 100644
---- a/src/WORKSPACE.bazel
-+++ b/src/WORKSPACE.bazel
+Index: mozc-2.28.4715.102/src/WORKSPACE.bazel
+===================================================================
+--- mozc-2.28.4715.102.orig/src/WORKSPACE.bazel
++++ mozc-2.28.4715.102/src/WORKSPACE.bazel
@@ -181,10 +181,12 @@ http_archive(
name = "zip_code_ken_all",
build_file_content = "exports_files([\"KEN_ALL.CSV\"])",
++++++ fcitx-mozc-bazel-build.patch ++++++
--- /var/tmp/diff_new_pack.bVSiF3/_old 2023-06-20 16:47:46.099148663 +0200
+++ /var/tmp/diff_new_pack.bVSiF3/_new 2023-06-20 16:47:46.099148663 +0200
@@ -1,23 +1,56 @@
---- mozc/src/WORKSPACE.bazel 2022-05-05 15:24:58.212937973 +0900
-+++ fcitx-mozc/src/WORKSPACE.bazel 2022-05-05 15:25:36.117662215 +0900
-@@ -66,6 +66,22 @@
- path = "/usr", # For Debian
+diff -ruN a/src/BUILD.fcitx.bazel b/src/BUILD.fcitx.bazel
+--- a/src/BUILD.fcitx.bazel 1970-01-01 09:00:00.000000000 +0900
++++ b/src/BUILD.fcitx.bazel 2023-04-13 23:45:01.175952717 +0900
+@@ -0,0 +1,29 @@
++# revert 2154ebe
++
++package(
++ default_visibility = ["//visibility:public"],
++)
++
++# This rule is created from pkg-config
++#
++# packages="fcitx"
++# copts, hdrs, indludes: pkg-config --cflags $packages
++# linkopts: pkg-config --libs-only-l $packages
++
++cc_library(
++ name = "fcitx",
++ hdrs = glob([
++ "include/fcitx/**",
++ "include/fcitx-config/**",
++ "include/fcitx-utils/**",
++ ]),
++ copts = ["-pthread"],
++ includes = [
++ "include",
++ ],
++ linkopts = [
++ "-lfcitx-core",
++ "-lfcitx-config",
++ "-lfcitx-utils",
++ ],
++)
+diff -ruN a/src/WORKSPACE.bazel b/src/WORKSPACE.bazel
+--- a/src/WORKSPACE.bazel 2023-04-13 23:40:49.927487544 +0900
++++ b/src/WORKSPACE.bazel 2023-04-13 23:41:42.676424993 +0900
+@@ -70,6 +70,21 @@
+ packages = ["glib-2.0", "gobject-2.0", "ibus-1.0"],
)
+# Fcitx
++# pkg_config_repository does not work because pkgconfig --cflags-only-I fcitx
returns nothing
+new_local_repository(
-+ name = "fcitx",
-+ # This path should be updated per the environment.
-+ path = "/usr", # For Debian
-+ build_file = "BUILD.fcitx.bazel",
++ name = "fcitx",
++ # This path should be updated per the environment.
++ path = "/usr", # For Debian
++ build_file = "BUILD.fcitx.bazel",
+)
+
+# Fcitx 5
-+new_local_repository(
-+ name = "fcitx5",
-+ # This path should be updated per the environment.
-+ path = "/usr", # For Debian
-+ build_file = "BUILD.fcitx5.bazel",
++pkg_config_repository(
++ name = "fcitx5",
++ packages = ["Fcitx5Module", "Fcitx5Core"],
+)
+
# Japanese Usage Dictionary
++++++ fcitx-mozc-27a5bd7e.tar.xz -> fcitx-mozc-ebc1ce4c.tar.xz ++++++
++++ 2067 lines of diff (skipped)
++++++ ibus-provide-layout-variations.patch ++++++
--- /var/tmp/diff_new_pack.bVSiF3/_old 2023-06-20 16:47:46.199149265 +0200
+++ /var/tmp/diff_new_pack.bVSiF3/_new 2023-06-20 16:47:46.199149265 +0200
@@ -1,29 +1,26 @@
-Index: mozc-2.28.4715.102/src/unix/ibus/gen_mozc_xml.py
-===================================================================
---- mozc-2.28.4715.102.orig/src/unix/ibus/gen_mozc_xml.py
-+++ mozc-2.28.4715.102/src/unix/ibus/gen_mozc_xml.py
-@@ -228,6 +228,30 @@ def main():
- 'layout_variant': '',
- 'layout_option': '',
- 'rank': 80,
-+ },
-+ {
+diff --git a/src/unix/ibus/gen_mozc_xml.py b/src/unix/ibus/gen_mozc_xml.py
+index 75514ea3..7998c0e9 100755
+--- a/src/unix/ibus/gen_mozc_xml.py
++++ b/src/unix/ibus/gen_mozc_xml.py
+@@ -244,6 +244,27 @@ def main():
+ 'rank': 99,
+ 'symbol': 'A',
+ 'composition_mode': 'DIRECT',
++ }, {
+ 'name': 'mozc-jp-jp',
+ 'longname': product_name + " - JP layout",
+ 'layout': 'jp',
+ 'layout_variant': '',
+ 'layout_option': '',
+ 'rank': 0,
-+ },
-+ {
++ }, {
+ 'name': 'mozc-us',
+ 'longname': product_name + " - US layout",
+ 'layout': 'us',
+ 'layout_variant': '',
+ 'layout_option': '',
+ 'rank': 0,
-+ },
-+ {
++ }, {
+ 'name': 'mozc-dv',
+ 'longname': product_name + " - US Dvorak layout",
+ 'layout': 'us',
++++++ jigyosyo.zip ++++++
Binary files /var/tmp/diff_new_pack.bVSiF3/_old and
/var/tmp/diff_new_pack.bVSiF3/_new differ
++++++ ken_all.zip ++++++
Binary files /var/tmp/diff_new_pack.bVSiF3/_old and
/var/tmp/diff_new_pack.bVSiF3/_new differ
++++++ make_archive.sh ++++++
--- /var/tmp/diff_new_pack.bVSiF3/_old 2023-06-20 16:47:46.303149889 +0200
+++ /var/tmp/diff_new_pack.bVSiF3/_new 2023-06-20 16:47:46.307149914 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
-commit=4c5d516fdff227039305eef3411f12bac9f02246
-fcitxcommit=27a5bd7e78ab70329ed5cc75e29dcbacfd788e3f
+commit=9a2f53ad33bc9ccd15f02d69a94f8f3552bd08cd
+fcitxcommit=ebc1ce4c8f66e490aec8964777e5f672264d659c
set -e
@@ -20,6 +20,7 @@
cd mozc
else
cd mozc
+ git restore .
git fetch
fi
@@ -44,13 +45,14 @@
cd fcitx-mozc
else
cd fcitx-mozc
+ git restore .
git fetch
fi
git checkout $fcitxcommit
git archive --format=tar $fcitxcommit \
- src/unix/fcitx src/unix/fcitx5 src/BUILD.fcitx.bazel
src/BUILD.fcitx5.bazel | \
+ src/unix/fcitx src/unix/fcitx5 | \
xz > ../fcitx-mozc-`echo $fcitxcommit | cut -c 1-8`.tar.xz
cd ..
fi
@@ -65,5 +67,4 @@
< add-sha256sum-for-zipcode-archives.patch.in \
> add-sha256sum-for-zipcode-archives.patch
fi
-(No newline at EOF)
++++++ mozc-2.28.4715.102.tar.xz -> mozc-2.29.5111.102.tar.xz ++++++
/work/SRC/openSUSE:Factory/mozc/mozc-2.28.4715.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new.15902/mozc-2.29.5111.102.tar.xz differ:
char 25, line 1
++++++ protobuf-v3.19.3.tar.gz -> protobuf-v3.22.5.tar.gz ++++++
++++ 843837 lines of diff (skipped)
