git: 9a8011cba31c - main - textproc/ibus: Update to 1.5.32
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Jun 2025 03:38:40 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9a8011cba31c803297cdaea51ae2a51f8f24478a
commit 9a8011cba31c803297cdaea51ae2a51f8f24478a
Author: Henry Hu <henry.hu.sh@gmail.com>
AuthorDate: 2025-06-10 18:40:57 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2025-06-11 03:38:24 +0000
textproc/ibus: Update to 1.5.32
GTK3 option depends on vala because should re-generate the *.c source
files in this case
(see https://github.com/ibus/ibus/issues/2767#issuecomment-2953520818).
Pet portlint, portfmt, portclippy.
Changelog: https://github.com/ibus/ibus/releases/tag/1.5.32
PR: 286158
Reported by: Olivier Duchateau <duchateau.olivier@gmail.com>
Approved by: submitter is maintainer
---
textproc/ibus/Makefile | 134 +++++++++++++++++++++++++-----------------------
textproc/ibus/distinfo | 6 +--
textproc/ibus/pkg-plist | 13 ++++-
3 files changed, 85 insertions(+), 68 deletions(-)
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index a8bb8912470d..047f69b612f4 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ibus
-DISTVERSION= 1.5.31
-PORTREVISION= 1
+DISTVERSION= 1.5.32
CATEGORIES= textproc
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
@@ -11,92 +10,95 @@ WWW= https://github.com/ibus/ibus
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
- ${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \
- iso-codes>0:misc/iso-codes \
- bash:shells/bash
+BUILD_DEPENDS= ${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \
+ ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+ bash:shells/bash \
+ iso-codes>0:misc/iso-codes
LIB_DEPENDS= libdbus-1.so:devel/dbus
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
iso-codes>0:misc/iso-codes \
setxkbmap:x11/setxkbmap
-USES= compiler cpe gmake gnome libtool localbase pathfix \
- pkgconfig python shebangfix xorg
+USES= compiler cpe gmake gnome libtool localbase pathfix pkgconfig \
+ python shebangfix xorg
CPE_VENDOR= ibus_project
USE_GNOME= glib20 pygobject3
USE_LDCONFIG= yes
USE_PYTHON= py3kplist
+USE_XORG= x11 xfixes xi xtst
SHEBANG_GLOB= *.sh
-USE_XORG= x11 xi xfixes xtst
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
- --with-ucd-dir=${LOCALBASE}/share/unicode/ucd \
- --disable-python2 --disable-python-library \
- --disable-systemd --disable-systemd-services \
- --disable-install-tests
+CONFIGURE_ARGS= --disable-install-tests \
+ --disable-python2 \
+ --disable-systemd-services \
+ --with-html-dir=${PREFIX}/share/doc \
+ --with-ucd-dir=${LOCALBASE}/share/unicode/ucd
INSTALL_TARGET= install-strip
TEST_TARGET= check
TEST_WRKSRC= ${WRKSRC}/src/tests
-OPTIONS_DEFINE= APPINDICATOR ENGINE VAPI GTK2 GTK3 GTK4 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND
-OPTIONS_DEFAULT= APPINDICATOR GTK3 GTK4 VAPI GINTRO DCONF XIM ENGINE EMOJI WAYLAND
+OPTIONS_DEFINE= APPINDICATOR DCONF DOCS EMOJI ENGINE GINTRO GTK2 GTK3 \
+ GTK4 NLS VAPI WAYLAND XIM
+OPTIONS_DEFAULT= APPINDICATOR DCONF EMOJI ENGINE GINTRO GTK3 GTK4 VAPI \
+ WAYLAND XIM
NO_OPTIONS_SORT= yes
-WAYLAND_IMPLIES= GTK3 GTK4
-OPTIONS_SUB= yes
+OPTIONS_SUB= yes
APPINDICATOR_DESC= Enable appindicator support
-DCONF_DESC= Use dconf for configuration
-EMOJI_DESC= Install emoji dictionary
-ENGINE_DESC= Install ibus simple engine
-GINTRO_DESC= Install GObject Introspection data
-GTK2_DESC= Install GTK2 input method client
-GTK3_DESC= Install GTK3 input method client
-GTK4_DESC= Install GTK4 input method client
-WAYLAND_DESC= Enable Wayland support
-XIM_DESC= Install XIM server
+DCONF_DESC= Use dconf for configuration
+EMOJI_DESC= Install emoji dictionary
+ENGINE_DESC= Install ibus simple engine
+GINTRO_DESC= Install GObject Introspection data
+GTK2_DESC= Install GTK2 input method client
+GTK3_DESC= Install GTK3 input method client
+GTK4_DESC= Install GTK4 input method client
+WAYLAND_DESC= Enable Wayland support
+XIM_DESC= Install XIM server
-APPINDICATOR_CONFIGURE_ENABLE= appindicator
-APPINDICATOR_IMPLIES= GTK3
+APPINDICATOR_IMPLIES= GTK3
APPINDICATOR_LIB_DEPENDS= libdbusmenu-glib.so:devel/libdbusmenu
-DCONF_USE= GNOME=dconf
-DCONF_CONFIGURE_ENABLE= dconf
-DCONF_VARS= GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
-DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc
-DOCS_CONFIGURE_ENABLE= gtk-doc-html
-EMOJI_BUILD_DEPENDS= json-glib>=0:devel/json-glib \
- unicode-emoji>0:misc/unicode-emoji \
- cldr-emoji-annotation>0:misc/cldr-emoji-annotation
-EMOJI_CONFIGURE_ON= --with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji \
- --with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations
-EMOJI_CONFIGURE_ENABLE= emoji-dict
+APPINDICATOR_CONFIGURE_ENABLE= appindicator
+DCONF_USE= GNOME=dconf
+DCONF_CONFIGURE_ENABLE= dconf
+DCONF_VARS= GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
+DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc
+DOCS_CONFIGURE_ENABLE= gtk-doc-html
+EMOJI_BUILD_DEPENDS= cldr-emoji-annotation>0:misc/cldr-emoji-annotation \
+ json-glib>=0:devel/json-glib \
+ unicode-emoji>0:misc/unicode-emoji
+EMOJI_CONFIGURE_ON= --with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations \
+ --with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji
+EMOJI_CONFIGURE_ENABLE= emoji-dict
ENGINE_CONFIGURE_ENABLE= engine
-GINTRO_USE= GNOME=introspection
+GINTRO_USE= GNOME=introspection
GINTRO_CONFIGURE_ENABLE= introspection
-GTK2_USE= GNOME=cairo,gtk20
-GTK2_CONFIGURE_ENABLE= gtk2
-GTK3_LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libnotify.so:devel/libnotify
-GTK3_USE= GNOME=cairo,gtk30,pango
-GTK3_CONFIGURE_ENABLE= gtk3 libnotify
-GTK3_LIBS= -lX11
-GTK3_IMPLIES= WAYLAND
-GTK4_USE= GNOME=cairo,gtk40
-GTK4_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
- libgraphene-1.0.so:graphics/graphene
-GTK4_CONFIGURE_ENABLE= gtk4
-GTK4_IMPLIES= WAYLAND
-NLS_USES= gettext
-NLS_USES_OFF= gettext-tools
-NLS_CONFIGURE_ENABLE= nls
-VAPI_IMPLIES= GINTRO
-VAPI_USES= vala:build
-VAPI_CONFIGURE_ENABLE= vala
-WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland
-WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
- libxkbcommon.so:x11/libxkbcommon
+GTK2_USE= GNOME=cairo,gtk20
+GTK2_CONFIGURE_ENABLE= gtk2
+GTK3_IMPLIES= WAYLAND
+GTK3_LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libnotify.so:devel/libnotify
+GTK3_USES= vala:build
+GTK3_USE= GNOME=cairo,gtk30,pango
+GTK3_CONFIGURE_ENABLE= gtk3 libnotify
+GTK3_LIBS= -lX11
+GTK4_IMPLIES= WAYLAND
+GTK4_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \
+ libvulkan.so:graphics/vulkan-loader
+GTK4_USE= GNOME=cairo,gtk40
+GTK4_CONFIGURE_ENABLE= gtk4
+NLS_USES= gettext
+NLS_USES_OFF= gettext-tools
+NLS_CONFIGURE_ENABLE= nls
+VAPI_IMPLIES= GINTRO
+VAPI_USES= vala:build
+VAPI_CONFIGURE_ENABLE= vala
+WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland
+WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
+ libxkbcommon.so:x11/libxkbcommon
WAYLAND_CONFIGURE_ENABLE= wayland
-XIM_CONFIGURE_ENABLE= xim
+XIM_IMPLIES= GTK3
+XIM_CONFIGURE_ENABLE= xim
.include <bsd.port.pre.mk>
@@ -106,6 +108,10 @@ PLIST_SUB+= COMPDIR=""
PLIST_SUB+= COMPDIR="@comment "
.endif
+post-configure:
+ # Clean pre-generated source code, which may not match the options selected.
+ ${MAKE} -C ${WRKSRC}/ui/gtk3 maintainer-clean-generic
+
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart
diff --git a/textproc/ibus/distinfo b/textproc/ibus/distinfo
index c601429f4a0a..2f9baf403156 100644
--- a/textproc/ibus/distinfo
+++ b/textproc/ibus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732455834
-SHA256 (ibus-1.5.31.tar.gz) = 5093994c8342551134c81f2d271575efbc459bb756cef1173c22430c8601a1e1
-SIZE (ibus-1.5.31.tar.gz) = 4108303
+TIMESTAMP = 1744817598
+SHA256 (ibus-1.5.32.tar.gz) = b24f41ae38b236b254c09f1a8f53c2354b69b0789e89cea888d0494b09d15d67
+SIZE (ibus-1.5.32.tar.gz) = 4192999
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index ae8da59e8b94..706c19e19f58 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -54,11 +54,12 @@ include/ibus-1.0/ibusxml.h
%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.py
%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.pyc
%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.pyo
+%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/IBus%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so
%%GTK4%%lib/gtk-4.0/4.0.0/immodules/libim-ibus.so
lib/libibus-1.0.so
lib/libibus-1.0.so.5
-lib/libibus-1.0.so.5.0.531
+lib/libibus-1.0.so.5.0.532
libdata/pkgconfig/ibus-1.0.pc
%%GTK3%%libexec/ibus-extension-gtk3
%%GTK3%%libexec/ibus-ui-gtk3
@@ -265,30 +266,39 @@ share/dbus-1/services/org.freedesktop.portal.IBus.service
%%DATADIR%%/setup/emojilang.py
%%DATADIR%%/setup/emojilang.pyc
%%DATADIR%%/setup/emojilang.pyo
+%%DATADIR%%/setup/__pycache__/emojilang%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/engineabout.py
%%DATADIR%%/setup/engineabout.pyc
%%DATADIR%%/setup/engineabout.pyo
+%%DATADIR%%/setup/__pycache__/engineabout%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/enginecombobox.py
%%DATADIR%%/setup/enginecombobox.pyc
%%DATADIR%%/setup/enginecombobox.pyo
+%%DATADIR%%/setup/__pycache__/enginecombobox%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/enginedialog.py
%%DATADIR%%/setup/enginedialog.pyc
%%DATADIR%%/setup/enginedialog.pyo
+%%DATADIR%%/setup/__pycache__/enginedialog%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/enginetreeview.py
%%DATADIR%%/setup/enginetreeview.pyc
%%DATADIR%%/setup/enginetreeview.pyo
+%%DATADIR%%/setup/__pycache__/enginetreeview%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/i18n.py
%%DATADIR%%/setup/i18n.pyc
%%DATADIR%%/setup/i18n.pyo
+%%DATADIR%%/setup/__pycache__/i18n%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/icon.py
%%DATADIR%%/setup/icon.pyc
%%DATADIR%%/setup/icon.pyo
+%%DATADIR%%/setup/__pycache__/icon%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/keyboardshortcut.py
%%DATADIR%%/setup/keyboardshortcut.pyc
%%DATADIR%%/setup/keyboardshortcut.pyo
+%%DATADIR%%/setup/__pycache__/keyboardshortcut%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/main.py
%%DATADIR%%/setup/main.pyc
%%DATADIR%%/setup/main.pyo
+%%DATADIR%%/setup/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/setup/setup.ui
%%NLS%%share/gettext/its/ibus.its
%%NLS%%share/gettext/its/ibus.loc
@@ -327,6 +337,7 @@ share/icons/hicolor/scalable/apps/ibus.svg
%%NLS%%share/locale/it/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/ja/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/ka/LC_MESSAGES/ibus10.mo
+%%NLS%%share/locale/kab/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/kn/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/ko/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/lv/LC_MESSAGES/ibus10.mo