pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: [pkgsrc-2024Q3] pkgsrc/inputmethod/mozc-server



Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Dec 13 20:43:07 UTC 2024

Modified Files:
        pkgsrc/inputmethod/mozc-server [pkgsrc-2024Q3]: Makefile
            Makefile.common distinfo
        pkgsrc/inputmethod/mozc-server/patches [pkgsrc-2024Q3]:
            patch-WORKSPACE.bazel
Added Files:
        pkgsrc/inputmethod/mozc-server/patches [pkgsrc-2024Q3]:
            patch-dictionary_BUILD.bazel

Log Message:
Pullup ticket #6920 - requested by maya
inputmethod/mozc-server: build fix (prevent network access during build)

Revisions pulled up:
- inputmethod/mozc-server/Makefile                              1.96-1.97
- inputmethod/mozc-server/Makefile.common                       1.42-1.43
- inputmethod/mozc-server/distinfo                              1.30
- inputmethod/mozc-server/patches/patch-WORKSPACE.bazel         1.2
- inputmethod/mozc-server/patches/patch-dictionary_BUILD.bazel  1.1

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Sat Dec  7 18:07:35 UTC 2024

   Modified Files:
           pkgsrc/inputmethod/mozc-server: Makefile.common

   Log Message:
   mozc-server: Fix build by allowing network access during build

   TODO: This should be fixed to not download files during the build!

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Dec 11 03:07:20 UTC 2024

   Modified Files:
           pkgsrc/inputmethod/mozc-server: Makefile Makefile.common distinfo
           pkgsrc/inputmethod/mozc-server/patches: patch-WORKSPACE.bazel
   Added Files:
           pkgsrc/inputmethod/mozc-server/patches: patch-dictionary_BUILD.bazel

   Log Message:
   mozc-server: avoid network fetches, respect MAKE_JOBS

   --distdir is the magic incantation to tell bazel to look at local files

   We are still left with issues from http_archive, so I comment those out,
   extract the zip file ourselves, and adjust the BUILD.bazel to use a local
   file in the same directory as the code.

   PR pkg/58404
   PR pkg/58750

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Dec 11 03:08:04 UTC 2024

   Modified Files:
           pkgsrc/inputmethod/mozc-server: Makefile

   Log Message:
   mozc-server: Bump PKGREVISION for previous intrusive bazel changes

   It shouldn't affect the resulting package, but in case it does...


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.4.1 pkgsrc/inputmethod/mozc-server/Makefile
cvs rdiff -u -r1.41 -r1.41.6.1 pkgsrc/inputmethod/mozc-server/Makefile.common
cvs rdiff -u -r1.29 -r1.29.6.1 pkgsrc/inputmethod/mozc-server/distinfo
cvs rdiff -u -r1.1 -r1.1.6.1 \
    pkgsrc/inputmethod/mozc-server/patches/patch-WORKSPACE.bazel
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/inputmethod/mozc-server/patches/patch-dictionary_BUILD.bazel

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/mozc-server/Makefile
diff -u pkgsrc/inputmethod/mozc-server/Makefile:1.92 pkgsrc/inputmethod/mozc-server/Makefile:1.92.4.1
--- pkgsrc/inputmethod/mozc-server/Makefile:1.92        Wed May 29 16:33:11 2024
+++ pkgsrc/inputmethod/mozc-server/Makefile     Fri Dec 13 20:43:07 2024
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.92 2024/05/29 16:33:11 adam Exp $
+# $NetBSD: Makefile,v 1.92.4.1 2024/12/13 20:43:07 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=   2
+PKGREVISION=   6
 
 INSTALLATION_DIRS+=    libexec
 
+post-configure:
+       cd ${WRKSRC}/dist && \
+               unzip -d ../dictionary jigyosyo.zip && \
+               unzip -d ../dictionary ken_all.zip
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
                ${PREFIX}/bin/bazel \
@@ -19,6 +24,8 @@ do-build:
                        --sandbox_debug \
                        --verbose_failures \
                        --subcommands \
+                       --distdir=${WRKSRC}/dist \
+                       --jobs=${MAKE_JOBS:U1} \
                        --config oss_linux --compilation_mode opt
 
 do-install:

