head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.14 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.12 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.10 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.8 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.6 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.4 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.2; locks; strict; comment @# @; 1.1 date 2024.12.11.03.07.20; author maya; state Exp; branches 1.1.2.1; next ; commitid 6ElBfQp6kDD7X1BF; 1.1.2.1 date 2024.12.11.03.07.20; author bsiegert; state dead; branches; next 1.1.2.2; commitid IiVRTq2JLFBXKnBF; 1.1.2.2 date 2024.12.13.20.43.07; author bsiegert; state Exp; branches; next ; commitid IiVRTq2JLFBXKnBF; desc @@ 1.1 log @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 @ text @$NetBSD$ 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 = [], ), @ 1.1.2.1 log @file patch-dictionary_BUILD.bazel was added on branch pkgsrc-2024Q3 on 2024-12-13 20:43:07 +0000 @ text @d1 29 @ 1.1.2.2 log @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... @ text @a0 29 $NetBSD: patch-dictionary_BUILD.bazel,v 1.1 2024/12/11 03:07:20 maya 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 = [], ), @