Date: Sun, 26 Feb 2017 08:54:34 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434850 - head/textproc/ibus Message-ID: <201702260854.v1Q8sYci013495@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Feb 26 08:54:34 2017 New Revision: 434850 URL: https://svnweb.freebsd.org/changeset/ports/434850 Log: - Update textproc/ibus to 1.5.14 - Add EMOJI option - Convert to USES localbase - Use more option helpers PR: 216991 Submitted by: Henry Hu <henry.hu.sh@gmail.com> (maintainer) Approved by: maintainer Modified: head/textproc/ibus/Makefile head/textproc/ibus/distinfo head/textproc/ibus/pkg-plist Modified: head/textproc/ibus/Makefile ============================================================================== --- head/textproc/ibus/Makefile Sun Feb 26 08:41:24 2017 (r434849) +++ head/textproc/ibus/Makefile Sun Feb 26 08:54:34 2017 (r434850) @@ -2,10 +2,12 @@ # $FreeBSD$ PORTNAME= ibus -PORTVERSION= 1.5.11 -PORTREVISION= 1 +PORTVERSION= 1.5.14 CATEGORIES= textproc -MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT \ + https://raw.githubusercontent.com/Ranks/emojione/${EMOJIONE_TAG}/:emojione +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT +EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Intelligent Input Bus for Linux / Unix OS @@ -17,12 +19,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}db ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify \ - ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg \ ${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 pathfix pkgconfig python:2 +USES= compiler cpe gmake libtool localbase pathfix pkgconfig python:2 USE_GNOME= glib20 intltool librsvg2 pygobject3 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -30,13 +31,11 @@ INSTALLS_ICONS= yes OPTIONS_SUB= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-tests --with-html-dir=${PREFIX}/share/doc -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE +OPTIONS_DEFINE= NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE EMOJI OPTIONS_RADIO= CONFIG OPTIONS_RADIO_CONFIG= GCONF DCONF -OPTIONS_DEFAULT= GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE +OPTIONS_DEFAULT= GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE EMOJI GTK2_DESC= Install GTK2 client GTK3_DESC= Install GTK3 client and panel @@ -47,6 +46,7 @@ GCONF_DESC= Use GConf for configuration DCONF_DESC= Use dconf for configuration XIM_DESC= Install XIM server ENGINE_DESC= Install ibus simple engine +EMOJI_DESC= Install emoji dictionary CPE_VENDOR= ibus_project NLS_USES= gettext @@ -63,6 +63,7 @@ GTK3_LIBS= -lX11 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 @@ -74,9 +75,11 @@ PYTHON_LIB_CONFIGURE_ENABLE= python-libr GCONF_USE= GNOME=gconf2 GCONF_CONFIGURE_ENABLE= gconf +GCONF_VARS= GCONF_SCHEMAS=ibus.schemas DCONF_USE= GNOME=dconf,gconf2 DCONF_CONFIGURE_ENABLE= dconf +DCONF_VARS= GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml DOCS_CONFIGURE_ENABLE= gtk-doc-html @@ -84,11 +87,12 @@ XIM_CONFIGURE_ENABLE= xim ENGINE_CONFIGURE_ENABLE= engine -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MGINTRO) && !empty(PORT_OPTIONS:MVALA) -BROKEN= Vala bindings require GObject Introspection -.endif +EMOJIONE_TAG= ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7 +EMOJI_CONFIGURE_ON= --enable-emoji-dict \ + --with-emoji-json-file=${WRKSRC}/emoji.json +EMOJI_CONFIGURE_OFF= --disable-emoji-dict +EMOJI_BUILD_DEPENDS= json-glib>=0:devel/json-glib +EMOJI_DISTFILES= emoji.json:emojione .include <bsd.port.pre.mk> @@ -96,20 +100,15 @@ BROKEN= Vala bindings require GObject I USE_GCC= yes .endif -.if ${PORT_OPTIONS:MGCONF} -GCONF_SCHEMAS= ibus.schemas -.endif - -.if ${PORT_OPTIONS:MDCONF} -GLIB_SCHEMAS= org.freedesktop.ibus.gschema.xml -.endif - .if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MGCONF} || ${PORT_OPTIONS:MDCONF} PLIST_SUB+= COMPDIR="" .else PLIST_SUB+= COMPDIR="@comment " .endif +post-extract-EMOJI-on: + ${CP} ${DISTDIR}/emoji.json ${WRKSRC}/ + post-patch: ${REINPLACE_CMD} -e 's|/var/lib/dbus|/var/db/dbus|g' ${WRKSRC}/src/ibusshare.c Modified: head/textproc/ibus/distinfo ============================================================================== --- head/textproc/ibus/distinfo Sun Feb 26 08:41:24 2017 (r434849) +++ head/textproc/ibus/distinfo Sun Feb 26 08:54:34 2017 (r434850) @@ -1,2 +1,5 @@ -SHA256 (ibus-1.5.11.tar.gz) = 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc -SIZE (ibus-1.5.11.tar.gz) = 2177026 +TIMESTAMP = 1486792464 +SHA256 (ibus-1.5.14.tar.gz) = a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c +SIZE (ibus-1.5.14.tar.gz) = 2214350 +SHA256 (emoji.json) = 3e4792d6dc13f95b8e72b4cc5eb7d6088f64fc625682add33a6bbcc08bf76c4b +SIZE (emoji.json) = 448953 Modified: head/textproc/ibus/pkg-plist ============================================================================== --- head/textproc/ibus/pkg-plist Sun Feb 26 08:41:24 2017 (r434849) +++ head/textproc/ibus/pkg-plist Sun Feb 26 08:54:34 2017 (r434850) @@ -51,7 +51,7 @@ include/ibus-1.0/ibusenginesimple.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.511 +lib/libibus-1.0.so.5.0.514 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.py %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo @@ -167,6 +167,7 @@ man/man1/ibus-daemon.1.gz man/man1/ibus-setup.1.gz man/man1/ibus.1.gz share/applications/ibus-setup.desktop +share/dbus-1/services/org.freedesktop.IBus.service %%PORTDOCS%%%%DOCSDIR%%/IBusAttrList.html %%PORTDOCS%%%%DOCSDIR%%/IBusAttribute.html %%PORTDOCS%%%%DOCSDIR%%/IBusBus.html @@ -213,7 +214,6 @@ share/applications/ibus-setup.desktop %%PORTDOCS%%%%DOCSDIR%%/api-index-full.html %%PORTDOCS%%%%DOCSDIR%%/ibus.devhelp2 %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/index.sgml %%PORTDOCS%%%%DOCSDIR%%/left.png %%PORTDOCS%%%%DOCSDIR%%/right.png %%PORTDOCS%%%%DOCSDIR%%/style.css @@ -225,6 +225,7 @@ share/applications/ibus-setup.desktop %%GCONF%%%%DATADIR%%/component/gconf.xml %%DCONF%%%%DATADIR%%/component/dconf.xml %%ENGINE%%%%DATADIR%%/component/simple.xml +%%EMOJI%%%%DATADIR%%/dicts/emoji.dict %%DATADIR%%/keymaps/common %%DATADIR%%/keymaps/in %%DATADIR%%/keymaps/jp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702260854.v1Q8sYci013495>