Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Mar 2021 06:07:50 +0000 (UTC)
From:      Rainer Hurling <rhurlin@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r567891 - in head/textproc/ibus: . files
Message-ID:  <202103090607.12967oSM021012@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rhurlin
Date: Tue Mar  9 06:07:50 2021
New Revision: 567891
URL: https://svnweb.freebsd.org/changeset/ports/567891

Log:
  textproc/ibus: Update to 1.5.24
  
  Changelog: https://github.com/ibus/ibus/releases/tag/1.5.24
  
  PR:		254072
  Submitted by:	Henry Hu <henry.hu.sh@gmail.com> (maintainer)

Deleted:
  head/textproc/ibus/files/patch-ui_gtk3_application.vala
Modified:
  head/textproc/ibus/Makefile
  head/textproc/ibus/distinfo
  head/textproc/ibus/pkg-message
  head/textproc/ibus/pkg-plist

Modified: head/textproc/ibus/Makefile
==============================================================================
--- head/textproc/ibus/Makefile	Tue Mar  9 05:11:28 2021	(r567890)
+++ head/textproc/ibus/Makefile	Tue Mar  9 06:07:50 2021	(r567891)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ibus
-PORTVERSION=	1.5.23
-PORTREVISION=	2
+PORTVERSION=	1.5.24
 CATEGORIES=	textproc
 
 MAINTAINER=	henry.hu.sh@gmail.com
@@ -21,87 +20,87 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel
 		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
 		setxkbmap:x11/setxkbmap
 
-USES=		autoreconf compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:3.5+ shebangfix
+USES=		autoreconf compiler cpe gmake gnome libtool localbase \
+		pathfix pkgconfig python:3.5+ shebangfix
+CPE_VENDOR=	ibus_project
+USE_GITHUB=	yes
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 
-MAKE_JOBS_UNSAFE=yes
 
 SHEBANG_GLOB=	*.sh
 
-USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-OPTIONS_SUB=	yes
-INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
 		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd \
-		--disable-python2 --disable-python-library
+		--disable-python2 --disable-python-library \
+		--disable-gtk4
 
-OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO DOCS XIM ENGINE EMOJI
+MAKE_JOBS_UNSAFE=yes
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	ENGINE VALA GTK2 GTK3 GINTRO XIM EMOJI DOCS NLS WAYLAND
+OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI
 OPTIONS_RADIO=	CONFIG
 OPTIONS_RADIO_CONFIG=	GCONF DCONF
-OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI
+NO_OPTIONS_SORT=	yes
+OPTIONS_SUB=	yes
 
+DCONF_DESC=	Use dconf for configuration
+EMOJI_DESC=	Install emoji dictionary
+ENGINE_DESC=	Install ibus simple engine
+GCONF_DESC=	Use GConf for configuration
+GINTRO_DESC=	Install GObject Introspection data
 GTK2_DESC=	Install GTK2 client
 GTK3_DESC=	Install GTK3 client and panel
 VALA_DESC=	Install vala binding
-GINTRO_DESC=	Install GObject Introspection data
-GCONF_DESC=	Use GConf for configuration
-DCONF_DESC=	Use dconf for configuration
+WAYLAND_DESC=	Enable Wayland support
 XIM_DESC=	Install XIM server
-ENGINE_DESC=	Install ibus simple engine
-EMOJI_DESC=	Install emoji dictionary
-CPE_VENDOR=	ibus_project
 
-NLS_USES=		gettext
-NLS_USES_OFF=		gettext-tools
-NLS_CONFIGURE_ENABLE=	nls
-
-GTK2_USE=		GNOME=cairo,gtk20
-GTK2_CONFIGURE_ENABLE=	gtk2
+DCONF_USE=		GNOME=dconf
+DCONF_CONFIGURE_ENABLE=	dconf
+DCONF_VARS=		GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
+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
+ENGINE_CONFIGURE_ENABLE=	engine
+GCONF_USE=		GNOME=gconf2
+GCONF_CONFIGURE_ENABLE=	gconf
+GCONF_VARS=		GCONF_SCHEMAS=ibus.schemas
+GINTRO_BUILD_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
+GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-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 XORG=x11,xi
 GTK3_CONFIGURE_ENABLE=	gtk3 libnotify