Index: pkgsrc/inputmethod/mozc-server/Makefile.common
diff -u pkgsrc/inputmethod/mozc-server/Makefile.common:1.41 pkgsrc/inputmethod/mozc-server/Makefile.common:1.41.6.1
--- pkgsrc/inputmethod/mozc-server/Makefile.common:1.41 Sat Feb 10 01:17:26 2024
+++ pkgsrc/inputmethod/mozc-server/Makefile.common      Fri Dec 13 20:43:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2024/02/10 01:17:26 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.41.6.1 2024/12/13 20:43:07 bsiegert Exp $
 
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
@@ -29,48 +29,78 @@ DISTFILES+= ${DEFAULT_DISTFILES}
 
 EXTRACT_ONLY=  ${DEFAULT_DISTFILES} ${_GITHUB_DEFAULT_DISTFILES}
 
-#MOZC_DISTS+=  bazel-skylib-1.4.1.tar.gz
-#SITES.bazel-skylib-1.4.1.tar.gz=      https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/
-#
-#MOZC_DISTS+=  rules_python-0.0.1.tar.gz
-#SITES.rules_python-0.0.1.tar.gz=      https://github.com/bazelbuild/rules_python/releases/download/0.0.1/
-#
-#MOZC_DISTS+=  rules_apple.1.1.3.tar.gz
-#SITES.rules_apple.1.1.3.tar.gz=               https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/
-#
-#MOZC_DISTS+=  44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip
-#SITES.44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip=   https://github.com/bazelbuild/rules_android_ndk/archive/
-#
-#MOZC_DISTS+=  8fbaae947b87c1e66c0934493168fc6d583ed889.zip
-#SITES.8fbaae947b87c1e66c0934493168fc6d583ed889.zip=   https://github.com/google/google-toolbox-for-mac/archive/
-#
-#MOZC_DISTS+=  dictionary.png
-#SITES.dictionary.png= -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/png/action/chrome_reader_mode/materialiconsoutlined/48dp/1x/outline_chrome_reader_mode_black_48dp.png
-#
-#MOZC_DISTS+=  dictionary.svg
-#SITES.dictionary.svg= -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/src/action/chrome_reader_mode/materialiconsoutlined/24px.svg
-#
-#MOZC_DISTS+=  properties.png
-#SITES.properties.png= -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/png/action/settings/materialiconsround/48dp/1x/round_settings_black_48dp.png
-#
-#MOZC_DISTS+=  properties.svg
-#SITES.properties.svg= -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/src/action/settings/materialiconsround/24px.svg
-#
-#MOZC_DISTS+=  tool.png
-#SITES.tool.png=       -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/png/action/build/materialicons/48dp/1x/baseline_build_black_48dp.png
-#
-#MOZC_DISTS+=  tool.svg
-#SITES.tool.svg=       -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/src/action/build/materialicons/24px.svg
-#
-#MOZC_DISTS+=  ken_all.zip
-#SITES.ken_all.zip=    https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/
-#
-#MOZC_DISTS+=  jigyosyo.zip
-#SITES.jigyosyo.zip=   https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/
-#
-#.for d in ${MOZC_DISTS}
-#DISTFILES+=   ${d}
-#.endfor
+MOZC_DISTS+=   zlib-1.2.13.tar.xz
+SITES.zlib-1.2.13.tar.xz=      https://github.com/madler/zlib/releases/download/v1.2.13/
+
+MOZC_DISTS+=   de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip
+SITES.de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip=    https://github.com/protocolbuffers/utf8_range/archive/
+
+MOZC_DISTS+=   ea4e825d22c9ae0031d59ec5e86dc85bb50cbbcb.zip
+SITES.ea4e825d22c9ae0031d59ec5e86dc85bb50cbbcb.zip=    https://github.com/protocolbuffers/upb/archive/
+
+MOZC_DISTS+=   8fca842a3006c3d637114aba4f6bf9695bb3a432.zip
+SITES.8fca842a3006c3d637114aba4f6bf9695bb3a432.zip=    https://github.com/protocolbuffers/rules_ruby/archive/
+
+MOZC_DISTS+=   rules_pkg-0.7.0.tar.gz
+SITES.rules_pkg-0.7.0.tar.gz=  https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/
+
+MOZC_DISTS+=   818289e5613731ae410efb54218a4077fb9dbb03.zip
+SITES.818289e5613731ae410efb54218a4077fb9dbb03.zip=    https://github.com/bazelbuild/rules_cc/archive/
+
+MOZC_DISTS+=   rules_java-6.0.0.tar.gz
+SITES.rules_java-6.0.0.tar.gz= https://github.com/bazelbuild/rules_java/releases/download/6.0.0/
+
+MOZC_DISTS+=   f7a30f6f80006b591fa7c437fe5a951eb10bcbcf.zip
+SITES.f7a30f6f80006b591fa7c437fe5a951eb10bcbcf.zip=    https://github.com/bazelbuild/rules_proto/archive/
+
+MOZC_DISTS+=   rules_swift.1.2.0.tar.gz
+SITES.rules_swift.1.2.0.tar.gz=        https://github.com/bazelbuild/rules_swift/releases/download/1.2.0/
+
+MOZC_DISTS+=   apple_support.1.3.1.tar.gz
+SITES.apple_support.1.3.1.tar.gz=      https://github.com/bazelbuild/apple_support/releases/download/1.3.1/
+
+MOZC_DISTS+=   bazel-skylib-1.4.1.tar.gz
+SITES.bazel-skylib-1.4.1.tar.gz=       https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/
+
+MOZC_DISTS+=   rules_python-0.0.1.tar.gz
+SITES.rules_python-0.0.1.tar.gz=       https://github.com/bazelbuild/rules_python/releases/download/0.0.1/
+
+MOZC_DISTS+=   rules_apple.1.1.3.tar.gz
+SITES.rules_apple.1.1.3.tar.gz=                https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/
+
+MOZC_DISTS+=   44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip
+SITES.44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip=    https://github.com/bazelbuild/rules_android_ndk/archive/
+
+MOZC_DISTS+=   8fbaae947b87c1e66c0934493168fc6d583ed889.zip
+SITES.8fbaae947b87c1e66c0934493168fc6d583ed889.zip=    https://github.com/google/google-toolbox-for-mac/archive/
+
+MOZC_DISTS+=   dictionary.png
+SITES.dictionary.png=  -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/png/action/chrome_reader_mode/materialiconsoutlined/48dp/1x/outline_chrome_reader_mode_black_48dp.png
+
+MOZC_DISTS+=   dictionary.svg
+SITES.dictionary.svg=  -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/src/action/chrome_reader_mode/materialiconsoutlined/24px.svg
+
+MOZC_DISTS+=   properties.png
+SITES.properties.png=  -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/png/action/settings/materialiconsround/48dp/1x/round_settings_black_48dp.png
+
+MOZC_DISTS+=   properties.svg
+SITES.properties.svg=  -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/src/action/settings/materialiconsround/24px.svg
+
+MOZC_DISTS+=   tool.png
+SITES.tool.png=        -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/png/action/build/materialicons/48dp/1x/baseline_build_black_48dp.png
+
+MOZC_DISTS+=   tool.svg
+SITES.tool.svg=        -https://raw.githubusercontent.com/google/material-design-icons/4.0.0/src/action/build/materialicons/24px.svg
+
+MOZC_DISTS+=   ken_all.zip
+SITES.ken_all.zip=     https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/
+
+MOZC_DISTS+=   jigyosyo.zip
+SITES.jigyosyo.zip=    https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/
+
+.for d in ${MOZC_DISTS}
+DISTFILES+=    ${d}
+.endfor
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/src
 

