Thu Jan 11 16:45:40 2024 UTC (132d)
Pullup ticket #6831 - requested by ryoon
inputmethod/mozc-server: build fix

Revisions pulled up:
- inputmethod/ibus-mozc/Makefile                                1.91
- inputmethod/mozc-elisp/Makefile                               1.81
- inputmethod/mozc-renderer/Makefile                            1.72
- inputmethod/mozc-server/Makefile                              1.89
- inputmethod/mozc-server/Makefile.common                       1.39-1.40
- inputmethod/mozc-tool/Makefile                                1.86
- inputmethod/uim-mozc/Makefile                                 1.72

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Mon Jan  1 11:53:13 UTC 2024

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

   Log Message:
   mozc-server: Fix build failure

   * Use internal protobuf and abseil.

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Mon Jan  1 16:05:23 UTC 2024

   Modified Files:
   	pkgsrc/inputmethod/ibus-mozc: Makefile
   	pkgsrc/inputmethod/mozc-elisp: Makefile
   	pkgsrc/inputmethod/mozc-renderer: Makefile
   	pkgsrc/inputmethod/mozc-server: Makefile Makefile.common
   	pkgsrc/inputmethod/mozc-tool: Makefile
   	pkgsrc/inputmethod/uim-mozc: Makefile

   Log Message:
   mozc-*, ibus-mozc, uim-mozc: Remove unused protobuf dependency

   * Bump PKGREVISION.