-GTK3_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-			libnotify.so:devel/libnotify
 GTK3_LIBS=		-lX11
-
+NLS_USES=		gettext
+NLS_USES_OFF=		gettext-tools
+NLS_CONFIGURE_ENABLE=	nls
+VALA_IMPLIES=		GINTRO
 VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
 VALA_CONFIGURE_ENABLE=	vala
-VALA_IMPLIES=		GINTRO
-
-GINTRO_BUILD_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
-GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
-GINTRO_CONFIGURE_ENABLE=	introspection
-
-GCONF_USE=		GNOME=gconf2
-GCONF_CONFIGURE_ENABLE=	gconf
-GCONF_VARS=		GCONF_SCHEMAS=ibus.schemas
-
-DCONF_USE=		GNOME=dconf
-DCONF_CONFIGURE_ENABLE=	dconf
-DCONF_VARS=		GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
-
-DOCS_CONFIGURE_ENABLE=	gtk-doc-html
-
+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
 
-ENGINE_CONFIGURE_ENABLE=	engine
-
 EMOJIONE_TAG=		ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7
-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
-EMOJI_BUILD_DEPENDS=	json-glib>=0:devel/json-glib \
-			unicode-emoji>0:misc/unicode-emoji \
-			cldr-emoji-annotation>0:misc/cldr-emoji-annotation
 
 .include <bsd.port.pre.mk>
 

Modified: head/textproc/ibus/distinfo
==============================================================================
--- head/textproc/ibus/distinfo	Tue Mar  9 05:11:28 2021	(r567890)
+++ head/textproc/ibus/distinfo	Tue Mar  9 06:07:50 2021	(r567891)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603214464
-SHA256 (ibus-ibus-1.5.23_GH0.tar.gz) = e8978b491ec56f78552c23cf4e7fe6279aede270e6efadf43c0395f08cb40906
-SIZE (ibus-ibus-1.5.23_GH0.tar.gz) = 1371387
+TIMESTAMP = 1615052071
+SHA256 (ibus-ibus-1.5.24_GH0.tar.gz) = 003a84a30a8c6ca902d449b782c82ec2ae34d576fcbd0b6036f46fe195d587a9
+SIZE (ibus-ibus-1.5.24_GH0.tar.gz) = 1390778

Modified: head/textproc/ibus/pkg-message
==============================================================================
--- head/textproc/ibus/pkg-message	Tue Mar  9 05:11:28 2021	(r567890)
+++ head/textproc/ibus/pkg-message	Tue Mar  9 06:07:50 2021	(r567891)
@@ -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,
-and add following lines:
+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:
 
 #!/bin/sh
 export XIM=ibus
@@ -45,8 +45,6 @@ textproc/ibus-kmfl		KMFL IMEngine for IBus framework
 textproc/ibus-m17n		m17n IM engine for IBus framework
 textproc/ibus-table		Table based IM framework for IBus
 textproc/ibus-typing-booster    Faster typing by context sensitive completion
-
-and QT4 input method module, textproc/ibus-qt.
 
 If ibus cannot start or the panel does not appear, please ensure
 that you are using up-to-date python.

Modified: head/textproc/ibus/pkg-plist
==============================================================================
--- head/textproc/ibus/pkg-plist	Tue Mar  9 05:11:28 2021	(r567890)
+++ head/textproc/ibus/pkg-plist	Tue Mar  9 06:07:50 2021	(r567891)
@@ -56,7 +56,7 @@ include/ibus-1.0/ibusxml.h
 %%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so
 lib/libibus-1.0.so
 lib/libibus-1.0.so.5
-lib/libibus-1.0.so.5.0.523
+lib/libibus-1.0.so.5.0.524
 libdata/pkgconfig/ibus-1.0.pc
 %%GTK3%%libexec/ibus-extension-gtk3
 %%GTK3%%libexec/ibus-ui-gtk3
@@ -66,6 +66,7 @@ libdata/pkgconfig/ibus-1.0.pc
 %%ENGINE%%libexec/ibus-engine-simple
 libexec/ibus-portal
 %%EMOJI%%libexec/ibus-ui-emojier
+%%WAYLAND%%libexec/ibus-wayland
 man/man1/ibus-daemon.1.gz
 man/man1/ibus-setup.1.gz
 man/man1/ibus.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103090607.12967oSM021012>