Index: head/textproc/ibus/Makefile =================================================================== --- head/textproc/ibus/Makefile (revision 567890) +++ head/textproc/ibus/Makefile (revision 567891) @@ -1,128 +1,127 @@ # Created by: Henry Hu # $FreeBSD$ PORTNAME= ibus -PORTVERSION= 1.5.23 -PORTREVISION= 2 +PORTVERSION= 1.5.24 CATEGORIES= textproc MAINTAINER= henry.hu.sh@gmail.com COMMENT= Intelligent Input Bus for Linux / Unix OS LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ gtkdocize:textproc/gtk-doc \ bash:shells/bash RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${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: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 .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes .endif .if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MGCONF} || ${PORT_OPTIONS:MDCONF} PLIST_SUB+= COMPDIR="" .else PLIST_SUB+= COMPDIR="@comment " .endif pre-configure: cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart ${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart do-test: ${MAKE} -C ${WRKSRC}/src/tests check .include Index: head/textproc/ibus/distinfo =================================================================== --- head/textproc/ibus/distinfo (revision 567890) +++ head/textproc/ibus/distinfo (revision 567891) @@ -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 Index: head/textproc/ibus/files/patch-ui_gtk3_application.vala =================================================================== --- head/textproc/ibus/files/patch-ui_gtk3_application.vala (revision 567890) +++ head/textproc/ibus/files/patch-ui_gtk3_application.vala (nonexistent) @@ -1,20 +0,0 @@ ---- ui/gtk3/application.vala.orig 2020-02-21 12:43:01 UTC -+++ ui/gtk3/application.vala -@@ -69,7 +69,7 @@ class Application { - } - - private void bus_name_acquired_cb(DBusConnection connection, -- string sender_name, -+ string? sender_name, - string object_path, - string interface_name, - string signal_name, -@@ -80,7 +80,7 @@ class Application { - } - - private void bus_name_lost_cb(DBusConnection connection, -- string sender_name, -+ string? sender_name, - string object_path, - string interface_name, - string signal_name, Property changes on: head/textproc/ibus/files/patch-ui_gtk3_application.vala ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/ibus/pkg-message =================================================================== --- head/textproc/ibus/pkg-message (revision 567890) +++ head/textproc/ibus/pkg-message (revision 567891) @@ -1,55 +1,53 @@ [ { type: install message: <