diff options
author | obache <obache> | 2011-05-29 06:13:57 +0000 |
---|---|---|
committer | obache <obache> | 2011-05-29 06:13:57 +0000 |
commit | 21b73e10887c29b327c29d42a36a3e0e82874ccc (patch) | |
tree | 27bd9d0e693fb4153b15337c2da210a5e87b172e | |
parent | 77d48a62af76429d569aee674c7f290fddc90f1b (diff) | |
download | pkgsrc-21b73e10887c29b327c29d42a36a3e0e82874ccc.tar.gz |
Update uim to 1.7.0.
Based on PR#44989 by YAMASHIRO, Jun. add a missing PLIST entry.
Overview of changes from 1.7.0-alpha to 1.7.0
=============================================
* Fixes
- Generic IM
* Fix sort order of Wubi86 and Zhengma tables in 1.7.0-alpha
- GTK+3 bridge
* Avoid repeated changes of subwindow size in some annotation text
Overview of changes from 1.6.x to 1.7.0-alpha
=============================================
* New features
- GTK+3 bridge
- uim-candwin-gtk3
- uim-candwin-tbl-gtk3
- uim-dict-gtk3
- uim-im-switcher-gtk3
- uim-input-pad-ja-gtk3
- uim-pref-gtk3
- uim-toolbar-gtk3
- uim-toolbar-gtk3-systray
* Support GTK+3
- uim-toolbar-applet-gnome3
* Support GNOME3
* Fixes
- uim Scheme library
* Fix im-acquire-text brokeness
- uim-toolbar-qt4
* Fix bug: Can't set starting position of Qt4 toolbar (#34034)
- uim-notify
* Fix compilation with libnotify >= 0.7.0
- uim-tutcode
* Fix behavior with interactive bushu conversion
- uim-skk
* Fix crash upon an illegal line in SKK dictionary
- Emacs bridge
* Don't disturb other leim's modelines (#35318)
- Qt4 bridge
* Fix crash of applications upon exit when widget style of
QGtkStyle is used
- uim-dict-gtk
* Fix a minor bug
* Enhancements
- uim-tutcode
* Postfix mazegaki conversion
* Postfix bushu conversion
* Add inflection support for postfix and prefix mazegaki conversion
* Kanji code (JIS/Kuten/Unicode) input mode
* History input mode
- libuim
* Support locale with EUC-JIS-2004 and EUC-JISX0213 encodings
- generic-predict
* Add support for completion with Google Suggest
* Others
- GTK+2 bridge
* Discard support for version below 2.14.
-rw-r--r-- | inputmethod/uim-elisp/Makefile | 3 | ||||
-rw-r--r-- | inputmethod/uim/Makefile | 3 | ||||
-rw-r--r-- | inputmethod/uim/Makefile.common | 4 | ||||
-rw-r--r-- | inputmethod/uim/PLIST | 15 | ||||
-rw-r--r-- | inputmethod/uim/distinfo | 8 | ||||
-rw-r--r-- | inputmethod/uim/options.mk | 35 |
6 files changed, 51 insertions, 17 deletions
diff --git a/inputmethod/uim-elisp/Makefile b/inputmethod/uim-elisp/Makefile index f347b36ff75..5db0f9f2362 100644 --- a/inputmethod/uim-elisp/Makefile +++ b/inputmethod/uim-elisp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2011/04/22 13:43:58 obache Exp $ +# $NetBSD: Makefile,v 1.6 2011/05/29 06:13:57 obache Exp $ .include "../../inputmethod/uim/Makefile.common" PKGNAME= ${EMACS_PKGNAME_PREFIX}uim-elisp-${UIM_VERSION} -PKGREVISION= 1 CATEGORIES= inputmethod editors COMMENT= Emacs LISP for inputmethod/uim diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index 9190fc4b510..0012f29d637 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2011/04/22 13:42:01 obache Exp $ +# $NetBSD: Makefile,v 1.49 2011/05/29 06:13:57 obache Exp $ # .include "../../inputmethod/uim/Makefile.common" -PKGREVISION= 1 COMMENT= Multilingual input method library CONFLICTS+= uim-qt4-immodule-[0-9]* diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common index ffa3d5cb82e..890cd605f52 100644 --- a/inputmethod/uim/Makefile.common +++ b/inputmethod/uim/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.5 2011/04/13 13:45:16 obache Exp $ +# $NetBSD: Makefile.common,v 1.6 2011/05/29 06:13:57 obache Exp $ # # used by inputmethod/uim/Makefile # used by inputmethod/uim-elisp/Makefile -UIM_VERSION= 1.6.1 +UIM_VERSION= 1.7.0 DISTNAME= uim-${UIM_VERSION} CATEGORIES= inputmethod MASTER_SITES= http://uim.googlecode.com/files/ diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST index c85de4382fc..e87529a7a3e 100644 --- a/inputmethod/uim/PLIST +++ b/inputmethod/uim/PLIST @@ -1,22 +1,28 @@ -@comment $NetBSD: PLIST,v 1.17 2011/04/13 13:45:16 obache Exp $ +@comment $NetBSD: PLIST,v 1.18 2011/05/29 06:13:57 obache Exp $ ${PLIST.qt3}bin/uim-chardict-qt ${PLIST.qt}bin/uim-chardict-qt4 ${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 bin/uim-help ${PLIST.gtk}bin/uim-im-switcher-gtk +${PLIST.gtk3}bin/uim-im-switcher-gtk3 ${PLIST.qt3}bin/uim-im-switcher-qt ${PLIST.qt}bin/uim-im-switcher-qt4 ${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 ${PLIST.qt3}bin/uim-pref-qt ${PLIST.qt}bin/uim-pref-qt4 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.qt3}bin/uim-toolbar-qt ${PLIST.qt}bin/uim-toolbar-qt4 ${PLIST.xim}bin/uim-xim @@ -32,6 +38,7 @@ include/uim/uim-util.h include/uim/uim.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 ${PLIST.kde3}lib/kde3/uim_panelapplet.la ${PLIST.kde}lib/kde4/uim_panelapplet.la lib/libuim-custom.la @@ -57,11 +64,14 @@ lib/uim/plugin/libuim-skk.la lib/uim/plugin/libuim-socket.la ${PLIST.wnn}lib/uim/plugin/libuim-wnn.la ${PLIST.gtk}libexec/uim-candwin-gtk +${PLIST.gtk3}libexec/uim-candwin-gtk3 ${PLIST.qt3}libexec/uim-candwin-qt ${PLIST.qt}libexec/uim-candwin-qt4 ${PLIST.gtk}libexec/uim-candwin-tbl-gtk +${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3 libexec/uim-helper-server ${PLIST.gnome}libexec/uim-toolbar-applet +${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3 ${PLIST.xim}man/man1/uim-xim.1 ${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la share/applications/uim.desktop @@ -129,7 +139,7 @@ share/uim/hangul.scm share/uim/hangul2.scm share/uim/hangul3.scm ${PLIST.helperdata}share/uim/helperdata/bushu.t -${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml +${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 @@ -337,6 +347,7 @@ share/uim/pixmaps/zm_dark_background.png share/uim/pixmaps/zm_dark_background.svg share/uim/plugin.scm share/uim/predict-custom.scm +share/uim/predict-google-suggest.scm share/uim/predict-look-skk.scm share/uim/predict-look.scm share/uim/predict-sqlite3.scm diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo index 72cf3e797ba..3d1c180e124 100644 --- a/inputmethod/uim/distinfo +++ b/inputmethod/uim/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.18 2011/04/13 13:45:16 obache Exp $ +$NetBSD: distinfo,v 1.19 2011/05/29 06:13:57 obache Exp $ -SHA1 (uim-1.6.1.tar.bz2) = 412bb2df6041185084e2f64fb73357389bf992b5 -RMD160 (uim-1.6.1.tar.bz2) = 26c4e30f59c8eb005189d6778333079c81f8489c -Size (uim-1.6.1.tar.bz2) = 6192431 bytes +SHA1 (uim-1.7.0.tar.bz2) = b79ed80c2557e804e6d3d2771a213a29cd932a73 +RMD160 (uim-1.7.0.tar.bz2) = e866f4270e60d0590a0a37331f3ccf64d7e48fbf +Size (uim-1.7.0.tar.bz2) = 6402469 bytes SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791 diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index 96bd6ff9201..92e66630ae6 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.23 2011/04/13 13:45:16 obache Exp $ +# $NetBSD: options.mk,v 1.24 2011/05/29 06:13:57 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim -#PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep wnn xim -PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep xim +#PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn xim +PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep xim PKG_OPTIONS_OPTIONAL_GROUPS= kde qt PKG_OPTIONS_GROUP.kde= kde kde3 PKG_OPTIONS_GROUP.qt= qt qt3 @@ -21,8 +21,8 @@ PKG_FAIL_REASON+= "'qt3' conflict with 'qt' or 'kde' option" . endif .endif -PLIST_VARS+= helperdata uim-dict-gtk fep -PLIST_VARS+= anthy curl eb expat ffi gnome gtk kde kde3 m17nlib openssl qt qt3 sqlite wnn xim +PLIST_VARS+= helperdata uim-dict-gtk uim-dict-gtk3 uim-dict-helperdata fep +PLIST_VARS+= anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 m17nlib openssl qt qt3 sqlite wnn xim .if !empty(PKG_OPTIONS:Mxim) .include "../../x11/libX11/buildlink3.mk" @@ -100,6 +100,14 @@ PLIST.gnome= yes CONFIGURE_ARGS+= --disable-gnome-applet .endif +# No gnome3 packages +#.if !empty(PKG_OPTIONS:Mgnome3) +#. include "../../x11/gnome-panel/buildlink3.mk" +#. include "../../devel/libgnomeui/buildlink3.mk" +#CONFIGURE_ARGS+= --enable-gnome3-applet +#PLIST.gnome3= yes +#.endif + .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) GTK2_IMMODULES= YES .include "../../x11/gtk2/modules.mk" @@ -110,11 +118,26 @@ PLIST.gtk= yes . endif CONFIGURE_ARGS+= --enable-dict PLIST.uim-dict-gtk= yes +PLIST.uim-dict-helperdata= yes . endif .else CONFIGURE_ARGS+= --without-gtk2 .endif +.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3) +GTK3_IMMODULES= YES +.include "../../x11/gtk3/modules.mk" +PLIST.gtk3= yes +. if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna) +. if !empty(PKG_OPTIONS:Mcanna) +. include "../../inputmethod/canna-lib/buildlink3.mk" +. endif +CONFIGURE_ARGS+= --enable-dict +PLIST.uim-dict-gtk3= yes +PLIST.uim-dict-helperdata= yes +. endif +.endif + .if !empty(PKG_OPTIONS:Mkde3) . include "../../x11/kdelibs3/buildlink3.mk" . include "../../x11/qt3-libs/buildlink3.mk" @@ -191,6 +214,8 @@ PLIST.sqlite= yes .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) CONFIGURE_ARGS+= --enable-default-toolkit=gtk +.elif !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3) +CONFIGURE_ARGS+= --enable-default-toolkit=gtk3 .elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) CONFIGURE_ARGS+= --enable-default-toolkit=qt4 .elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3) |