From nobody Mon May 4 01:47:33 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g84K150SFz6c92N for ; Mon, 04 May 2026 01:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g84K146fcz40Dj for ; Mon, 04 May 2026 01:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HSYypae+NBNA+JDkjsxxFfL1uOZnbsPr1Ih7eibVTA=; b=YUlpXxRRBAVxMyUSnq/MOpid/7r2Bn5v/OWwk9hXkFwden4BHAiigESM/eY/0xU5kUn0FE Ye3Icc8d2DiExIiNQLt5Jd+7Asn2SUW9NpEPeU6zwrowdgsiYLOCy3fDrG9S5zIdoKdoPX ouvHgxiSVPz26sxWbgM/VB957+CZLP3/a6J5B8bM388bvti0bZhDKiGVB7Qc3dm/SqH4bb m4EezBBljeQD+ePMTDf7FFVyAqTWh/l1h4zmqlOWAKrtIJwRckzfFfdq9D6gQjoNJ01as1 ND0Z4xQ8UqeOnSukv08N1j2HM5Mc1Evksw/SJILcufd5YvoQ/irL57DZNz4xUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777859253; a=rsa-sha256; cv=none; b=N+kBfQl2zABpubIZZ9LsQ2ewixTCa8UuFNFB3DXvakCmAderc9tra/YInHRI8Qnyb+ZdkB /AtkF5RKpJYLGkHssUzkzL+yrbx8caLJnHjQj/VMZ6slVKKXSd949PLOZtaKmgufl1xlJ5 1SaCMll5s1sxonSt/N6OiEQeb8iynITMW6crMpqr4PyeJdwJ+hVpfjDfK2PLSgGbUP6Vpe j+T9ZNRQNk90RxFpdj0rn8aH+H98i9kfENaXF/iMHxFvoJYTglrR/98KCgQxbhfKjxTtN6 gNuW5XxyvbpViBp3tv8z2xg2hY9NgKQZOX94Rw4OyBc7IV1eacDXotuEqotvVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HSYypae+NBNA+JDkjsxxFfL1uOZnbsPr1Ih7eibVTA=; b=fa0pgCOrlWmtlbh+ZbcC2kLbgoK9zZsuvsAzOmuSdhV1aSnz6Nn/K+VV6DOEfNA3wbfuWP Y6BaPNeYU8aoG8YufsNUMK2PDMVdIP6vTWN6x4TBRoZkIWozTRmud4lHhxShOVIAUoaBP8 8kqVMNJtwzRNSh0lnktsQqT2GRjGmAX2T+DZIYaneGTZlqlFXmn0A7f6krratays9lZ4hL DdCRb35lQ0B/j9NOwuDZsPIlJoqu6Fo3MUYQyeaeE2+B/28sHCrAxkBnbBTt/j1oq3vB6T H24McnIIGJK6WyfTfvPRSW4kJ6j/HacGz9bNJRs+GD3OgPvoSnDj3+Gzs4bMwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g84K13QczzyQT for ; Mon, 04 May 2026 01:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 01:47:33 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 3b9c03ffec18 - main - chinese/fcitx: Fix options GTK2 and GTK3, improve port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b9c03ffec18ae4118649e4c7c58010d5f1a18e1 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 01:47:33 +0000 Message-Id: <69f7fab5.3ba7b.4fac01fb@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b9c03ffec18ae4118649e4c7c58010d5f1a18e1 commit 3b9c03ffec18ae4118649e4c7c58010d5f1a18e1 Author: Vladimir Druzenko AuthorDate: 2026-05-04 01:33:32 +0000 Commit: Vladimir Druzenko CommitDate: 2026-05-04 01:33:32 +0000 chinese/fcitx: Fix options GTK2 and GTK3, improve port GTK2 and GTK3 options aren't working properly: even if disable GTK2, it gets re-enabled GTK2. Improve port: - Replace PORTVERSION with DISTVERSION. - Fix warnings from portclippy. - Set dependency from ecm as build. - Convert CMAKE_ARGS to CMAKE_ON and CMAKE_OFF. - Replace ".if ${PORT_OPTIONS:M***}" with new style options. - Remove unnecessary KDE_MAN_PREFIX - it have default value. - Remove description of Qt4 module from pkg-message. - Use DESKTOPDIR in pkg-message. PR: 294883 Approved by: lichray@gmail.com (maintainer) Sponsored by: UNIS Labs Co-authored-by: Ken DEGUCHI MFH: 2026Q2 --- chinese/fcitx/Makefile | 105 ++++++++++++++++--------------------- chinese/fcitx/files/pkg-message.in | 8 +-- 2 files changed, 45 insertions(+), 68 deletions(-) diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 766c88a118d1..081fe35f4094 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -1,6 +1,6 @@ PORTNAME= fcitx -PORTVERSION= 4.2.9.9 -PORTREVISION= 2 +DISTVERSION= 4.2.9.9 +PORTREVISION= 3 CATEGORIES= chinese x11 MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \ http://download.fcitx-im.org/data/:data @@ -34,83 +34,66 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ RUN_DEPENDS= xdg-open:devel/xdg-utils \ xkeyboard-config>=0:x11/xkeyboard-config -SUB_FILES= pkg-message -SUB_LIST+= PORTSDIR=${PORTSDIR} - -CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png - -USE_GNOME= pango intltool libxml2 introspection -USE_KDE= ecm -USE_XORG= x11 xext xkbfile sm ice -USE_LDCONFIG= yes USES= compiler:c++11-lang gnome tar:xz cmake:noninja desktop-file-utils \ gettext-tools:build,run gettext-runtime iconv:wchar_t \ kde:5 pkgconfig shared-mime-info compiler:c++14-lang xorg +USE_GNOME= intltool introspection libxml2 pango +USE_KDE= ecm:build +USE_LDCONFIG= yes +USE_XORG= ice sm x11 xext xkbfile -OPTIONS_DEFINE= GTK2 GTK3 OPENCC TPUNC DOCS -OPTIONS_DEFAULT=GTK2 GTK3 -OPTIONS_SUB= yes +CMAKE_ARGS= -DDATADIR=${DATADIR} \ + -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \ + -DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \ + -DPREFIX=${PREFIX} +CMAKE_ON= FORCE_ENCHANT +.if defined(WITH_DEBUG) +CMAKE_ON+= ENABLE_DEBUG +.endif +CMAKE_OFF= ENABLE_QT \ + ENABLE_QT_IM_MODULE \ + ENABLE_QT_GUI \ + ENABLE_XDGAUTOSTART \ + LIBICONV_LIBC_HAS_ICONV_OPEN \ -GTK2_DESC= Enable Gtk2 IM module -GTK2_USE= GNOME=gtk20 -GTK2_CMAKE_ON= -DENABLE_GTK2_IM_MODULE=ON +CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png -GTK3_DESC= Enable Gtk3 IM module -GTK3_USE= GNOME=gtk30 -GTK3_CMAKE_ON= -DENABLE_GTK3_IM_MODULE=ON +SUB_FILES= pkg-message +SUB_LIST= DESKTOPDIR=${DESKTOPDIR} +OPTIONS_DEFINE= DOCS GTK2 GTK3 OPENCC TPUNC +OPTIONS_DEFAULT= GTK2 GTK3 +OPTIONS_SUB= yes + +GTK2_DESC= Enable Gtk2 IM module +GTK3_DESC= Enable Gtk3 IM module OPENCC_DESC= Enable OpenCC for Chinese Transform TPUNC_DESC= Use traditional quotation marks -.include - -KDE_MAN_PREFIX= ${PREFIX}/share/man -CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \ - -DLIBICONV_LIBC_HAS_ICONV_OPEN=OFF \ - -DDATADIR=${DATADIR} \ - -DDOCSDIR=${DOCSDIR} \ - -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \ - -DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \ - -DPREFIX=${PREFIX} \ - -DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF - -.if ${PORT_OPTIONS:MGTK2} -SUB_LIST+= GTK2_IM=fcitx -.else -SUB_LIST+= GTK2_IM=xim -.endif +GTK2_USE= GNOME=gtk20 +GTK2_CMAKE_BOOL= ENABLE_GTK2_IM_MODULE +GTK2_VARS= SUB_LIST+=GTK2_IM=fcitx +GTK2_VARS_OFF= SUB_LIST+=GTK2_IM=xim -.if ${PORT_OPTIONS:MGTK3} -PLIST_SUB+= GTK3="" -SUB_LIST+= GTK3_IM=fcitx -.else -PLIST_SUB+= GTK3="@comment " -SUB_LIST+= GTK3_IM=xim -.endif +GTK3_USE= GNOME=gtk30 +GTK3_CMAKE_BOOL= ENABLE_GTK3_IM_MODULE +GTK3_VARS= SUB_LIST+=GTK3_IM=fcitx +GTK3_VARS_OFF= SUB_LIST+=GTK3_IM=xim -.if ${PORT_OPTIONS:MOPENCC} -LIB_DEPENDS+= libopencc.so:chinese/opencc -.else -CMAKE_ARGS+= -DENABLE_OPENCC=OFF -.endif +OPENCC_LIB_DEPENDS= libopencc.so:chinese/opencc +OPENCC_CMAKE_BOOL= ENABLE_OPENCC -.if ${PORT_OPTIONS:MTPUNC} -EXTRA_PATCHES+= ${FILESDIR}/tpunc-data_punc.mb.zh_CN -.endif - -.if defined(WITH_DEBUG) -CMAKE_ARGS+= -DENABLE_DEBUG=ON -.endif +TPUNC_EXTRA_PATCHES= ${PATCHDIR}/tpunc-data_punc.mb.zh_CN _DICT_VER= 20121020 _PYSTROKE_VER= 20121124 _PYTABLE_VER= 20121124 post-patch: - @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict/. - @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data/. - @${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. - @${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/. - @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/. + @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict/ + @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data/ + @${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/ + @${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/ + @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/ .include diff --git a/chinese/fcitx/files/pkg-message.in b/chinese/fcitx/files/pkg-message.in index 645a4af9f80b..a21c8076dded 100644 --- a/chinese/fcitx/files/pkg-message.in +++ b/chinese/fcitx/files/pkg-message.in @@ -13,15 +13,9 @@ For GTK+ programs, you may want to set: sh/bash: export GTK_IM_MODULE=%%GTK2_IM%% export GTK3_IM_MODULE=%%GTK3_IM%% -For Qt4 programs, we recommend you to use - - qtconfig-qt4: %%PORTSDIR%%/misc/qt4-qtconfig - -instead of to manually set QT4_IM_MODULE. - To start fcitx with your desktop, just - cp %%PREFIX%%/share/applications/fcitx.desktop \ + cp %%DESKTOPDIR%%/fcitx.desktop \ ~/.config/autostart/ EOM }