Index: pkgsrc/inputmethod/mozc-server/distinfo
diff -u pkgsrc/inputmethod/mozc-server/distinfo:1.29 pkgsrc/inputmethod/mozc-server/distinfo:1.29.6.1
--- pkgsrc/inputmethod/mozc-server/distinfo:1.29        Sat Feb 10 01:17:26 2024
+++ pkgsrc/inputmethod/mozc-server/distinfo     Fri Dec 13 20:43:07 2024
@@ -1,11 +1,44 @@
-$NetBSD: distinfo,v 1.29 2024/02/10 01:17:26 ryoon Exp $
+$NetBSD: distinfo,v 1.29.6.1 2024/12/13 20:43:07 bsiegert Exp $
 
+BLAKE2s (44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip) = 7ec1b42c9cae4578f10f4b95f86c4e8520818cf5064489291191b72ecda7c4d2
+SHA512 (44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip) = bb2c9f7e849c2d68b20a7c385768be1f735a0ca813c476d89ec80cfe25814fa7bfa2f6efa997cfaa01827c04c8fe1bcd821f41742038599b7a71a24b1214c4ea
+Size (44dcd014f4b126f8941c29ff1b25e1584bd3eb26.zip) = 34786 bytes
+BLAKE2s (818289e5613731ae410efb54218a4077fb9dbb03.zip) = 9f40370ab8a40a7337fd7230d44084b12f0c48d5b35828451279a9aee7b818e8
+SHA512 (818289e5613731ae410efb54218a4077fb9dbb03.zip) = a8543145b6df3893a92b95a06eb76322e7c81e65b0294431fd01b62df47bcd8646541ae9fb8c7a1127f0b01557e78faf012c9372ee9797181994f58d0f935c37
+Size (818289e5613731ae410efb54218a4077fb9dbb03.zip) = 183532 bytes
+BLAKE2s (8fbaae947b87c1e66c0934493168fc6d583ed889.zip) = 29038dc7b34f51b4e30b772827c523fe64848b19cb97cc34fea8bda941c81140
+SHA512 (8fbaae947b87c1e66c0934493168fc6d583ed889.zip) = c5e4a7d0bd80749dd1f28fa7e12fcc567717c3816f486d91f7b74bf6bfe3dfa00d1d378ed02cac6897e2fe49ea459c41525b7c60c03c5b912b5cb5538c791044
+Size (8fbaae947b87c1e66c0934493168fc6d583ed889.zip) = 634248 bytes
+BLAKE2s (8fca842a3006c3d637114aba4f6bf9695bb3a432.zip) = 5dcccb71163a1489c8f7adc06849ad5492fa76554ee82d86aba580b3be5169b2
+SHA512 (8fca842a3006c3d637114aba4f6bf9695bb3a432.zip) = 14b3b84b1fce96daf4756bac370ffb1bb87a986d971c86a0fcf8c82f29c3d7ecdb846c43530feb51e4386f6e7bf58cad33e385dccad10d97ae49269be51adba9
+Size (8fca842a3006c3d637114aba4f6bf9695bb3a432.zip) = 2524560 bytes
 BLAKE2s (abseil-abseil-cpp-c2435f8342c2d0ed8101cb43adfd605fdc52dca2.tar.gz) = 00ebf72f25bc06218db107c4bcf3d471c4e015394285658a8a840e5c5643674d
 SHA512 (abseil-abseil-cpp-c2435f8342c2d0ed8101cb43adfd605fdc52dca2.tar.gz) = 
