Attachment #247831 for bug #276139




PORTNAME=	ibus
PORTVERSION=	1.5.29
PORTREVISION=	3
CATEGORIES=	textproc

MAINTAINER=	henry.hu.sh@gmail.com

		setxkbmap:x11/setxkbmap

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 pygobject3
USE_LDCONFIG=	yes
USE_PYTHON=	py3kplist
SHEBANG_GLOB=	*.sh

TEST_TARGET=	check
TEST_WRKSRC=	${WRKSRC}/src/tests

OPTIONS_DEFINE=	APPINDICATOR ENGINE VALA GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND
OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI APPINDICATOR
NO_OPTIONS_SORT=	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 client
GTK3_DESC=	Install GTK3 client and panel
VALA_DESC=	Install vala binding
WAYLAND_DESC=	Enable Wayland support
XIM_DESC=	Install XIM server

APPINDICATOR_CONFIGURE_ENABLE=	appindicator
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

NLS_USES=		gettext
NLS_USES_OFF=		gettext-tools
NLS_CONFIGURE_ENABLE=	nls
VALA_IMPLIES=		GINTRO
VALA_USES=		vala:build
VALA_CONFIGURE_ENABLE=	vala
WAYLAND_BUILD_DEPENDS=	wayland>1.14:graphics/wayland
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
			libxkbcommon.so:x11/libxkbcommon

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1661648683	1	TIMESTAMP = 1705892344
2	SHA256 (ibus-ibus-1.5.27_GH0.tar.gz) = 7ba4fcffbe804334207be3eb1b0cb2072a94ded78833f4243cb28100ec91a85a	2	SHA256 (ibus-ibus-1.5.29_GH0.tar.gz) = 26ecd125a7282e74e02b66d9e0e2fd5df6350dd8c14d503a5c810ae85c174000
3	SIZE (ibus-ibus-1.5.27_GH0.tar.gz) = 1439027	3	SIZE (ibus-ibus-1.5.29_GH0.tar.gz) = 1510966

Lines 1-11 Link Here

(-)./files/patch-data_dconf_make-dconf-override-db.sh (-11 lines)
1	--- data/dconf/make-dconf-override-db.sh.orig 2019-08-07 03:33:23 UTC
2	+++ data/dconf/make-dconf-override-db.sh
3	@@ -6,7 +6,7 @@ set -e
4	# breaks dbus-launch. There's dbus-run-session which is
5	# better, but not everyone has it yet.
6	export DBUS_FATAL_WARNINGS=0
7	-export TMPDIR=$(mktemp -d --tmpdir="$PWD")
8	+export TMPDIR=$(TMPDIR="${PWD}" mktemp -d)
9	export XDG_CONFIG_HOME="$TMPDIR/config"
10	export XDG_CACHE_HOME="$TMPDIR/cache"
11	export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"




%%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.529
libdata/pkgconfig/ibus-1.0.pc
%%GTK3%%libexec/ibus-extension-gtk3
%%GTK3%%libexec/ibus-ui-gtk3

%%NLS%%share/locale/id/LC_MESSAGES/ibus10.mo
%%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/kn/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/ko/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/lv/LC_MESSAGES/ibus10.mo

%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus10.mo
%%VALA%%share/vala/vapi/ibus-1.0.deps
%%VALA%%share/vala/vapi/ibus-1.0.vapi
share/bash-completion/completions/ibus.bash
%%DCONF%%share/GConf/gsettings/ibus.convert
@dir %%DATADIR%%/setup

Return to bug 276139

Lines 1-6 Link Here

(-)./Makefile (-9 / +12 lines)
1	PORTNAME= ibus	1	PORTNAME= ibus
2	PORTVERSION= 1.5.27	2	PORTVERSION= 1.5.29
3	PORTREVISION= 3
4	CATEGORIES= textproc	3	CATEGORIES= textproc
5		4
6	MAINTAINER= henry.hu.sh@gmail.com	5	MAINTAINER= henry.hu.sh@gmail.com
Lines 20-29 Link Here
20	setxkbmap:x11/setxkbmap	19	setxkbmap:x11/setxkbmap
21		20
22	USES= autoreconf compiler cpe gmake gnome libtool localbase \	21	USES= autoreconf compiler cpe gmake gnome libtool localbase \
23	pathfix pkgconfig python shebangfix	22	pathfix pkgconfig python:3.5+ shebangfix
24	CPE_VENDOR= ibus_project	23	CPE_VENDOR= ibus_project
25	USE_GITHUB= yes	24	USE_GITHUB= yes
26	USE_GNOME= glib20 intltool librsvg2 pygobject3	25	USE_GNOME= glib20 intltool pygobject3
27	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
28	USE_PYTHON= py3kplist	27	USE_PYTHON= py3kplist
29	SHEBANG_GLOB= *.sh	28	SHEBANG_GLOB= *.sh
Lines 38-57 Link Here
38	TEST_TARGET= check	37	TEST_TARGET= check
39	TEST_WRKSRC= ${WRKSRC}/src/tests	38	TEST_WRKSRC= ${WRKSRC}/src/tests
40		39
41	OPTIONS_DEFINE= ENGINE VAPI GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND	40	OPTIONS_DEFINE= APPINDICATOR ENGINE VALA GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND
42	OPTIONS_DEFAULT= GTK2 GTK3 VAPI GINTRO DCONF XIM ENGINE EMOJI	41	OPTIONS_DEFAULT= GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI APPINDICATOR
43	NO_OPTIONS_SORT= yes	42	NO_OPTIONS_SORT= yes
44	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
45		44
		45	APPINDICATOR_DESC= Enable appindicator support
