Date: Mon, 08 Dec 2025 01:09:03 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Henry Hu <henry.hu.sh@gmail.com> Subject: git: a78be530d3b7 - main - textproc/ibus: Update 1.5.32 => 1.5.33 Message-ID: <6936252f.2711d.764c1a19@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a78be530d3b7cb137862531124a89214eb6e384a commit a78be530d3b7cb137862531124a89214eb6e384a Author: Henry Hu <henry.hu.sh@gmail.com> AuthorDate: 2025-12-08 01:00:22 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-12-08 01:00:22 +0000 textproc/ibus: Update 1.5.32 => 1.5.33 Changelog: https://github.com/ibus/ibus/releases/tag/1.5.33 Fix build with different options. PR: 291303 Co-authored-by: Olivier Duchateau <duchateau.olivier@gmail.com> Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org> --- textproc/ibus/Makefile | 32 ++++++++++++++++++-------------- textproc/ibus/distinfo | 6 +++--- textproc/ibus/pkg-plist | 20 +++++++++++--------- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile index 047f69b612f4..be7326942a4e 100644 --- a/textproc/ibus/Makefile +++ b/textproc/ibus/Makefile @@ -1,5 +1,5 @@ PORTNAME= ibus -DISTVERSION= 1.5.32 +DISTVERSION= 1.5.33 CATEGORIES= textproc MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ @@ -13,14 +13,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING 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 + iso-codes>0:misc/iso-codes \ + evdev-proto>0:devel/evdev-proto 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 + python shebangfix vala:build xorg CPE_VENDOR= ibus_project USE_GNOME= glib20 pygobject3 USE_LDCONFIG= yes @@ -39,7 +39,7 @@ TEST_TARGET= check TEST_WRKSRC= ${WRKSRC}/src/tests OPTIONS_DEFINE= APPINDICATOR DCONF DOCS EMOJI ENGINE GINTRO GTK2 GTK3 \ - GTK4 NLS VAPI WAYLAND XIM + GTK4 NLS TESTS VAPI WAYLAND XIM OPTIONS_DEFAULT= APPINDICATOR DCONF EMOJI ENGINE GINTRO GTK3 GTK4 VAPI \ WAYLAND XIM NO_OPTIONS_SORT= yes @@ -53,6 +53,7 @@ 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 +TESTS_DESC= Build tests WAYLAND_DESC= Enable Wayland support XIM_DESC= Install XIM server @@ -71,29 +72,31 @@ EMOJI_CONFIGURE_ON= --with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr --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:build GINTRO_CONFIGURE_ENABLE= introspection +GTK2_LIB_DEPENDS= libdbus-1.so:devel/dbus GTK2_USE= GNOME=cairo,gtk20 GTK2_CONFIGURE_ENABLE= gtk2 -GTK3_IMPLIES= WAYLAND +GTK3_IMPLIES= GINTRO 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 \ +GTK4_IMPLIES= GINTRO +GTK4_LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libgraphene-1.0.so:graphics/graphene \ libvulkan.so:graphics/vulkan-loader -GTK4_USE= GNOME=cairo,gtk40 +GTK4_USE= GNOME=cairo,gtk40,gdkpixbuf GTK4_CONFIGURE_ENABLE= gtk4 NLS_USES= gettext NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls +TESTS_IMPLIES= GTK3 GTK4 XIM +TESTS_CONFIGURE_ENABLE= tests VAPI_IMPLIES= GINTRO -VAPI_USES= vala:build VAPI_CONFIGURE_ENABLE= vala -WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland +WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland \ + wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_CONFIGURE_ENABLE= wayland @@ -111,6 +114,7 @@ PLIST_SUB+= COMPDIR="@comment " post-configure: # Clean pre-generated source code, which may not match the options selected. ${MAKE} -C ${WRKSRC}/ui/gtk3 maintainer-clean-generic + ${RM} ${WRKSRC}/tools/main.c post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart diff --git a/textproc/ibus/distinfo b/textproc/ibus/distinfo index 2f9baf403156..095169ec6780 100644 --- a/textproc/ibus/distinfo +++ b/textproc/ibus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744817598 -SHA256 (ibus-1.5.32.tar.gz) = b24f41ae38b236b254c09f1a8f53c2354b69b0789e89cea888d0494b09d15d67 -SIZE (ibus-1.5.32.tar.gz) = 4192999 +TIMESTAMP = 1764516894 +SHA256 (ibus-1.5.33.tar.gz) = 58941c9b8285891c776b67fb2039eebe0d61d63a51578519febfc5481b91e831 +SIZE (ibus-1.5.33.tar.gz) = 4350799 diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist index daebe64e529b..aedb0a925aeb 100644 --- a/textproc/ibus/pkg-plist +++ b/textproc/ibus/pkg-plist @@ -2,12 +2,13 @@ bin/ibus bin/ibus-daemon bin/ibus-setup etc/xdg/autostart/ibus.desktop -etc/xdg/Xwayland-session.d/10-ibus-x11 +%%XIM%%etc/xdg/Xwayland-session.d/10-ibus-x11 %%DCONF%%etc/dconf/db/ibus.d/00-upstream-settings %%DCONF%%share/man/man5/00-upstream-settings.5.gz %%DCONF%%@postunexec rm -f %D/etc/dconf/db/ibus %%DCONF%%@postexec dconf update %%DCONF%%etc/dconf/profile/ibus +include/ibus-1.0/ibus-visibility.h include/ibus-1.0/ibus.h include/ibus-1.0/ibusaccelgroup.h include/ibus-1.0/ibusattribute.h @@ -31,6 +32,7 @@ include/ibus-1.0/ibuskeys.h include/ibus-1.0/ibuskeysyms-compat.h include/ibus-1.0/ibuskeysyms.h include/ibus-1.0/ibuslookuptable.h +include/ibus-1.0/ibusmessage.h include/ibus-1.0/ibusobject.h include/ibus-1.0/ibusobservedpath.h include/ibus-1.0/ibuspanelservice.h @@ -59,25 +61,25 @@ include/ibus-1.0/ibusxml.h %%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.532 +lib/libibus-1.0.so.5.0.533 libdata/pkgconfig/ibus-1.0.pc -%%GTK3%%libexec/ibus-extension-gtk3 +%%GTK3%%%%EMOJI%%libexec/ibus-extension-gtk3 %%GTK3%%libexec/ibus-ui-gtk3 %%XIM%%libexec/ibus-x11 %%DCONF%%libexec/ibus-dconf %%ENGINE%%libexec/ibus-engine-simple libexec/ibus-portal -%%EMOJI%%libexec/ibus-ui-emojier +%%GTK3%%%%EMOJI%%libexec/ibus-ui-emojier %%WAYLAND%%libexec/ibus-wayland share/man/man1/ibus-daemon.1.gz share/man/man1/ibus-setup.1.gz share/man/man1/ibus.1.gz %%DCONF%%share/man/man5/ibus.5.gz -%%EMOJI%%share/man/man7/ibus-emoji.7.gz +%%GTK3%%%%EMOJI%%share/man/man7/ibus-emoji.7.gz share/applications/org.freedesktop.IBus.Setup.desktop -%%EMOJI%%share/applications/org.freedesktop.IBus.Panel.Emojier.desktop -%%GTK3%%share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop -%%GTK3%%share/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.desktop +%%GTK3%%%%EMOJI%%share/applications/org.freedesktop.IBus.Panel.Emojier.desktop +%%GTK3%%%%EMOJI%%share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop +%%GTK3%%%%WAYLAND%%share/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.desktop share/dbus-1/services/org.freedesktop.IBus.service share/dbus-1/services/org.freedesktop.portal.IBus.service %%PORTDOCS%%%%DOCSDIR%%/IBusAttrList.html @@ -132,7 +134,7 @@ share/dbus-1/services/org.freedesktop.portal.IBus.service %%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png %%PORTDOCS%%%%DOCSDIR%%/up.png -%%GTK3%%%%DATADIR%%/component/gtkextension.xml +%%GTK3%%%%EMOJI%%%%DATADIR%%/component/gtkextension.xml %%GTK3%%%%DATADIR%%/component/gtkpanel.xml %%DCONF%%%%DATADIR%%/component/dconf.xml %%ENGINE%%%%DATADIR%%/component/simple.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6936252f.2711d.764c1a19>