e84f7d84b39fe2c68626da0bf0f1a50d1edcfda321739be0cba8d27758caf0962ff918afdd15ea109ae81e5a167ac0bea769f8780ff9b7517ff5807ca3a0880d
 Size (abseil-abseil-cpp-c2435f8342c2d0ed8101cb43adfd605fdc52dca2.tar.gz) = 2120347 bytes
+BLAKE2s (apple_support.1.3.1.tar.gz) = 46c1c061bd3751ba667a7099e889b40ccab7ffb4ebcae22c5ea0e4261fe4efb8
+SHA512 (apple_support.1.3.1.tar.gz) = 6947dabb4f0f2f5158108c83542369aa7d9fa438b3fe6cd82aae62ac07ff44e3b0b29adb28e95de34ce7b1b4b0d37eb9d891add100dee02507467d5c43c15c7e
+Size (apple_support.1.3.1.tar.gz) = 29268 bytes
+BLAKE2s (bazel-skylib-1.4.1.tar.gz) = b8521cf98c61ab80854c0e0bef365447e0c1b94b51e018ef1e6a64a1b1776478
+SHA512 (bazel-skylib-1.4.1.tar.gz) = 1342cd99bed5c9f47a1b5643e011144f8e037097b917210178b6b1dac6f4a980ba009e0656b904be527bfd1ab4966b3ed00b291d7f52a3486908caa3e647c3ae
+Size (bazel-skylib-1.4.1.tar.gz) = 36047 bytes
 BLAKE2s (chromium-gyp-9ecf45e37677743503342ee4c6a76eaee80e4a7f.tar.gz) = ed98efdbceffd7f4d178db312bb90024228f449bb2445193a50d259af4922233
 SHA512 (chromium-gyp-9ecf45e37677743503342ee4c6a76eaee80e4a7f.tar.gz) = 