46	DCONF_DESC= Use dconf for configuration	46	DCONF_DESC= Use dconf for configuration
47	EMOJI_DESC= Install emoji dictionary	47	EMOJI_DESC= Install emoji dictionary
48	ENGINE_DESC= Install ibus simple engine	48	ENGINE_DESC= Install ibus simple engine
49	GINTRO_DESC= Install GObject Introspection data	49	GINTRO_DESC= Install GObject Introspection data
50	GTK2_DESC= Install GTK2 client	50	GTK2_DESC= Install GTK2 client
51	GTK3_DESC= Install GTK3 client and panel	51	GTK3_DESC= Install GTK3 client and panel
		52	VALA_DESC= Install vala binding
52	WAYLAND_DESC= Enable Wayland support	53	WAYLAND_DESC= Enable Wayland support
53	XIM_DESC= Install XIM server	54	XIM_DESC= Install XIM server
54		55
		56	APPINDICATOR_CONFIGURE_ENABLE= appindicator
		57	APPINDICATOR_LIB_DEPENDS= libdbusmenu-glib.so:devel/libdbusmenu
55	DCONF_USE= GNOME=dconf	58	DCONF_USE= GNOME=dconf
56	DCONF_CONFIGURE_ENABLE= dconf	59	DCONF_CONFIGURE_ENABLE= dconf
57	DCONF_VARS= GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml	60	DCONF_VARS= GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
Lines 80-88 Link Here
80	NLS_USES= gettext	83	NLS_USES= gettext
81	NLS_USES_OFF= gettext-tools	84	NLS_USES_OFF= gettext-tools
82	NLS_CONFIGURE_ENABLE= nls	85	NLS_CONFIGURE_ENABLE= nls
83	VAPI_IMPLIES= GINTRO	86	VALA_IMPLIES= GINTRO
84	VAPI_USES= vala:build	87	VALA_USES= vala:build
85	VAPI_CONFIGURE_ENABLE= vala	88	VALA_CONFIGURE_ENABLE= vala
86	WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland	89	WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland
87	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	90	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
88	libxkbcommon.so:x11/libxkbcommon	91	libxkbcommon.so:x11/libxkbcommon

Lines 57-63 Link Here

(-)./pkg-plist (-3 / +4 lines)
57	%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so	57	%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so
58	lib/libibus-1.0.so	58	lib/libibus-1.0.so
59	lib/libibus-1.0.so.5	59	lib/libibus-1.0.so.5
60	lib/libibus-1.0.so.5.0.527	60	lib/libibus-1.0.so.5.0.529
61	libdata/pkgconfig/ibus-1.0.pc	61	libdata/pkgconfig/ibus-1.0.pc
62	%%GTK3%%libexec/ibus-extension-gtk3	62	%%GTK3%%libexec/ibus-extension-gtk3
63	%%GTK3%%libexec/ibus-ui-gtk3	63	%%GTK3%%libexec/ibus-ui-gtk3
Lines 271-276 Link Here
271	%%NLS%%share/locale/id/LC_MESSAGES/ibus10.mo	271	%%NLS%%share/locale/id/LC_MESSAGES/ibus10.mo
272	%%NLS%%share/locale/it/LC_MESSAGES/ibus10.mo	272	%%NLS%%share/locale/it/LC_MESSAGES/ibus10.mo
273	%%NLS%%share/locale/ja/LC_MESSAGES/ibus10.mo	273	%%NLS%%share/locale/ja/LC_MESSAGES/ibus10.mo
		274	%%NLS%%share/locale/ka/LC_MESSAGES/ibus10.mo
274	%%NLS%%share/locale/kn/LC_MESSAGES/ibus10.mo	275	%%NLS%%share/locale/kn/LC_MESSAGES/ibus10.mo
275	%%NLS%%share/locale/ko/LC_MESSAGES/ibus10.mo	276	%%NLS%%share/locale/ko/LC_MESSAGES/ibus10.mo
276	%%NLS%%share/locale/lv/LC_MESSAGES/ibus10.mo	277	%%NLS%%share/locale/lv/LC_MESSAGES/ibus10.mo
Lines 300-307 Link Here
300	%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus10.mo	301	%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus10.mo
301	%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus10.mo	302	%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus10.mo
302	%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus10.mo	303	%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus10.mo
303	%%VAPI%%share/vala/vapi/ibus-1.0.deps	304	%%VALA%%share/vala/vapi/ibus-1.0.deps
304	%%VAPI%%share/vala/vapi/ibus-1.0.vapi	305	%%VALA%%share/vala/vapi/ibus-1.0.vapi
305	share/bash-completion/completions/ibus.bash	306	share/bash-completion/completions/ibus.bash
306	%%DCONF%%share/GConf/gsettings/ibus.convert	307	%%DCONF%%share/GConf/gsettings/ibus.convert
307	@dir %%DATADIR%%/setup	308	@dir %%DATADIR%%/setup