[pkgsrc/trunk]: pkgsrc/inputmethod/uim uim: Update to 1.8.8

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/inputmethod/uim uim: Update to 1.8.8
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:14:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e373283cd91
branches:  trunk
changeset: 403755:1e373283cd91
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Nov 01 16:21:11 2019 +0000

description:
uim: Update to 1.8.8

Overview of changes from 1.8.7 to 1.8.8
=======================================
* Fixes
  - build
    * Fix a build error with --with-libgcroots=installed
      [GitHub #130][Reported by HIGUCHI Daisuke]
  - uim-qt5
    * Fix a build error
      [GitHub #129][Reported by HIGUCHI Daisuke]

Overview of changes from 1.8.6 to 1.8.7
=======================================
* Fixes
  - uim-skk
    * Fix a socket clean bug
      [GitHub #32][Reported by HIGUCHI Daisuke]
    * Fix wrong close call
      [GitHub #55][Patch by zephyrus00jp]
  - uim-qt4
    * Add a missing include
      [GitHub #38][Patch by Raphael Kubo da Costa]
  - uim.el
    * Fix a bug that other minor mode key bindings are ignored on Emacs 24
      [GitHub #51][Reported by Araeos]
    * Fix a bug that Shift+Arrow doesn't work
      [GitHub #116][Reported by Vladimir Panteleev]
  - uim-gtk3
    * Fix a bug that the candidate windows isn't shown
      [GitHub #76][Patch by Konosuke Watanab]

* Enhancements
  - all
    * Add "Keywords" to .desktop
      [GitHub #57][Patch by HIGUCHI Daisuke]
  - uim-gtk
    * Improve GTK+ 3 support
      [GitHub #35][Patch by e-kato]
    * Support libpanel-applet 3.14 or later
      [GitHub #48][Patch by Dmitry Shachnev]
    * Support Wayland backend
      [GitHub #71][Reported by Thibaut Girka]
  - uim-fep
    * Use UTF-8 for comment encoding
      [GitHub #46][Patch by Felix Janda]
  - uim-qt5
    * Make workable
  - uim-social-ime
    * Remove because the service was disruption
  - uim.el
    * Support autoload
      [GitHub #121][Patch by Arun Isaac]

diffstat:

 inputmethod/uim/DEINSTALL                               |    8 +
 inputmethod/uim/DEINSTALL.m17nlib                       |    8 -
 inputmethod/uim/INSTALL                                 |    8 +
 inputmethod/uim/INSTALL.m17nlib                         |    8 -
 inputmethod/uim/Makefile                                |   65 +++-
 inputmethod/uim/Makefile.common                         |   26 +-
 inputmethod/uim/PLIST                                   |   61 +---
 inputmethod/uim/PLIST.gtk2                              |   10 +
 inputmethod/uim/PLIST.gtk3                              |   10 +
 inputmethod/uim/PLIST.qt5                               |    2 +
 inputmethod/uim/distinfo                                |   24 +-
 inputmethod/uim/modules.mk                              |   16 +-
 inputmethod/uim/options.mk                              |  217 ++-------------
 inputmethod/uim/patches/patch-af                        |   16 -
 inputmethod/uim/patches/patch-configure.ac              |   15 +
 inputmethod/uim/patches/patch-fep_uim-fep.c             |   15 +
 inputmethod/uim/patches/patch-scm_Makefile.am           |    4 +-
 inputmethod/uim/patches/patch-sigscheme_configure.ac    |   15 +
 inputmethod/uim/patches/patch-sigscheme_configure.in    |   15 -
 inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am |   16 +-
 inputmethod/uim/patches/patch-uim_Makefile.am           |   11 +-
 inputmethod/uim/patches/patch-uim_uim-module-manager.c  |    4 +-
 22 files changed, 217 insertions(+), 357 deletions(-)

diffs (truncated from 864 to 300 lines):

diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/DEINSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/uim/DEINSTALL Fri Nov 01 16:21:11 2019 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: DEINSTALL,v 1.3 2019/11/01 16:21:11 nia Exp $
+case ${STAGE} in
+DEINSTALL)
+       for icon in ${PREFIX}/share/uim/pixmaps/m17n-*.png ; do
+               ${TEST} ! -h ${icon} || ${RM} -f ${icon}
+       done
+       ;;
+esac
diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/DEINSTALL.m17nlib
--- a/inputmethod/uim/DEINSTALL.m17nlib Fri Nov 01 15:22:31 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# $NetBSD: DEINSTALL.m17nlib,v 1.1 2009/10/01 12:30:32 obache Exp $
-case ${STAGE} in
-DEINSTALL)
-       for icon in ${PREFIX}/share/uim/pixmaps/m17n-*.png ; do
-               ${TEST} ! -h ${icon} || ${RM} -f ${icon}
-       done
-       ;;
-esac
diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/uim/INSTALL   Fri Nov 01 16:21:11 2019 +0000
@@ -0,0 +1,8 @@
+# $NetBSD: INSTALL,v 1.3 2019/11/01 16:21:11 nia Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+       ${TEST} ! -x ${PREFIX}/bin/uim-m17nlib-relink-icons ||
+               ${PREFIX}/bin/uim-m17nlib-relink-icons
+       ;;
+esac
diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/INSTALL.m17nlib
--- a/inputmethod/uim/INSTALL.m17nlib   Fri Nov 01 15:22:31 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# $NetBSD: INSTALL.m17nlib,v 1.1 2009/10/01 12:30:32 obache Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-       ${TEST} ! -x ${PREFIX}/bin/uim-m17nlib-relink-icons ||
-               ${PREFIX}/bin/uim-m17nlib-relink-icons
-       ;;
-esac
diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/Makefile
--- a/inputmethod/uim/Makefile  Fri Nov 01 15:22:31 2019 +0000
+++ b/inputmethod/uim/Makefile  Fri Nov 01 16:21:11 2019 +0000
@@ -1,34 +1,42 @@
-# $NetBSD: Makefile,v 1.153 2019/10/27 17:31:35 kamil Exp $
-#
+# $NetBSD: Makefile,v 1.154 2019/11/01 16:21:11 nia Exp $
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=           65
-COMMENT=               Multilingual input method library
-#LICENSE=              See ${WRKSRC}/COPYING
+COMMENT=       Multilingual input method library
+LICENSE=       modified-bsd
 
-CONFLICTS+=            uim-qt4-immodule-[0-9]*
+CONFLICTS+=    uim-qt4-immodule-[0-9]*
 
-USE_LIBTOOL=           YES
-USE_PKGLOCALEDIR=      YES
-USE_TOOLS+=            gmake intltool pkg-config msgfmt
-USE_LANGUAGES=         c99 c++03
-PKGCONFIG_OVERRIDE+=   ${WRKSRC}/uim.pc.in
-GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --disable-emacs
-CONFIGURE_ARGS+=       --disable-kde4-applet
-CONFIGURE_ARGS+=       --with-libgcroots=installed
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
+GNU_CONFIGURE= YES
+USE_LIBTOOL=   YES
 
-BUILDLINK_TRANSFORM+=  rm:-O2
+USE_TOOLS+=    gmake pkg-config
+USE_TOOLS+=    intltool msgfmt msgmerge xgettext
+USE_LANGUAGES= c99 c++03
+
+# Avoid finding mono tool and breaking.
+MAKE_FLAGS+=   CSI=
 
 LDFLAGS.SunOS+=        -mimpure-text
 CFLAGS.SunOS+= -D__EXTENSIONS__
 
-.include "options.mk"
+UIM_MODULES=   anthy-utf8 skk tutcode byeoru latin elatin xmload \
+               pyload py pyunihan viqr ipa-x-sampa look ajax-ime \
+               google-cgiapi-jp baidu-olime-jp
+
+BUILD_DEFS+=   PKG_SYSCONFBASE
 
-PKG_SYSCONFSUBDIR=     uim
-INSTALLATION_DIRS+=    share/doc/uim
+CONFIGURE_ARGS+=       --disable-emacs
+CONFIGURE_ARGS+=       --disable-fep
+CONFIGURE_ARGS+=       --disable-kde4-applet
+CONFIGURE_ARGS+=       --disable-gnome-applet
+CONFIGURE_ARGS+=       --disable-gnome3-applet
+CONFIGURE_ARGS+=       --with-libgcroots=installed
+CONFIGURE_ARGS+=       --with-anthy-utf8
+CONFIGURE_ARGS+=       --with-sqlite3
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
+
+PKGCONFIG_OVERRIDE+=   ${WRKSRC}/uim.pc.in
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples
 
@@ -38,6 +46,9 @@
 CONF_FILES+=           ${EGDIR}/installed-modules.scm \
                        ${PKG_SYSCONFDIR}/installed-modules.scm
 
+PKG_SYSCONFSUBDIR=     uim
+INSTALLATION_DIRS+=    share/doc/uim
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
        ${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
@@ -49,11 +60,21 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
        ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
        ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
-_BUILDING_UIM= YES
+
+.include "options.mk"
+
+SUBST_CLASSES+=                gtk
+SUBST_STAGE.gtk=       post-configure
+SUBST_MESSAGE.gtk=     Correcting executable name in .desktop file
+SUBST_FILES.gtk+=      uim.desktop
+SUBST_SED.gtk+=                -e "s,uim-pref-gtk,${UIM_PREF_PROGRAM},g"
+
 .include "modules.mk"
-
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgcroots+=     libgcroots>=0.2.3
 .include "../../devel/libgcroots/buildlink3.mk"
+.include "../../inputmethod/anthy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/Makefile.common
--- a/inputmethod/uim/Makefile.common   Fri Nov 01 15:22:31 2019 +0000
+++ b/inputmethod/uim/Makefile.common   Fri Nov 01 16:21:11 2019 +0000
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile.common,v 1.13 2015/12/26 02:13:46 mef Exp $
+# $NetBSD: Makefile.common,v 1.14 2019/11/01 16:21:11 nia Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=           1.8.6
-DISTNAME=              uim-${UIM_VERSION}
-CATEGORIES=            inputmethod
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=uim/}
-GITHUB_RELEASE=                ${DISTNAME}
-EXTRACT_SUFX=          .tar.bz2
+DISTNAME=      uim-1.8.8
+CATEGORIES=    inputmethod
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=uim/}
+GITHUB_RELEASE=        ${DISTNAME:S/^uim-//1}
+EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=            VEG03617%nifty.com@localhost
-HOMEPAGE=              https://github.com/uim/uim/wiki
+MAINTAINER=    VEG03617%nifty.com@localhost
+HOMEPAGE=      https://github.com/uim/uim/wiki
 
-DISTINFO_FILE=         ${.CURDIR}/../../inputmethod/uim/distinfo
-PATCHDIR=              ${.CURDIR}/../../inputmethod/uim/patches
+DISTINFO_FILE= ${.CURDIR}/../../inputmethod/uim/distinfo
+PATCHDIR=      ${.CURDIR}/../../inputmethod/uim/patches
 
-USE_TOOLS+=            automake
+USE_TOOLS+=    autoreconf autoconf automake
 
 pre-configure:
-       set -e; cd ${WRKSRC}; \
-       aclocal -I m4; autoheader; automake -a --foreign -i; autoconf
+       cd ${WRKSRC} && ${SH} autogen.sh
diff -r 140b5c12a6a3 -r 1e373283cd91 inputmethod/uim/PLIST
--- a/inputmethod/uim/PLIST     Fri Nov 01 15:22:31 2019 +0000
+++ b/inputmethod/uim/PLIST     Fri Nov 01 16:21:11 2019 +0000
@@ -1,23 +1,8 @@
-@comment $NetBSD: PLIST,v 1.26 2019/10/27 17:31:35 kamil Exp $
-${PLIST.uim-dict-gtk}bin/uim-dict-gtk
-${PLIST.uim-dict-gtk3}bin/uim-dict-gtk3
-${PLIST.fep}bin/uim-fep
-${PLIST.fep}bin/uim-fep-tick
+@comment $NetBSD: PLIST,v 1.27 2019/11/01 16:21:11 nia Exp $
 bin/uim-help
-${PLIST.gtk}bin/uim-im-switcher-gtk
-${PLIST.gtk3}bin/uim-im-switcher-gtk3
-${PLIST.gtk}bin/uim-input-pad-ja
-${PLIST.gtk3}bin/uim-input-pad-ja-gtk3
-${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
 bin/uim-module-manager
-${PLIST.gtk}bin/uim-pref-gtk
-${PLIST.gtk3}bin/uim-pref-gtk3
 bin/uim-sh
-${PLIST.gtk}bin/uim-toolbar-gtk
-${PLIST.gtk}bin/uim-toolbar-gtk-systray
-${PLIST.gtk3}bin/uim-toolbar-gtk3
-${PLIST.gtk3}bin/uim-toolbar-gtk3-systray
-${PLIST.xim}bin/uim-xim
+bin/uim-xim
 include/uim/dynlib.h
 include/uim/uim-custom.h
 include/uim/uim-helper.h
@@ -29,41 +14,23 @@
 include/uim/uim-util.h
 include/uim/uim.h
 include/uim/version.h
-${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
-${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
-${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
 lib/pkgconfig/uim.pc
-${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
-${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
-${PLIST.curl}lib/uim/plugin/libuim-curl.la
+lib/uim/plugin/libuim-anthy-utf8.la
+lib/uim/plugin/libuim-anthy.la
 lib/uim/plugin/libuim-custom-enabler.la
-${PLIST.eb}lib/uim/plugin/libuim-eb.la
-${PLIST.editline}lib/uim/plugin/libuim-editline.la
-${PLIST.expat}lib/uim/plugin/libuim-expat.la
-${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
 lib/uim/plugin/libuim-fileio.la
 lib/uim/plugin/libuim-lolevel.la
 lib/uim/plugin/libuim-look.la
-${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
-${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
 lib/uim/plugin/libuim-process.la
 lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-socket.la
-${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la
-${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
-${PLIST.gtk}libexec/uim-candwin-gtk
-${PLIST.gtk3}libexec/uim-candwin-gtk3
-${PLIST.gtk}libexec/uim-candwin-horizontal-gtk
-${PLIST.gtk3}libexec/uim-candwin-horizontal-gtk3
-${PLIST.gtk}libexec/uim-candwin-tbl-gtk
-${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3
+lib/uim/plugin/libuim-sqlite3.la
+lib/uim/plugin/libuim-xkb.la
 libexec/uim-helper-server
-${PLIST.gnome}libexec/uim-toolbar-applet
-${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3
-${PLIST.xim}man/man1/uim-xim.1
+man/man1/uim-xim.1
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
@@ -75,8 +42,6 @@
 share/doc/uim/README
 share/doc/uim/UIM-SCM
 share/doc/uim/UIM-SH
-${PLIST.fep}share/doc/uim/uim-fep/README
-${PLIST.fep}share/doc/uim/uim-fep/README.ja
 share/examples/uim/installed-modules.scm
 share/examples/uim/loader.scm
 share/locale/fr/LC_MESSAGES/uim.mo
@@ -134,8 +99,6 @@
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
-${PLIST.helperdata}share/uim/helperdata/bushu.t
-${PLIST.uim-dict-helperdata}share/uim/helperdata/uim-dict-ui.xml
 share/uim/http-client.scm
 share/uim/http-server.scm
 share/uim/i18n.scm
@@ -185,7 +148,7 @@
 share/uim/pinyin-big5.scm
 share/uim/pixmaps/ajax-ime.png
 share/uim/pixmaps/ajax-ime.svg
-${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png
+share/uim/pixmaps/anthy-utf8.png
 share/uim/pixmaps/anthy.png
 share/uim/pixmaps/baidu-olime-jp.png
 share/uim/pixmaps/baidu-olime-jp.svg
@@ -309,8 +272,6 @@
 share/uim/pixmaps/skk.svg
 share/uim/pixmaps/skk_dark_background.png
 share/uim/pixmaps/skk_dark_background.svg
-share/uim/pixmaps/social-ime.png
-share/uim/pixmaps/social-ime.svg
 share/uim/pixmaps/tcode.png
 share/uim/pixmaps/tcode.svg
 share/uim/pixmaps/tcode_dark_background.png
@@ -363,7 +324,6 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/defaults options.description: add gnuplot option
Next by Date: [pkgsrc/trunk]: pkgsrc/www/c-icap-modules c-icap-modules: Avoid symbol clash ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/defaults options.description: add gnuplot option
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/c-icap-modules c-icap-modules: Avoid symbol clash ...
Indexes:
Home | Main Index | Thread Index | Old Index