Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Apr 2026 21:06:37 +0000
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a0ecc03dddd6 - main - textproc/ibus-typing-booster: upgrade to 2.30.6
Message-ID:  <69d9665d.182f3.72e6870b@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a0ecc03dddd6e94f110e57fbd29bffa6691acbfb

commit a0ecc03dddd6e94f110e57fbd29bffa6691acbfb
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2026-04-10 20:37:49 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d9665d.182f3.72e6870b>