Attachment 211027 Details for Bug 243582 – patch

[patch] patch

ibus.diff (text/plain), 8.72 KB, created by Antoine Brodin on 2020-01-25 07:02:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2020-01-25 07:02:59 UTC

Size: 8.72 KB

patch

obsolete

>Index: textproc/ibus/Makefile
>===================================================================
>--- textproc/ibus/Makefile	(revision 524015)
>+++ textproc/ibus/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ibus
> PORTVERSION=	1.5.20
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	textproc
> 
> MAINTAINER=	henry.hu.sh@gmail.com
>@@ -18,13 +18,13 @@
> 		gtkdocize:textproc/gtk-doc \
> 		bash:shells/bash
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
>-		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \
> 		${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:2.7 shebangfix
>+USES=		autoreconf compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:3.5+ shebangfix
> USE_GNOME=	glib20 intltool librsvg2 pygobject3
> USE_LDCONFIG=	yes
>+USE_PYTHON=	py3kplist
> 
> SHEBANG_GLOB=	*.sh
> 
>@@ -35,18 +35,18 @@
> OPTIONS_SUB=	yes
> INSTALL_TARGET=	install-strip
> CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
>-		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd
>+		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd \
>+		--disable-python2 --disable-python-library
> 
>-OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE EMOJI
>+OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO DOCS XIM ENGINE EMOJI
> OPTIONS_RADIO=	CONFIG
> OPTIONS_RADIO_CONFIG=	GCONF DCONF
>-OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE EMOJI
>+OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI
> 
> GTK2_DESC=	Install GTK2 client
> GTK3_DESC=	Install GTK3 client and panel
> VALA_DESC=	Install vala binding
> GINTRO_DESC=	Install GObject Introspection data
>-PYTHON_LIB_DESC=	Install ibus Python libraries
> GCONF_DESC=	Use GConf for configuration
> DCONF_DESC=	Use dconf for configuration
> XIM_DESC=	Install XIM server
>@@ -79,9 +79,6 @@
> GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
> GINTRO_CONFIGURE_ENABLE=	introspection
> 
>-PYTHON_LIB_USE=			GNOME=pygtk2
>-PYTHON_LIB_CONFIGURE_ENABLE=	python-library
>-
> GCONF_USE=		GNOME=gconf2
> GCONF_CONFIGURE_ENABLE=	gconf
> GCONF_VARS=		GCONF_SCHEMAS=ibus.schemas
>Index: textproc/ibus/pkg-plist
>===================================================================
>--- textproc/ibus/pkg-plist	(revision 524015)
>+++ textproc/ibus/pkg-plist	(working copy)
>@@ -57,111 +57,6 @@
> lib/libibus-1.0.so
> lib/libibus-1.0.so.5
> lib/libibus-1.0.so.5.0.520
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/_config.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/_config.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/_config.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/_gtk.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/_gtk.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/_gtk.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/application.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/application.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/application.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/ascii.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/ascii.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/ascii.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/attribute.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/attribute.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/attribute.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/bus.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/bus.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/bus.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/common.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/common.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/common.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/component.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/component.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/component.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/config.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/config.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/config.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/engine.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/engine.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/engine.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/enginedesc.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/enginedesc.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/enginedesc.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/exception.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/exception.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/exception.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/factory.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/factory.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/factory.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/inputcontext.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/inputcontext.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/inputcontext.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/__init__.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/__init__.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/__init__.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iconfig.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iconfig.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iconfig.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iengine.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iengine.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iengine.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/ienginefactory.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/ienginefactory.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/ienginefactory.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iibus.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iibus.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iibus.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iinputcontext.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iinputcontext.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/iinputcontext.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/inotifications.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/inotifications.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/inotifications.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/ipanel.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/ipanel.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/interface/ipanel.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/keysyms.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/keysyms.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/keysyms.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/lang.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/lang.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/lang.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/lookuptable.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/lookuptable.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/lookuptable.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/modifier.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/modifier.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/modifier.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/notifications.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/notifications.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/notifications.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/object.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/object.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/object.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/observedpath.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/observedpath.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/observedpath.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/panel.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/panel.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/panel.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/property.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/property.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/property.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/serializable.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/serializable.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/serializable.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/text.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/text.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/text.pyo
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/utility.py
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/utility.pyc
>-%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/utility.pyo
> libdata/pkgconfig/ibus-1.0.pc
> %%GTK3%%libexec/ibus-extension-gtk3
> %%GTK3%%libexec/ibus-ui-gtk3
>@@ -406,8 +301,6 @@
> @dir %%DATADIR%%/engine
> %%COMPDIR%%@dir %%DATADIR%%/component
> @dir %%DATADIR%%
>-%%PYTHON_LIB%%@dir %%PYTHON_SITELIBDIR%%/ibus/interface
>-%%PYTHON_LIB%%@dir %%PYTHON_SITELIBDIR%%/ibus
> @dir include/ibus-1.0
> %%DCONF%%@dir etc/dconf/db/ibus.d
> %%GTK3%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache

Actions: View | Diff

Attachments on bug 243582: 211027