From nobody Fri Apr 10 21:06:37 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 4fsq9V2bcGz6YPpM for ; Fri, 10 Apr 2026 21:06:38 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fsq9T6NQCz3K9V for ; Fri, 10 Apr 2026 21:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775855197; 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=1yO92YPWAVs02ZDIynefiARYIOSAwbRTXk9VnZ2rh7s=; b=yfnRY7XmjBfOwWXvDCuiOJSiRJ19qDro1htfBJLtxikThfDzi44V99oIEu9QhqtOC68Qwt okdNvpDLlgFjZAZqW4iFFcv34LX4Q4NJkQ6OnL9wmPcrpmLftThkhpH4RCTar9CNBLsGbf MJe5NjZ5S2h8DXi5teSZlzEIjh1GMXzXVpQHuLFsi8efrFTQzpJE4HfeXZrlcrM2dXAkff Tgi1EUeiTzr7MEK7HaX1Bl+xFgZFcahRz2n44h1vuqA1U4itvOvC34hAXp5p9saxLni6tT QhaqxX9ab02/PeIBgAlD+vaYmRvsEJS7Rvq6A33xGNEBrdrdTXwovDXAcd7Arg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775855197; a=rsa-sha256; cv=none; b=ffx0COGzmz6plLYGjpLZDs08aogP7OYCP+fm02j7+La3WM6hxz/LBAXXwZ7JRewjQYpf6X k9kTL40ZRTTB/EcfSAFNHCubBOU/BIwzteBxz1xehSDolVmuSaBvWVeNqXhKWAm/dFxTia ygcW2SS+xFGwwkL7GLNEwKid05FST7KjndALMJYwGt8zQjYxDVbXt1rXvIi8iW5YMqrDp1 NOHi/mLZVJ18GRYdtmWpH3grhBDhndnPgreWpVTX7DoY+R19ck5cnJDC16jZsgbsoM617X OovG7UuNmDWnSrFnEC7PwZ2EJvdTs7qiSBO3OdgWD1riwVPpgihinlf7YG7CAQ== 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=1775855197; 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=1yO92YPWAVs02ZDIynefiARYIOSAwbRTXk9VnZ2rh7s=; b=h5Ic5QMX2GS9ST+ycJZc9PylJNcq3r18IamupnWqlCzwjfN1YqWz3aIsbBaWJKE78Ke5q8 EcrKcBX9i7spZM4MN7dBjSNUJ58d4UacF6j+uQIuuYMasM2rRcc+5S2CYK71LClWBu1W61 CfmZlHrPQcAclVSSm+IHF88MfEni8bQP0WpiqthQsI7L7fyKmYjtPQZ8dwYIVwYA8+E6lo Vomd4GUzWTB3s2HrsDlPaszJ+JWGYYIvd6pz5PKMoMR7j9RLO2gUre9QsTHz+xsIcAH0C2 Q48Gvfd3v1ijT78iFQrmbFUy9QL1GBeQ57iPh+8scCsr4Oc0PAL1El9LQ36aww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsq9T5wz6z115b for ; Fri, 10 Apr 2026 21:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 182f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 21:06:37 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: a0ecc03dddd6 - main - textproc/ibus-typing-booster: upgrade to 2.30.6 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0ecc03dddd6e94f110e57fbd29bffa6691acbfb Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 21:06:37 +0000 Message-Id: <69d9665d.182f3.72e6870b@gitrepo.freebsd.org> The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0ecc03dddd6e94f110e57fbd29bffa6691acbfb commit a0ecc03dddd6e94f110e57fbd29bffa6691acbfb Author: Thierry Thomas AuthorDate: 2026-04-10 20:37:49 +0000 Commit: Thierry Thomas CommitDate: 2026-04-10 21:06:26 +0000 textproc/ibus-typing-booster: upgrade to 2.30.6 Release notes at https://github.com/mike-fabian/ibus-typing-booster/releases/tag/2.30.6 --- textproc/ibus-typing-booster/Makefile | 19 ++++++------------- textproc/ibus-typing-booster/distinfo | 6 +++--- .../files/patch-engine_itb__emoji.py | 10 ++++++++++ ...atch-setup_ibus-setup-typing-booster.desktop.in.in | 11 ++++------- textproc/ibus-typing-booster/pkg-plist | 9 ++++++--- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile index 6727258ffb9d..7523c7bb4f62 100644 --- a/textproc/ibus-typing-booster/Makefile +++ b/textproc/ibus-typing-booster/Makefile @@ -1,6 +1,5 @@ PORTNAME= ibus-typing-booster -PORTVERSION= 2.30.4 -PORTREVISION= 1 +PORTVERSION= 2.30.6 CATEGORIES= textproc MAINTAINER= thierry@FreeBSD.org @@ -39,6 +38,7 @@ GH_ACCOUNT= mike-fabian USES= autoreconf desktop-file-utils gettext gmake gnome iconv pathfix \ pkgconfig python shebangfix +BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= engine/emoji-picker.in engine/ibus-engine-typing-booster.in \ setup/ibus-setup-typing-booster.in SHEBANG_LANG= sh @@ -54,18 +54,17 @@ GLIB_SCHEMAS= org.freedesktop.ibus.engine.typing-booster.gschema.xml TEST_TARGET= check TEST_ENV= ${MAKE_ENV} \ IBUS_TYPING_BOOSTER_DEBUG_LEVEL=1 -TESTING_UNSAFE= yes +TESTING_UNSAFE= yes # See https://github.com/mike-fabian/ibus-typing-booster/issues/38 OPTIONS_DEFINE= HUNSPELL OPTIONS_DEFAULT=HUNSPELL HUNSPELL_RUN_DEPENDS= hunspell:textproc/hunspell -SPELL2FIX= engine/itb_util.py setup/user_transliteration.py +SPELL2FIX= setup/user_transliteration.py engine/itb_util_core.py SHR2FIX= engine/itb_sound.py ${GLIB_SCHEMAS} XML2FIX= org.freedesktop.ibus.engine.typing_booster.metainfo.xml.in \ org.freedesktop.ibus.engine.typing_booster.emoji_picker.metainfo.xml.in -X11LOC2FIX= engine/itb_util.py tests/test_compose_sequences.py tests/test_itb.py COMP2DEL= engine/Makefile setup/Makefile pre-configure: @@ -73,8 +72,6 @@ pre-configure: ${REINPLACE_CMD} -e 's|/usr/share/myspell|${LOCALBASE}/share/hunspell|' \ ${WRKSRC}/${f} .endfor - ${FIND} ${WRKSRC} -name "*.py" | ${XARGS} \ - ${REINPLACE_CMD} -e 's|/usr/bin/python3| ${PYTHON_CMD}|' .for f in ${XML2FIX} ${REINPLACE_CMD} -e 's|/usr/libexec|${PREFIX}/libexec|' ${WRKSRC}/${f} .endfor @@ -82,12 +79,8 @@ pre-configure: ${REINPLACE_CMD} -e 's|/usr/share/ibus-typing-booster|${DATADIR}|' \ -e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/${f} .endfor - ${REINPLACE_CMD} -e 's|/usr/share/unicode|${LOCALBASE}/share/unicode|' \ - ${WRKSRC}/engine/itb_emoji.py -.for f in ${X11LOC2FIX} - ${REINPLACE_CMD} -e 's|/usr/share/X11/locale|${LOCALBASE}/lib/X11/locale|' \ - ${WRKSRC}/${f} -.endfor + ${FIND} ${WRKSRC} -type f | ${XARGS} \ + ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' post-configure: .for f in ${COMP2DEL} diff --git a/textproc/ibus-typing-booster/distinfo b/textproc/ibus-typing-booster/distinfo index 1da936e79fc1..7e435a13f4e5 100644 --- a/textproc/ibus-typing-booster/distinfo +++ b/textproc/ibus-typing-booster/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1771346209 -SHA256 (mike-fabian-ibus-typing-booster-2.30.4_GH0.tar.gz) = f04ed9da726fa83d80b6f4a9fceda57205614a40006f25443c1741f206f560f5 -SIZE (mike-fabian-ibus-typing-booster-2.30.4_GH0.tar.gz) = 14457157 +TIMESTAMP = 1775850758 +SHA256 (mike-fabian-ibus-typing-booster-2.30.6_GH0.tar.gz) = 0110d5e92e2bd911d604e20142aa9449cc7900da70705f1b3440243088d2db35 +SIZE (mike-fabian-ibus-typing-booster-2.30.6_GH0.tar.gz) = 14461633 diff --git a/textproc/ibus-typing-booster/files/patch-engine_itb__emoji.py b/textproc/ibus-typing-booster/files/patch-engine_itb__emoji.py new file mode 100644 index 000000000000..6925860e0b02 --- /dev/null +++ b/textproc/ibus-typing-booster/files/patch-engine_itb__emoji.py @@ -0,0 +1,10 @@ +--- engine/itb_emoji.py.orig 2026-04-07 17:03:26 UTC ++++ engine/itb_emoji.py +@@ -126,6 +126,7 @@ CLDR_ANNOTATION_DIRNAMES = ( + # .xml files here in the subdirs “annotations” + # and “annotationsDerived”: + '/usr/share/unicode/cldr/common/', ++ '/usr/share/unicode/cldr/common/main/', + '/local/mfabian/src/cldr/common/') + + UNICODE_CATEGORIES = { diff --git a/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in b/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in index 2198095280c6..09d6099ad413 100644 --- a/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in +++ b/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in @@ -1,10 +1,7 @@ ---- setup/ibus-setup-typing-booster.desktop.in.in.orig 2025-05-21 16:18:59 UTC +--- setup/ibus-setup-typing-booster.desktop.in.in.orig 2026-04-07 17:03:26 UTC +++ setup/ibus-setup-typing-booster.desktop.in.in -@@ -5,4 +5,5 @@ Type=Application - Icon=ibus-typing-booster - NoDisplay=true +@@ -7,3 +7,4 @@ Categories=Settings; Type=Application --StartupNotify=true -\ No newline at end of file -+StartupNotify=true + StartupNotify=true + Categories=Settings; +Categories=Settings; diff --git a/textproc/ibus-typing-booster/pkg-plist b/textproc/ibus-typing-booster/pkg-plist index 8bddd78ea27f..917896f86b21 100644 --- a/textproc/ibus-typing-booster/pkg-plist +++ b/textproc/ibus-typing-booster/pkg-plist @@ -384,8 +384,10 @@ share/applications/ibus-setup-typing-booster.desktop %%DATADIR%%/engine/__pycache__/itb_pango%%PYTHON_TAG%%.pyc %%DATADIR%%/engine/__pycache__/itb_sound%%PYTHON_TAG%%.opt-1.pyc %%DATADIR%%/engine/__pycache__/itb_sound%%PYTHON_TAG%%.pyc -%%DATADIR%%/engine/__pycache__/itb_util%%PYTHON_TAG%%.opt-1.pyc -%%DATADIR%%/engine/__pycache__/itb_util%%PYTHON_TAG%%.pyc +%%DATADIR%%/engine/__pycache__/itb_util_core%%PYTHON_TAG%%.opt-1.pyc +%%DATADIR%%/engine/__pycache__/itb_util_core%%PYTHON_TAG%%.pyc +%%DATADIR%%/engine/__pycache__/itb_util_gui%%PYTHON_TAG%%.opt-1.pyc +%%DATADIR%%/engine/__pycache__/itb_util_gui%%PYTHON_TAG%%.pyc %%DATADIR%%/engine/__pycache__/itb_version%%PYTHON_TAG%%.opt-1.pyc %%DATADIR%%/engine/__pycache__/itb_version%%PYTHON_TAG%%.pyc %%DATADIR%%/engine/__pycache__/m17n_translit%%PYTHON_TAG%%.opt-1.pyc @@ -411,7 +413,8 @@ share/applications/ibus-setup-typing-booster.desktop %%DATADIR%%/engine/itb_ollama.py %%DATADIR%%/engine/itb_pango.py %%DATADIR%%/engine/itb_sound.py -%%DATADIR%%/engine/itb_util.py +%%DATADIR%%/engine/itb_util_core.py +%%DATADIR%%/engine/itb_util_gui.py %%DATADIR%%/engine/itb_version.py %%DATADIR%%/engine/m17n_translit.py %%DATADIR%%/engine/main.py