Merge remote-tracking branch 'origin/master' into fcitx

Author: Fcitx Bot

src/MODULE.bazel

@@ -76,6 +76,13 @@ bazel_dep(
     version = "1.7.1",
 )
 
+# rules_pkg: 1.1.0 2025-03-06
+# https://github.com/bazelbuild/rules_pkg
+bazel_dep(
+    name = "rules_pkg",
+    version = "1.1.0",
+)
+
 # rules_python: 1.4.1 2025-05-09
 # https://github.com/bazelbuild/rules_python/
 bazel_dep(
@@ -349,7 +356,7 @@ http_archive(
     url = "https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/refs/tags/%s.zip" % JA_USAGE_DICT_TAG,
 )
 
-# Zip code (2025-03-08, 6ece210081fb73d0ea4a5ea8e13ac9584d03fd76)
+# Zip code (2025-06-28, 21c6fb3cbc125e4408a8c2715beb1fbfcf03a442)
 # https://github.com/hiroyuki-komatsu/japanpost_zipcode/ contains snapshots of the zip code data
 # with version control.
 # The data files are mirror of the following files.
@@ -358,13 +365,13 @@ http_archive(
 http_archive(
     name = "zip_code_ken_all",
     build_file_content = "exports_files([\"KEN_ALL.CSV\"])",
-    sha256 = "296cfa57f2012c0226afbc64e9e8575fc36285d2fa31d725a176548cd173b3df",
-    url = "https://github.com/hiroyuki-komatsu/japanpost_zipcode/raw/6ece210081fb73d0ea4a5ea8e13ac9584d03fd76/ken_all.zip",
+    sha256 = "9cd7a9235d1869a94f4019a201d61172a0fc633f1957922c3ec23ac7bf75becf",
+    url = "https://github.com/hiroyuki-komatsu/japanpost_zipcode/raw/21c6fb3cbc125e4408a8c2715beb1fbfcf03a442/ken_all.zip",
 )
 
 http_archive(
     name = "zip_code_jigyosyo",
     build_file_content = "exports_files([\"JIGYOSYO.CSV\"])",
-    sha256 = "1c56e79ff4c7f709778e0bf4dfbffdf939efd170845feccae986d22cf4373988",
-    url = "https://github.com/hiroyuki-komatsu/japanpost_zipcode/raw/6ece210081fb73d0ea4a5ea8e13ac9584d03fd76/jigyosyo.zip",
+    sha256 = "f390501cbfe143921a939884178e5b33ca246181803d814e5f58676c19e91a6c",
+    url = "https://github.com/hiroyuki-komatsu/japanpost_zipcode/raw/21c6fb3cbc125e4408a8c2715beb1fbfcf03a442/jigyosyo.zip",
 )

src/bazel/rules_cc_windows_cc_toolchain_config.bzl.patch

@@ -9,15 +9,15 @@
 
  def _impl(ctx):
      if _use_msvc_toolchain(ctx):
-@@ -767,7 +767,6 @@
+@@ -752,7 +752,6 @@
                          flag_group(
                              flags = [
                                  "/DNOMINMAX",
 -                                "/D_WIN32_WINNT=0x0601",
                                  "/D_CRT_SECURE_NO_DEPRECATE",
                                  "/D_CRT_SECURE_NO_WARNINGS",
                                  "/bigobj",
-@@ -777,7 +776,7 @@
+@@ -762,7 +761,7 @@
                                  "/wd4291",
                                  "/wd4250",
                                  "/wd4996",

src/mac/BUILD.bazel

@@ -435,33 +435,33 @@ genrule(
         ":tweak_preflight",
         ":tweak_postflight",
     ] + mozc_select(
-        # For both macos and oss_macos
+        # Common files for all build types.
         macos = [
             ":activate_pane",
             ":dev_confirm_pane",
             ":mozc_macos",
             ":uninstaller_macos",
         ],
     ) + mozc_select(
-        # For macos or oss_macos only
+        # Files per build type.
         macos = [
             "//mac/installer:distribution.xml",
             "//mac/installer:InstallerSections.plist",
-            "//mac/installer:LaunchAgents/com.google.inputmethod.Japanese.Converter.plist",
-            "//mac/installer:LaunchAgents/com.google.inputmethod.Japanese.Renderer.plist",
+            "//mac/installer:launch_agents",
+            "//mac/installer:resources",
         ],
         oss_macos = [
             "//mac/installer:distribution.xml",
             "//mac/installer:InstallerSections.plist",
-            "//mac/installer:LaunchAgents/org.mozc.inputmethod.Japanese.Converter.plist",
-            "//mac/installer:LaunchAgents/org.mozc.inputmethod.Japanese.Renderer.plist",
+            "//mac/installer:launch_agents",
+            "//mac/installer:resources",
         ],
         prod_macos = [
             "@google_updater//:GoogleUpdater.pkg",
             "//mac/installer:distribution.xml",
             "//mac/installer:InstallerSections.plist",
-            "//mac/installer:LaunchAgents/com.google.inputmethod.Japanese.Converter.plist",
-            "//mac/installer:LaunchAgents/com.google.inputmethod.Japanese.Renderer.plist",
+            "//mac/installer:launch_agents",
+            "//mac/installer:resources",
         ],
     ),
     outs = ["installer.zip"],

src/mac/build_package.py

@@ -76,6 +76,7 @@ def main():
         'productbuild',
         '--distribution', 'distribution.xml',
         '--plugins', 'Plugins/',
+        '--resources', 'Resources/',
         'package.pkg',  # this name is only used within this script.
     ]
     util.RunOrDie(productbuild_commands)

src/mac/installer/BUILD.bazel

@@ -27,15 +27,35 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+load("@rules_pkg//pkg:pkg.bzl", "pkg_zip")
+
 package(default_visibility = ["//mac:__subpackages__"])
 
 exports_files(
     srcs = [
         "InstallerSections.plist",
-        "LaunchAgents/org.mozc.inputmethod.Japanese.Converter.plist",
-        "LaunchAgents/org.mozc.inputmethod.Japanese.Renderer.plist",
         "distribution.xml",
         "postflight_template.sh",
         "preflight_template.sh",
     ],
 )
+
+pkg_zip(
+    name = "launch_agents",
+    srcs = [
+        "LaunchAgents/org.mozc.inputmethod.Japanese.Converter.plist",
+        "LaunchAgents/org.mozc.inputmethod.Japanese.Renderer.plist",
+    ],
+    out = "launch_agents.zip",
+    strip_prefix = ".",
+)
+
+pkg_zip(
+    name = "resources",
+    srcs = [
+        "Resources/en.lproj/Localizable.strings",
+        "Resources/ja.lproj/Localizable.strings",
+    ],
+    out = "resources.zip",
+    strip_prefix = ".",
+)

src/mac/installer/Resources/en.lproj/Localizable.strings

@@ -0,0 +1 @@
+"Mozc" = "Mozc";

src/mac/installer/Resources/ja.lproj/Localizable.strings

@@ -0,0 +1 @@
+"Mozc" = "Mozc";

src/mac/tweak_installer_files.py

@@ -138,23 +138,14 @@ def TweakForProductbuild(top_dir: str, tweak_qt: bool, oss: bool) -> None:
   if oss:
     name = 'Mozc'
     folder = 'Mozc'
-    domain = 'org.mozc'
   else:
     name = 'GoogleJapaneseInput'
     folder = 'GoogleJapaneseInput.localized'
-    domain = 'com.google'
 
   renames = [
       (f'Uninstall{name}.app', f'root/Applications/{folder}/'),
       (f'{name}.app', 'root/Library/Input Methods/'),
-      (
-          f'{domain}.inputmethod.Japanese.Converter.plist',
-          'root/Library/LaunchAgents/',
-      ),
-      (
-          f'{domain}.inputmethod.Japanese.Renderer.plist',
-          'root/Library/LaunchAgents/',
-      ),
+      ('LaunchAgents', 'root/Library/'),
       ('ActivatePane.bundle', 'Plugins/'),
       ('InstallerSections.plist', 'Plugins/'),
       ('postflight.sh', 'scripts/postinstall'),