(bsiegert)
diff -r1.90 -r1.90.2.1 pkgsrc/inputmethod/ibus-mozc/Makefile
diff -r1.80 -r1.80.2.1 pkgsrc/inputmethod/mozc-elisp/Makefile
diff -r1.71 -r1.71.2.1 pkgsrc/inputmethod/mozc-renderer/Makefile
diff -r1.88 -r1.88.2.1 pkgsrc/inputmethod/mozc-server/Makefile
diff -r1.38 -r1.38.4.1 pkgsrc/inputmethod/mozc-server/Makefile.common
diff -r1.85 -r1.85.2.1 pkgsrc/inputmethod/mozc-tool/Makefile
diff -r1.71 -r1.71.2.1 pkgsrc/inputmethod/uim-mozc/Makefile
cvs diff -r1.90 -r1.90.2.1 pkgsrc/inputmethod/ibus-mozc/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-mozc/Makefile 2023/11/15 18:14:43 1.90
+++ pkgsrc/inputmethod/ibus-mozc/Makefile 2024/01/11 16:45:39 1.90.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.90 2023/11/15 18:14:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.90.2.1 2024/01/11 16:45:39 bsiegert Exp $
2 2
3PKGNAME= ibus-${DISTNAME} 3PKGNAME= ibus-${DISTNAME}
4PKGREVISION= 24 4PKGREVISION= 25
5 5
6INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \ 6INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \
7 share/ibus-mozc 7 share/ibus-mozc
8 8
9DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 9DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
10DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer 10DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
12DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool 12DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
13 13
14pre-configure: 14pre-configure:
15 ${RM} ${WRKSRC}/unix/uim/uim.gyp 15 ${RM} ${WRKSRC}/unix/uim/uim.gyp
16 16
17do-build: 17do-build:
cvs diff -r1.80 -r1.80.2.1 pkgsrc/inputmethod/mozc-elisp/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-elisp/Makefile 2023/11/15 18:14:43 1.80
+++ pkgsrc/inputmethod/mozc-elisp/Makefile 2024/01/11 16:45:39 1.80.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.80 2023/11/15 18:14:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.80.2.1 2024/01/11 16:45:39 bsiegert Exp $
2 2
3PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/} 3PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
4PKGREVISION= 25 4PKGREVISION= 26
5CATEGORIES= inputmethod editors 5CATEGORIES= inputmethod editors
6 6
7EMACS_MODULES= base leim 7EMACS_MODULES= base leim
8 8
9.include "../../editors/emacs/modules.mk" 9.include "../../editors/emacs/modules.mk"
10 10
11INSTALLATION_DIRS= ${EMACS_LISPPREFIX} bin 11INSTALLATION_DIRS= ${EMACS_LISPPREFIX} bin
12 12
13pre-configure: 13pre-configure:
14 ${RM} ${WRKSRC}/unix/uim/uim.gyp 14 ${RM} ${WRKSRC}/unix/uim/uim.gyp
15 15
16do-build: 16do-build:
17 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 17 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
cvs diff -r1.71 -r1.71.2.1 pkgsrc/inputmethod/mozc-renderer/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-renderer/Makefile 2023/11/15 18:14:43 1.71
+++ pkgsrc/inputmethod/mozc-renderer/Makefile 2024/01/11 16:45:40 1.71.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.71 2023/11/15 18:14:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.71.2.1 2024/01/11 16:45:40 bsiegert Exp $
2 2
3PKGNAME= ${DISTNAME:S/mozc-/mozc-renderer-/} 3PKGNAME= ${DISTNAME:S/mozc-/mozc-renderer-/}
4PKGREVISION= 24 4PKGREVISION= 25
5 5
6CONFLICTS+= ibus-mozc<=1.13.1651.102 6CONFLICTS+= ibus-mozc<=1.13.1651.102
7 7
8INSTALLATION_DIRS+= libexec share/icons 8INSTALLATION_DIRS+= libexec share/icons
9 9
10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
12 12
13pre-configure: 13pre-configure:
14 ${RM} ${WRKSRC}/unix/uim/uim.gyp 14 ${RM} ${WRKSRC}/unix/uim/uim.gyp
15 15
16do-build: 16do-build:
17 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 17 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
cvs diff -r1.88 -r1.88.2.1 pkgsrc/inputmethod/mozc-server/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-server/Makefile 2023/11/15 18:14:43 1.88
+++ pkgsrc/inputmethod/mozc-server/Makefile 2024/01/11 16:45:40 1.88.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.88 2023/11/15 18:14:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.88.2.1 2024/01/11 16:45:40 bsiegert Exp $
2 2
3PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/} 3PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/}
4PKGREVISION= 24 4PKGREVISION= 25
5 5
6INSTALLATION_DIRS+= libexec 6INSTALLATION_DIRS+= libexec
7 7
8pre-configure: 8pre-configure:
9 ${RM} ${WRKSRC}/unix/uim/uim.gyp 9 ${RM} ${WRKSRC}/unix/uim/uim.gyp
10 10
11do-build: 11do-build:
12 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 12 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
13 ${PYTHONBIN} build_mozc.py build \ 13 ${PYTHONBIN} build_mozc.py build \
14 -c ${MOZC_BUILD_MODE} \ 14 -c ${MOZC_BUILD_MODE} \
15 dictionary/dictionary_base.gyp:text_dictionary_loader \ 15 dictionary/dictionary_base.gyp:text_dictionary_loader \
16 server/server.gyp:mozc_server 16 server/server.gyp:mozc_server
17 17
cvs diff -r1.38 -r1.38.4.1 pkgsrc/inputmethod/mozc-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-server/Makefile.common 2023/07/18 18:22:11 1.38
+++ pkgsrc/inputmethod/mozc-server/Makefile.common 2024/01/11 16:45:40 1.38.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.38 2023/07/18 18:22:11 nia Exp $ 1# $NetBSD: Makefile.common,v 1.38.4.1 2024/01/11 16:45:40 bsiegert Exp $
2 2
3# used by inputmethod/ibus-mozc/Makefile 3# used by inputmethod/ibus-mozc/Makefile
4# used by inputmethod/mozc-elisp/Makefile 4# used by inputmethod/mozc-elisp/Makefile
5# used by inputmethod/mozc-server/Makefile 5# used by inputmethod/mozc-server/Makefile
6# used by inputmethod/mozc-tool/Makefile 6# used by inputmethod/mozc-tool/Makefile
7# used by inputmethod/mozc-renderer/Makefile 7# used by inputmethod/mozc-renderer/Makefile
8# used by inputmethod/uim-mozc/Makefile 8# used by inputmethod/uim-mozc/Makefile
9 9
10DISTNAME= mozc-2.26.4282.100 10DISTNAME= mozc-2.26.4282.100
11CATEGORIES= inputmethod 11CATEGORIES= inputmethod
12MASTER_SITES= ${MASTER_SITE_LOCAL} 12MASTER_SITES= ${MASTER_SITE_LOCAL}
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
@@ -68,29 +68,28 @@ OSDEST.NetBSD= bsd @@ -68,29 +68,28 @@ OSDEST.NetBSD= bsd
68 68
69MOZC_BUILD_MODE= Release # or Debug 69MOZC_BUILD_MODE= Release # or Debug
70 70
71# In file included from src/dictionary/system/system_dictionary.h:43:0, 71# In file included from src/dictionary/system/system_dictionary.h:43:0,
72# from ../../dictionary/system/system_dictionary.cc:47: 72# from ../../dictionary/system/system_dictionary.cc:47:
73# src/dictionary/system/key_expansion_table.h: In member function 'const mozc::dictionary::ExpandedKey mozc::dictionary::KeyExpansionTable::ExpandKey(char) const': 73# src/dictionary/system/key_expansion_table.h: In member function 'const mozc::dictionary::ExpandedKey mozc::dictionary::KeyExpansionTable::ExpandKey(char) const':
74# src/dictionary/system/key_expansion_table.h:83:34: error: array subscript has type 'char' [-Werror=char-subscripts] 74# src/dictionary/system/key_expansion_table.h:83:34: error: array subscript has type 'char' [-Werror=char-subscripts]
75# return ExpandedKey(table_[key]); 75# return ExpandedKey(table_[key]);
76# Maybe fix this later. 76# Maybe fix this later.
77BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts 77BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts
78 78
79do-configure: 79do-configure:
80 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 80 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
81 GYP_DEFINES="use_libprotobuf=1" \ 
82 ${PYTHONBIN} build_mozc.py \ 81 ${PYTHONBIN} build_mozc.py \
83 gyp \ 82 gyp \
84 --gypdir=${LOCALBASE}/bin 83 --gypdir=${LOCALBASE}/bin
85 84
86.include "../../devel/glib2/buildlink3.mk" 85.include "../../devel/glib2/buildlink3.mk"
87.include "../../devel/protobuf/buildlink3.mk" 86#.include "../../devel/protobuf/buildlink3.mk"
88# gmock is not used yet... 87# gmock is not used yet...
89#.include "../../devel/gmock/buildlink3.mk" 88#.include "../../devel/gmock/buildlink3.mk"
90.include "../../inputmethod/zinnia/buildlink3.mk" 89.include "../../inputmethod/zinnia/buildlink3.mk"
91.include "../../www/curl/buildlink3.mk" 90.include "../../www/curl/buildlink3.mk"
92.include "../../x11/gtk2/buildlink3.mk" 91.include "../../x11/gtk2/buildlink3.mk"
93.include "../../x11/qt5-qtbase/buildlink3.mk" 92.include "../../x11/qt5-qtbase/buildlink3.mk"
94 93
95.include "../../lang/python/tool.mk" 94.include "../../lang/python/tool.mk"
96.include "../../mk/atomic64.mk" 95.include "../../mk/atomic64.mk"
cvs diff -r1.85 -r1.85.2.1 pkgsrc/inputmethod/mozc-tool/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-tool/Makefile 2023/11/15 18:14:43 1.85
+++ pkgsrc/inputmethod/mozc-tool/Makefile 2024/01/11 16:45:40 1.85.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.85 2023/11/15 18:14:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.85.2.1 2024/01/11 16:45:40 bsiegert Exp $
2 2
3PKGNAME= ${DISTNAME:S/mozc-/mozc-tool-/} 3PKGNAME= ${DISTNAME:S/mozc-/mozc-tool-/}
4PKGREVISION= 24 4PKGREVISION= 25
5 5
6INSTALLATION_DIRS+= libexec 6INSTALLATION_DIRS+= libexec
7 7
8ALL_ENV+= qt_dir=${QTDIR} 8ALL_ENV+= qt_dir=${QTDIR}
9 9
10pre-configure: 10pre-configure:
11 ${RM} ${WRKSRC}/unix/uim/uim.gyp 11 ${RM} ${WRKSRC}/unix/uim/uim.gyp
12 12
13do-build: 13do-build:
14 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 14 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
15 ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \ 15 ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
16 gui/gui.gyp:mozc_tool 16 gui/gui.gyp:mozc_tool
17 17
cvs diff -r1.71 -r1.71.2.1 pkgsrc/inputmethod/uim-mozc/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim-mozc/Makefile 2023/11/15 18:14:43 1.71
+++ pkgsrc/inputmethod/uim-mozc/Makefile 2024/01/11 16:45:40 1.71.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.71 2023/11/15 18:14:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.71.2.1 2024/01/11 16:45:40 bsiegert Exp $
2 2
3PKGNAME= uim-${DISTNAME} 3PKGNAME= uim-${DISTNAME}
4PKGREVISION= 23 4PKGREVISION= 24
5 5
6CONFLICTS+= ibus-mozc<=1.13.1651.102 6CONFLICTS+= ibus-mozc<=1.13.1651.102
7 7
8INSTALLATION_DIRS+= lib/uim/plugin share/uim/pixmaps 8INSTALLATION_DIRS+= lib/uim/plugin share/uim/pixmaps
9 9
10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 10DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
11DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer 11DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
12DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 12DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
13DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool 13DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
14 14
15SUBST_CLASSES+= mozc_tool 15SUBST_CLASSES+= mozc_tool
16SUBST_STAGE.mozc_tool= pre-configure 16SUBST_STAGE.mozc_tool= pre-configure
17SUBST_MESSAGE.mozc_tool= Fixing mozc_tool path 17SUBST_MESSAGE.mozc_tool= Fixing mozc_tool path