961259c270471524ac371310460ca0fc34cec1cc57f6604915a6771be5f577420a7f1ddccb0d865fb94f5fb1516e0cdbb7f74d05252c5c3782d2b8fe7bf6f7df
 Size (chromium-gyp-9ecf45e37677743503342ee4c6a76eaee80e4a7f.tar.gz) = 630462 bytes
+BLAKE2s (de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip) = 7ccdef72dd1a71f1a690c2150e8fc480fa9548a7ce743f5a74de37540201591c
+SHA512 (de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip) = 5e99e04aa1fa164887d1fa88e3e08f8803c89a3be0ec7aa5fedebd392b1ba599e929932d9a8d16366995a6ab37d10528ba5b7b2a757240310f429a65751cd1a5
+Size (de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip) = 71636 bytes
+BLAKE2s (dictionary.png) = faab4e340b71053cc0801d05433c2a92dc73f1474e8a92a648c766d0abae0d83
+SHA512 (dictionary.png) = aac820bbf51b2dfe23a9e0de57c2c9f4301e021c3ae29047ec8918ccb22b698f775ceee1dfe5ceaf21ada9228085ae1a36e65ab33fd811acf072e4d380225d9c
+Size (dictionary.png) = 205 bytes
+BLAKE2s (dictionary.svg) = 6966323b10cb82ffe64d7a6526cae4862f6a82eed55984c906d53a7538ddc1d9
+SHA512 (dictionary.svg) = 648b486ec244c117ae25aadbff1f14211a311df37161b7777c442aff2f7f8dd61d41912d81891a0de29383e3430ee80ecdad7d9b1fb9e0ea7addcbf97af018c3
+Size (dictionary.svg) = 294 bytes
+BLAKE2s (ea4e825d22c9ae0031d59ec5e86dc85bb50cbbcb.zip) = c86669c738a86df0089415becc71e6159b5d1169f46c80f48a93d7a140b63280
+SHA512 (ea4e825d22c9ae0031d59ec5e86dc85bb50cbbcb.zip) = 07d93a8106fef6af4572c92000779b9719405d0a6a5a8ffafa227b22e6cdbaffa481b80e7cbb62204cd805b0463f1edf53d91277dca7436563946ad69c1ff6bc
+Size (ea4e825d22c9ae0031d59ec5e86dc85bb50cbbcb.zip) = 985349 bytes
+BLAKE2s (f7a30f6f80006b591fa7c437fe5a951eb10bcbcf.zip) = 9bd199bc4b12616790f889dfe15133eb83ee000ff7ee6611f50cb011ad275e14
+SHA512 (f7a30f6f80006b591fa7c437fe5a951eb10bcbcf.zip) = f1a484e0052b4ed60189f89bd15cfa86aa5e0f89b0a58ecf5f470cfa9dbe53a4da9ff622281e3fb06e7669dc0391f604cd6bd86cc5fa0bb17239200c4c953378
+Size (f7a30f6f80006b591fa7c437fe5a951eb10bcbcf.zip) = 30437 bytes
 BLAKE2s (google-breakpad-216cea7bca53fa441a3ee0d0f5fd339a3a894224.tar.gz) = 9ad9f07697109ee2bf795c327bef55c0d7de9ecdf25a04c999ac3a542904607e
 SHA512 (google-breakpad-216cea7bca53fa441a3ee0d0f5fd339a3a894224.tar.gz) = 
6c7c667349c1b8e5509ba3a4a78873b87d1f1decefbd01e916e4b34497518c53c418ff5eaf88c9c9ef1815c8ee75112f876eebca4222ebb372fe6e5c2f5ab948
 Size (google-breakpad-216cea7bca53fa441a3ee0d0f5fd339a3a894224.tar.gz) = 5276094 bytes
