Attachment 188483 Details for Bug 223549 – patch

[patch] patch

ibus.patch (text/plain), 10.31 KB, created by Yuri Victorovich on 2017-12-03 02:02:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-12-03 02:02:03 UTC

Size: 10.31 KB

patch

obsolete

>Index: textproc/ibus/Makefile
>===================================================================
>--- textproc/ibus/Makefile	(revision 455250)
>+++ textproc/ibus/Makefile	(working copy)
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	ibus
>-PORTVERSION=	1.5.14
>-PORTREVISION=	3
>+DISTVERSION=	1.5.17
> CATEGORIES=	textproc
>-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT \
>-		https://raw.githubusercontent.com/Ranks/emojione/${EMOJIONE_TAG}/:emojione
>+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT
> DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT
> EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
> 
>@@ -22,7 +20,6 @@
> 		${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
>-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
> 
> USES=		compiler cpe gmake libtool localbase pathfix pkgconfig python:2
> USE_GNOME=	glib20 intltool librsvg2 pygobject3
>@@ -54,12 +51,16 @@
> NLS_USES_OFF=		gettext-tools
> NLS_CONFIGURE_ENABLE=	nls
> 
>-GTK2_USE=		GNOME=gtk20
>+GTK2_USE=		GNOME=cairo,gtk20
> GTK2_CONFIGURE_ENABLE=	gtk2
>+GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+libdbus-1.so:devel/dbus
> 
>-GTK3_USE=		GNOME=gtk30 XORG=x11
>+GTK3_USE=		GNOME=cairo,gtk30 XORG=x11,xi
> GTK3_CONFIGURE_ENABLE=	gtk3 libnotify
>-GTK3_LIB_DEPENDS=	libnotify.so:devel/libnotify
>+GTK3_LIB_DEPENDS=	libnotify.so:devel/libnotify \
>+			libdbus-1.so:devel/dbus
> GTK3_LIBS=		-lX11
> 
> VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
>@@ -90,10 +91,12 @@
> 
> EMOJIONE_TAG=		ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7
> EMOJI_CONFIGURE_ON=	--enable-emoji-dict \
>-			--with-emoji-json-file=${WRKSRC}/emoji.json
>+			--with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji \
>+			--with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations
> EMOJI_CONFIGURE_OFF=	--disable-emoji-dict
>-EMOJI_BUILD_DEPENDS=	json-glib>=0:devel/json-glib
>-EMOJI_DISTFILES=	emoji.json:emojione
>+EMOJI_BUILD_DEPENDS=	json-glib>=0:devel/json-glib \
>+			${LOCALBASE}/share/unicode/emoji/emoji-data.txt:misc/unicode-emoji \
>+			${LOCALBASE}/share/unicode/cldr/common/annotations/en.xml:misc/cldr-emoji-annotation
> 
> .include <bsd.port.pre.mk>
> 
>@@ -107,9 +110,6 @@
> PLIST_SUB+=	COMPDIR="@comment "
> .endif
> 
>-post-extract-EMOJI-on:
>-	${CP} ${DISTDIR}/emoji.json ${WRKSRC}/
>-
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
> 	${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart
>Index: textproc/ibus/distinfo
>===================================================================
>--- textproc/ibus/distinfo	(revision 455250)
>+++ textproc/ibus/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1486792464
>-SHA256 (ibus-1.5.14.tar.gz) = a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c
>-SIZE (ibus-1.5.14.tar.gz) = 2214350
>+TIMESTAMP = 1510188391
>+SHA256 (ibus-1.5.17.tar.gz) = 0347a8055977ca458e8add750af5f9b76e1a524844cc3b0e2fad70ce153dd219
>+SIZE (ibus-1.5.17.tar.gz) = 2522960
> SHA256 (emoji.json) = 3e4792d6dc13f95b8e72b4cc5eb7d6088f64fc625682add33a6bbcc08bf76c4b
> SIZE (emoji.json) = 448953
>Index: textproc/ibus/pkg-plist
>===================================================================
>--- textproc/ibus/pkg-plist	(revision 455250)
>+++ textproc/ibus/pkg-plist	(working copy)
>@@ -14,6 +14,7 @@
> include/ibus-1.0/ibusconfig.h
> include/ibus-1.0/ibusconfigservice.h
> include/ibus-1.0/ibusdebug.h
>+include/ibus-1.0/ibusemoji.h
> include/ibus-1.0/ibusengine.h
> include/ibus-1.0/ibusenginedesc.h
> include/ibus-1.0/ibusenumtypes.h
>@@ -51,7 +52,7 @@
> %%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.514
>+lib/libibus-1.0.so.5.0.517
> %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.py
> %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc
> %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo
>@@ -163,11 +164,15 @@
> %%GCONF%%libexec/ibus-gconf
> %%DCONF%%libexec/ibus-dconf
> %%ENGINE%%libexec/ibus-engine-simple
>+libexec/ibus-portal
>+%%EMOJI%%libexec/ibus-ui-emojier
> man/man1/ibus-daemon.1.gz
> man/man1/ibus-setup.1.gz
> man/man1/ibus.1.gz
>+%%EMOJI%%man/man7/ibus-emoji.7.gz
> share/applications/ibus-setup.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
>@@ -210,7 +215,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeysyms-compat.html
> %%PORTDOCS%%%%DOCSDIR%%/ibus-ibusutil.html
> %%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
>-%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html
> %%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
> %%PORTDOCS%%%%DOCSDIR%%/ibus.devhelp2
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>@@ -225,7 +229,89 @@
> %%GCONF%%%%DATADIR%%/component/gconf.xml
> %%DCONF%%%%DATADIR%%/component/dconf.xml
> %%ENGINE%%%%DATADIR%%/component/simple.xml
>-%%EMOJI%%%%DATADIR%%/dicts/emoji.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-af.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-am.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ar.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-as.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-az.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-be.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-bg.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-bn.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-bs.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ca.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-cs.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-cy.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-da.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-de.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-de_CH.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-el.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-en.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-en_001.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-es.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-es_419.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-et.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-eu.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-fa.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-fi.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-fil.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-fr.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ga.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-gl.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-gu.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-he.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-hi.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-hr.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-hu.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-hy.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-id.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-is.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-it.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ja.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ka.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-kk.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-km.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-kn.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ko.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ky.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-lo.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-lt.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-lv.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-mk.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ml.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-mn.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-mr.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ms.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-my.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-nb.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ne.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-nl.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-or.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-pa.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-pl.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-pt.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-pt_PT.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ro.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-root.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ru.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-si.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sk.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sl.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sq.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sr.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sr_Latn.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sv.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-sw.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ta.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-te.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-th.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-tr.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-uk.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-ur.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-uz.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-vi.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-zh.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-zh_Hant.dict
>+%%EMOJI%%%%DATADIR%%/dicts/emoji-zu.dict
> %%DATADIR%%/keymaps/common
> %%DATADIR%%/keymaps/in
> %%DATADIR%%/keymaps/jp
>@@ -232,6 +318,9 @@
> %%DATADIR%%/keymaps/kr
> %%DATADIR%%/keymaps/modifiers
> %%DATADIR%%/keymaps/us
>+%%DATADIR%%/setup/emojilang.py
>+%%DATADIR%%/setup/emojilang.pyc
>+%%DATADIR%%/setup/emojilang.%%PYTHON_PYOEXTENSION%%
> %%DATADIR%%/setup/engineabout.py
> %%DATADIR%%/setup/engineabout.pyc
> %%DATADIR%%/setup/engineabout.pyo
>@@ -272,6 +361,7 @@
> %%NLS%%share/locale/bn_IN/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/bg/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/ca/LC_MESSAGES/ibus10.mo
>+%%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/en_GB/LC_MESSAGES/ibus10.mo
>@@ -279,6 +369,7 @@
> %%NLS%%share/locale/et/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/eu/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/fa/LC_MESSAGES/ibus10.mo
>+%%NLS%%share/locale/fi/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/gu/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/he/LC_MESSAGES/ibus10.mo
>@@ -291,6 +382,7 @@
> %%NLS%%share/locale/ko/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/lv/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/ml/LC_MESSAGES/ibus10.mo
>+%%NLS%%share/locale/mn/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/mr/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/nb/LC_MESSAGES/ibus10.mo
>@@ -299,8 +391,10 @@
> %%NLS%%share/locale/pl/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/pt_BR/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/ibus10.mo
>+%%NLS%%share/locale/sq/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/sr/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/sr@latin/LC_MESSAGES/ibus10.mo
>+%%NLS%%share/locale/sv/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/ta/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/te/LC_MESSAGES/ibus10.mo
> %%NLS%%share/locale/tg/LC_MESSAGES/ibus10.mo

Flags:

yuri: maintainer-approval?

Actions: View | Diff

Attachments on bug 223549: 187873 | 188472 | 188483