From nobody Wed Jan 8 05:58:21 2025 X-Original-To: dev-commits-ports-all@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 4YScfP5c2fz5kg8M; Wed, 08 Jan 2025 05:58:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YScfP4yxVz4svZ; Wed, 8 Jan 2025 05:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736315901; 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=+RHjfTEInUuEPAllubP3c64Ku8gboRcPCFkzhDzfShg=; b=A6xId74pt+zjaXii5vWrDXP7yJ4HS0jV51zSvjJKH+RYfDUfOay1uDlEbIuDAM16RUfYVu 9zhvTQN72kpaslzsjuEFXYiN2upMFSxMgOPIYXiwW+8yvWf1FRuh6r+gTuPI1n7U4fmwQt W0J3tMBFi5MMCxIsjqu0Dhbf9afDreZDS4h9kL0OjJ/FTDG+3TLtYharH0q4y01gw0uzQv cn251Cjq+BwuhrvsUP7Oupmk8f15SWZzPHmvKPqgqORdM6pNfZijyxF2TzbGJpnIBzTDJz hPFfV7+5QWqSwWzoA+SPhcE69TLN4RxGqlZo76PKy0AXJndNUNuj4HPdHdocUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736315901; 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=+RHjfTEInUuEPAllubP3c64Ku8gboRcPCFkzhDzfShg=; b=elrUHHyPfw6IuXzVsNLwYxKX4Nkvv2t+lEsCZPZVFZJMEmYjjC+Y/c5VOSnLcfyiLRhR/3 mxghP04z5Ur4XVQPdhMXHxjAcb2oWrKbS+SmFDGoptUYHrpTtXpZ3TlvgTsAy+Frzw4SWU nqG1cG6xQIcw06PC+LMe16cmILvLJm84jDMc9Ja0Vn+XMy2+EheSWda9+f0cx1Dxmy1NvI mCiHIhe34okPsNfTAH9so/N4rWhm2MeuRb9PUBEwJLWhCTP3qUezodoJo8uYZQFo7kSjKx q71ifZDCl6rGDeY172tPcMuXC++r5+/+1Ouh9qdosa683kjOxco0XQf4ie5vgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736315901; a=rsa-sha256; cv=none; b=L8pMSiHijYQFc2UgY45hVsdhMceVewGAjHi0KzuepoAakp7y6b7u/j13Oc11kuxC9dXKZs kDVNdT9dlGwYFYx77Qna2X+PG0uznADhvqQKPPtNOQCGuiq8HmW5ea2wWAhKF29L8UqiJ3 NBrX05tdu0LmW/+gfCt25TEFc41VrY/c9fiQ4rl+3c4eXGY1951VsmLdY0Exwb4JuIrD4X CG1zUCMakrDdIxTkUFoJ96nNmGmPvVnyFAv0U/uQAniTSHhRG/KUOe5CXP+g+zpKZQOq19 sNIn1M/5+ULGAwv8vBOuTMfYR6Aj8mQaNnam9k95AFPrGVwDCP3IFxcluIReNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YScfP4T9MzkJc; Wed, 08 Jan 2025 05:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5085wLfG039444; Wed, 8 Jan 2025 05:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5085wLYb039441; Wed, 8 Jan 2025 05:58:21 GMT (envelope-from git) Date: Wed, 8 Jan 2025 05:58:21 GMT Message-Id: <202501080558.5085wLYb039441@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 119972ab4161 - main - textproc/ibus: Update to 1.5.31 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 119972ab4161a441163969cbb86951bcc54f1080 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=119972ab4161a441163969cbb86951bcc54f1080 commit 119972ab4161a441163969cbb86951bcc54f1080 Author: Olivier Duchateau AuthorDate: 2025-01-08 05:50:38 +0000 Commit: Nuno Teixeira CommitDate: 2025-01-08 05:57:45 +0000 textproc/ibus: Update to 1.5.31 - Switch to DISTVERSION - Switch to MASTER_SITES (release tarball) - Add GTK4 option - Enable by default GTK3, GTK4 and WAYLAND [1] options (disable GTK2) - Remove reference to KDE4 in pkg-message - Remove MAKE_JOBS_UNSAFE restriction [1] Wayland is enabled by default in x11-toolkits/gtk{30,40} ChangeLog: https://github.com/ibus/ibus/releases/tag/1.5.31 PR: 283516 --- textproc/ibus/Makefile | 60 +++++++++++++++++++++++------------------------ textproc/ibus/distinfo | 6 ++--- textproc/ibus/pkg-message | 4 ++-- textproc/ibus/pkg-plist | 57 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 90 insertions(+), 37 deletions(-) diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile index 548eb606080e..444ec4d99002 100644 --- a/textproc/ibus/Makefile +++ b/textproc/ibus/Makefile @@ -1,7 +1,7 @@ PORTNAME= ibus -PORTVERSION= 1.5.29 -PORTREVISION= 2 +DISTVERSION= 1.5.31 CATEGORIES= textproc +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= henry.hu.sh@gmail.com COMMENT= Intelligent Input Bus for Unix-like systems @@ -10,38 +10,38 @@ WWW= https://github.com/ibus/ibus LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \ - ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ - gtkdocize:textproc/gtk-doc \ + iso-codes>0:misc/iso-codes \ bash:shells/bash -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ - ${LOCALBASE}/share/xml/iso-codes/iso_639.xml: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= autoreconf compiler cpe gmake gnome libtool localbase \ - pathfix pkgconfig python shebangfix +USES= compiler cpe gmake gnome libtool localbase pathfix \ + pkgconfig python shebangfix xorg CPE_VENDOR= ibus_project -USE_GITHUB= yes -USE_GNOME= glib20 intltool pygobject3 +USE_GNOME= glib20 pygobject3 USE_LDCONFIG= yes USE_PYTHON= py3kplist SHEBANG_GLOB= *.sh +USE_XORG= x11 xi xfixes xtst GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-ucd-dir=${LOCALBASE}/share/unicode/ucd \ --disable-python2 --disable-python-library \ - --disable-gtk4 --disable-systemd --disable-systemd-services + --disable-systemd --disable-systemd-services \ + --disable-install-tests -MAKE_JOBS_UNSAFE=yes INSTALL_TARGET= install-strip TEST_TARGET= check TEST_WRKSRC= ${WRKSRC}/src/tests -OPTIONS_DEFINE= APPINDICATOR ENGINE VAPI GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND -OPTIONS_DEFAULT= APPINDICATOR GTK2 GTK3 VAPI GINTRO DCONF XIM ENGINE EMOJI +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 NO_OPTIONS_SORT= yes +WAYLAND_IMPLIES= GTK3 GTK4 OPTIONS_SUB= yes APPINDICATOR_DESC= Enable appindicator support @@ -49,16 +49,19 @@ 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 client -GTK3_DESC= Install GTK3 client and panel +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_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 \ @@ -67,20 +70,21 @@ 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 ENGINE_CONFIGURE_ENABLE= engine -GINTRO_BUILD_DEPENDS= gobject-introspection>=0.6.8:devel/gobject-introspection -GINTRO_RUN_DEPENDS= gobject-introspection>=0.6.8:devel/gobject-introspection +GINTRO_USE= GNOME=introspection GINTRO_CONFIGURE_ENABLE= introspection -GTK2_LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 GTK2_USE= GNOME=cairo,gtk20 GTK2_CONFIGURE_ENABLE= gtk2 GTK3_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libnotify.so:devel/libnotify -GTK3_USES= xorg -GTK3_USE= GNOME=cairo,gtk30,pango XORG=x11,xi +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 @@ -92,9 +96,6 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_CONFIGURE_ENABLE= wayland XIM_CONFIGURE_ENABLE= xim -XIM_USE= XORG=x11,xfixes - -EMOJIONE_TAG= ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7 .include @@ -104,9 +105,6 @@ PLIST_SUB+= COMPDIR="" PLIST_SUB+= COMPDIR="@comment " .endif -pre-configure: - cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl - 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 5f13675624b3..c601429f4a0a 100644 --- a/textproc/ibus/distinfo +++ b/textproc/ibus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705892344 -SHA256 (ibus-ibus-1.5.29_GH0.tar.gz) = 26ecd125a7282e74e02b66d9e0e2fd5df6350dd8c14d503a5c810ae85c174000 -SIZE (ibus-ibus-1.5.29_GH0.tar.gz) = 1510966 +TIMESTAMP = 1732455834 +SHA256 (ibus-1.5.31.tar.gz) = 5093994c8342551134c81f2d271575efbc459bb756cef1173c22430c8601a1e1 +SIZE (ibus-1.5.31.tar.gz) = 4108303 diff --git a/textproc/ibus/pkg-message b/textproc/ibus/pkg-message index b4b12b18358f..559b21a92fe0 100644 --- a/textproc/ibus/pkg-message +++ b/textproc/ibus/pkg-message @@ -21,8 +21,8 @@ setenv XMODIFIERS @im=ibus setenv XIM_PROGRAM ibus-daemon setenv XIM_ARGS "--daemonize --xim" -If you are using KDE4, you may create a shell script in $HOME/.kde4/env -($HOME/.config/plasma-workspace/env for Plasma) and add following lines: +If you are using KDE, you may create a shell script in +$HOME/.config/plasma-workspace/env and add following lines: #!/bin/sh export XIM=ibus diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist index 80ba0c96df25..ae8da59e8b94 100644 --- a/textproc/ibus/pkg-plist +++ b/textproc/ibus/pkg-plist @@ -55,9 +55,10 @@ include/ibus-1.0/ibusxml.h %%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.pyc %%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.pyo %%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.529 +lib/libibus-1.0.so.5.0.531 libdata/pkgconfig/ibus-1.0.pc %%GTK3%%libexec/ibus-extension-gtk3 %%GTK3%%libexec/ibus-ui-gtk3 @@ -75,8 +76,61 @@ share/man/man1/ibus.1.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 share/dbus-1/services/org.freedesktop.IBus.service share/dbus-1/services/org.freedesktop.portal.IBus.service +%%PORTDOCS%%%%DOCSDIR%%/IBusAttrList.html +%%PORTDOCS%%%%DOCSDIR%%/IBusAttribute.html +%%PORTDOCS%%%%DOCSDIR%%/IBusBus.html +%%PORTDOCS%%%%DOCSDIR%%/IBusComponent.html +%%PORTDOCS%%%%DOCSDIR%%/IBusConfig.html +%%PORTDOCS%%%%DOCSDIR%%/IBusConfigService.html +%%PORTDOCS%%%%DOCSDIR%%/IBusEngine.html +%%PORTDOCS%%%%DOCSDIR%%/IBusEngineDesc.html +%%PORTDOCS%%%%DOCSDIR%%/IBusEngineSimple.html +%%PORTDOCS%%%%DOCSDIR%%/IBusFactory.html +%%PORTDOCS%%%%DOCSDIR%%/IBusHotkeyProfile.html +%%PORTDOCS%%%%DOCSDIR%%/IBusInputContext.html +%%PORTDOCS%%%%DOCSDIR%%/IBusKeymap.html +%%PORTDOCS%%%%DOCSDIR%%/IBusLookupTable.html +%%PORTDOCS%%%%DOCSDIR%%/IBusObject.html +%%PORTDOCS%%%%DOCSDIR%%/IBusObservedPath.html +%%PORTDOCS%%%%DOCSDIR%%/IBusPanelService.html +%%PORTDOCS%%%%DOCSDIR%%/IBusPropList.html +%%PORTDOCS%%%%DOCSDIR%%/IBusProperty.html +%%PORTDOCS%%%%DOCSDIR%%/IBusProxy.html +%%PORTDOCS%%%%DOCSDIR%%/IBusRegistry.html +%%PORTDOCS%%%%DOCSDIR%%/IBusSerializable.html +%%PORTDOCS%%%%DOCSDIR%%/IBusService.html +%%PORTDOCS%%%%DOCSDIR%%/IBusText.html +%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html +%%PORTDOCS%%%%DOCSDIR%%/ch01.html +%%PORTDOCS%%%%DOCSDIR%%/ch02.html +%%PORTDOCS%%%%DOCSDIR%%/ch03.html +%%PORTDOCS%%%%DOCSDIR%%/ch04.html +%%PORTDOCS%%%%DOCSDIR%%/ch05.html +%%PORTDOCS%%%%DOCSDIR%%/ch06.html +%%PORTDOCS%%%%DOCSDIR%%/home.png +%%PORTDOCS%%%%DOCSDIR%%/ibus-IBusKeysyms.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusdebug.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuserror.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeys.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeysyms-compat.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusshare.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibustypes.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusutil.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusversion.html +%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusxml.html +%%PORTDOCS%%%%DOCSDIR%%/ibus.devhelp2 +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png +%%PORTDOCS%%%%DOCSDIR%%/left.png +%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png +%%PORTDOCS%%%%DOCSDIR%%/right.png +%%PORTDOCS%%%%DOCSDIR%%/style.css +%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png +%%PORTDOCS%%%%DOCSDIR%%/up.png %%GTK3%%%%DATADIR%%/component/gtkextension.xml %%GTK3%%%%DATADIR%%/component/gtkpanel.xml %%DCONF%%%%DATADIR%%/component/dconf.xml @@ -256,6 +310,7 @@ share/icons/hicolor/scalable/apps/ibus.svg %%NLS%%share/locale/cs/LC_MESSAGES/ibus10.mo %%NLS%%share/locale/da/LC_MESSAGES/ibus10.mo %%NLS%%share/locale/de/LC_MESSAGES/ibus10.mo +%%NLS%%share/locale/el/LC_MESSAGES/ibus10.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/ibus10.mo %%NLS%%share/locale/es/LC_MESSAGES/ibus10.mo %%NLS%%share/locale/et/LC_MESSAGES/ibus10.mo