@@ -15,16 +48,52 @@ Size (google-googletest-58d77fa8070e8cec
 BLAKE2s (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425575734c323e1d947009dd74709437b684.tar.gz) = 41a7c5d9cc2ffcce85239a416580d4595c129e7aca00316462e387b205183d07
 SHA512 (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425575734c323e1d947009dd74709437b684.tar.gz) = 
b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
 Size (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425575734c323e1d947009dd74709437b684.tar.gz) = 71051 bytes
+BLAKE2s (jigyosyo.zip) = cb01141626d5bce7ff4afab640d852e22bba417b1251b8f6baa49fc284e6eb6d
+SHA512 (jigyosyo.zip) = c13cb5a2dd3621d919bd4c1284453d709d31de892cfcddab563f53496c8bd91794645ac8b6d0d979f2430241507a8e396e4388f95ee86dec85470dbb00617dcf
+Size (jigyosyo.zip) = 773563 bytes
+BLAKE2s (ken_all.zip) = 03229936476c091df9b5bcdcbaec4bfced2df115199d5d7dac1e02268bbd2699
+SHA512 (ken_all.zip) = 29a8a1ded2b252d26d031ada408334f2aeec7faa44957a3cbe7c6f9ac2bc2749f49cab25defa184899c1e42ae24e6b725653f95405bfbef6769fe4b3181c1952
+Size (ken_all.zip) = 1693901 bytes
 BLAKE2s (microsoft-wil-fc5dbf55989fe20351c71d038a8d12de4b397a6d.tar.gz) = bd4eed4a97519b07fc1ac749e92058425232bff17796425b7469a065d3e2e7ce
 SHA512 (microsoft-wil-fc5dbf55989fe20351c71d038a8d12de4b397a6d.tar.gz) = 
59548723d25e6f3c4a0f750d9874b06a487c15afb9cc9fa3a7a5290cbf79ea42cf36b9906c73dc56c566736141819d7a020b7a3d793724df83a9de5bc61ef674
 Size (microsoft-wil-fc5dbf55989fe20351c71d038a8d12de4b397a6d.tar.gz) = 520155 bytes
 BLAKE2s (mozc-2.29.5268.102.tar.gz) = d01da00f8d8c4bb0e14188fab66d05cd3dd3097ee5803fea7c7dfff4927e2caf
 SHA512 (mozc-2.29.5268.102.tar.gz) = 1b3586659044fabad5eec151e885c6781d00af8c345e2e8768aceaacfdcdce01651d08d854cbcd079e6f1f75743e305316b2f410c3d8049c23880a7e0f620d0c
 Size (mozc-2.29.5268.102.tar.gz) = 38277685 bytes
+BLAKE2s (properties.png) = 2efc23bb92dde31330eef88524946da9071311584e8f4ffa144544873a591aa7
+SHA512 (properties.png) = 1cbd9307f0e96c1255c1cb915d10d2254281574c8fcf54e97a518d3a49475cc7775d6f4042a04e2358f7db5808986eef9cd9b84fff571dce1b9ec23f8fb3a8fd
+Size (properties.png) = 557 bytes
+BLAKE2s (properties.svg) = 14593fd55cda98cfabc1624b6ff2348a4f69c90a74fdacf35251f7499e2fb315
+SHA512 (properties.svg) = 637b8ec750fa0a5a32afbcefb43430d122de889d32ce6295327934dede6051d1a37678a895b8c2fa26ab0c28f5a372e7b6ca0aad7acebaf64cc5a88c32ff43de
+Size (properties.svg) = 812 bytes
 BLAKE2s (protocolbuffers-protobuf-54a2e5caa9d1a0a714fb2aa99753a1444414292a.tar.gz) = 4c142ebd4c669862e2a68ec2c90db0b9d1b17a74d9dbc379f994b01b5a84aaa1
 SHA512 (protocolbuffers-protobuf-54a2e5caa9d1a0a714fb2aa99753a1444414292a.tar.gz) = 
05d4c987e790dc1180b1e3555de52fa7b52866b2dea2dff5fca1398edd4a39c32611e7bc074df9749a06bcf2e9ee338379329900b01bc7f3c8caff55412e06ed
 Size (protocolbuffers-protobuf-54a2e5caa9d1a0a714fb2aa99753a1444414292a.tar.gz) = 5185168 bytes
-SHA1 (patch-WORKSPACE.bazel) = 10a4b9321943152c7ed00148630eff5409e13ae1
+BLAKE2s (rules_apple.1.1.3.tar.gz) = 9fab1fd301e052583a0c60665e5fa25df9e1790574557177861df3edd3d309ba
+SHA512 (rules_apple.1.1.3.tar.gz) = 57de58611e7452e17e555c9bdb329ab89661bfd7971bd59d7f1d427312f4c26575c400deb0a09501141d26e53551e46561c1199632f453551233491d81b5df87
+Size (rules_apple.1.1.3.tar.gz) = 2205749 bytes
+BLAKE2s (rules_java-6.0.0.tar.gz) = 589980410226ebdc3548f1b5e46d7989c8e7acc7f71d0edc7e8fd95bf7582dec
+SHA512 (rules_java-6.0.0.tar.gz) = b662ac2cb0f8928343ab9ecdb3bc9492e66f3090ff015e67be15838fa0cdc8b6f6240b6aef8c00f38d96a1e114d76dad99ef21b58016dbd38117ee626eb18cd6
+Size (rules_java-6.0.0.tar.gz) = 22365 bytes
+BLAKE2s (rules_pkg-0.7.0.tar.gz) = b7580de7642d33c16042e5d7fdfffd80f26d41cd4008fa6e2fe821c53f90e68d
+SHA512 (rules_pkg-0.7.0.tar.gz) = 2fba108997065d753e17f1e7de1db08461416d03f8832d38e25f5151bfd0ad896565db9eb56b3702b604296a19620f9b60e5c15440855d36e64865010e6f4cdc
+Size (rules_pkg-0.7.0.tar.gz) = 76580 bytes
+BLAKE2s (rules_python-0.0.1.tar.gz) = 9cd5640c24602619efab9dfdb3bb65dcb57bcf5df3b3dc39afa8a04142a93ef5
+SHA512 (rules_python-0.0.1.tar.gz) = 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5
+Size (rules_python-0.0.1.tar.gz) = 2302092 bytes
+BLAKE2s (rules_swift.1.2.0.tar.gz) = e06c396a988fb1b1a09e4264a851a9b647c96230e11590fafe7bdb06bb8b8c8d
+SHA512 (rules_swift.1.2.0.tar.gz) = eb6cd542e5cddf1b508a2a1766f9e77844bb529e672c1752662c93b69d08beefe986144bc0c1a60a5c36f032d8946777f9438e7ef701db0f7c0d50f8ffc7c8a4
+Size (rules_swift.1.2.0.tar.gz) = 208764 bytes
+BLAKE2s (tool.png) = c9d840c557a9032f59d50afd1918cc63e7bcd8ee2695d7c5cbe7189d3047f391
+SHA512 (tool.png) = 35f270784ff7b947aa3636d9531c502775315116f694f95a21a93ef9bf77d67ab7b194153b186a8371a78ce8b162ca82fb232aea92dc37ba2de86c79fe8f19b1
+Size (tool.png) = 360 bytes
+BLAKE2s (tool.svg) = 008797301692abef03d44d24f9ae8a82ab791af3cc2ac6c0be4704aae80c976d
+SHA512 (tool.svg) = 471ae428ca8312b4ecc8ab3f7348f89b2778e853a3106e21b5027b5fa23d8ea2eb301a18d64203af52e4ca8bfe51f184966e01670c514dc019a649c5f557e08a
+Size (tool.svg) = 326 bytes
+BLAKE2s (zlib-1.2.13.tar.xz) = a7379d82dbff33a861dd6bbafb45b330a8922a6aff1c4be5b1dd415af4029bd0
+SHA512 (zlib-1.2.13.tar.xz) = 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
+Size (zlib-1.2.13.tar.xz) = 1296496 bytes
+SHA1 (patch-WORKSPACE.bazel) = b6ba591b6802516dd1863b23a8fa444cae1661bc
 SHA1 (patch-base_cpu__stats.cc) = 7e057385f271f7fa14a761d11b9a9663c5ab39b3
 SHA1 (patch-base_file_recursive.cc) = 9c6f5a2db32a757fa72b6a86d51e50f09fe9b38e
 SHA1 (patch-base_logging.cc) = dbf245a2d3869db3d5c930e9a1ccc581bb7cf216
@@ -37,6 +106,7 @@ SHA1 (patch-bazel_pkg__config__repositor
 SHA1 (patch-client_client.cc) = 2094c8d9fa9c3806fc343373ac34b7cfd441c1e8
 SHA1 (patch-config.bzl) = 2c35cc8a89ecda745604911b0430df4834548bc3
 SHA1 (patch-config_stats__config__util__test.cc) = a51e1c239c54c406b21375be526facf29d924c53
+SHA1 (patch-dictionary_BUILD.bazel) = 6a0a527ff9768f9d4da6500ea7bcf46e3889a172
 SHA1 (patch-gui_config__dialog_config__dialog.cc) = b7761985e9150da19deeeda9b751d6e65d488071
 SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = a2e22f214f943c9d91b091432749f24900675f94
 SHA1 (patch-gui_config__dialog_keymap__editor.cc) = 12671f74b38944f908c20a48bae8e83f140732e8

Index: pkgsrc/inputmethod/mozc-server/patches/patch-WORKSPACE.bazel
diff -u pkgsrc/inputmethod/mozc-server/patches/patch-WORKSPACE.bazel:1.1 pkgsrc/inputmethod/mozc-server/patches/patch-WORKSPACE.bazel:1.1.6.1
--- pkgsrc/inputmethod/mozc-server/patches/patch-WORKSPACE.bazel:1.1    Sat Feb 10 01:17:27 2024
+++ pkgsrc/inputmethod/mozc-server/patches/patch-WORKSPACE.bazel        Fri Dec 13 20:43:07 2024
@@ -1,8 +1,11 @@
-$NetBSD: patch-WORKSPACE.bazel,v 1.1 2024/02/10 01:17:27 ryoon Exp $
+$NetBSD: patch-WORKSPACE.bazel,v 1.1.6.1 2024/12/13 20:43:07 bsiegert Exp $
+
+Avoid fetching http_archive files as I dont know how to override
+them being downloaded during the build
 
 --- WORKSPACE.bazel.orig       2023-10-26 12:00:50.000000000 +0000
 +++ WORKSPACE.bazel
-@@ -118,7 +128,7 @@ new_local_repository(
+@@ -118,7 +118,7 @@ new_local_repository(
  # Qt for Linux
  pkg_config_repository(
    name = "qt_linux",
@@ -11,3 +14,29 @@ $NetBSD: patch-WORKSPACE.bazel,v 1.1 202
  )
  
  # Qt for macOS
+@@ -200,14 +200,14 @@ http_file(
+ )
+ 
+ # Zip code
+-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";,
+-)
+-
+-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";,
+-)
++#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";,
++#)
++
++#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";,
++#)

Added files:

Index: pkgsrc/inputmethod/mozc-server/patches/patch-dictionary_BUILD.bazel
diff -u /dev/null pkgsrc/inputmethod/mozc-server/patches/patch-dictionary_BUILD.bazel:1.1.2.2
--- /dev/null   Fri Dec 13 20:43:07 2024
+++ pkgsrc/inputmethod/mozc-server/patches/patch-dictionary_BUILD.bazel Fri Dec 13 20:43:07 2024
@@ -0,0 +1,29 @@
+$NetBSD: patch-dictionary_BUILD.bazel,v 1.1.2.2 2024/12/13 20:43:07 bsiegert Exp $
+
+Workaround to avoid fetching http_archive for KEN_ALL and JIGYOSYO files
+
+--- dictionary/BUILD.bazel.orig        2024-12-11 01:55:01.679344522 +0000
++++ dictionary/BUILD.bazel
+@@ -742,8 +742,8 @@ run_binary(
+     srcs = mozc_select(
+         default = [],
+         oss = [
+-            "@zip_code_ken_all//:KEN_ALL.CSV",
+-            "@zip_code_jigyosyo//:JIGYOSYO.CSV",
++            "KEN_ALL.CSV",
++            "JIGYOSYO.CSV",
+         ],
+     ),
+     outs = ["zip_code.tsv"],
+@@ -753,9 +753,9 @@ run_binary(
+     ] + mozc_select(
+         oss = [
+             "--zip_code",
+-            "$(location @zip_code_ken_all//:KEN_ALL.CSV)",
++            "$(location KEN_ALL.CSV)",
+             "--jigyosyo",
+-            "$(location @zip_code_jigyosyo//:JIGYOSYO.CSV)",
++            "$(location JIGYOSYO.CSV)",
+         ],
+         prod = [],
+     ),



Home | Main Index | Thread Index | Old Index