From 1ef73a86c9222b7f3f223d6ffd0e313f1663b32e Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 2 Mar 2008 01:57:37 +0000 Subject: Update uim to 1.4.2. Based on patch provided by Yamashiro Jun in PR 38097. Pkgsrc changes: * Add build option: "kde". (This option enable KDE panel applet) * Change MASTER_SITES and HOMEPAGE for new site. * Marked as DSTDIR ready. Overview of changes from 1.4.1 to 1.4.2 == * Fixed - uim Scheme library - Fix memory alignment of symbol name, which can be a problem with jemalloc in FreeBSD 7 and Firefox 3 - Fix string buffer usage - Fix possible memory leak - Fix compilation on Mac OS X 10.5 - Support OpenBSD PowerPC and x86_64 in libgcroots - libuim - Fix leak in file descriptors when uim-helper-server is not working (Christian Biere) - uim-prime - Handle unix domain socket timeout - uim-m17nlib - Fix listing incomplete IMs - Japanese composition table - Fix fullwidth middle dot in halfwidth katakana table for Japanese kana-keyboard - GTK+ bridge - Fix token buffer usage of X11 Compose - Fix freeing strings allocated by glib - Qt bridge - Fix token buffer usage of X11 Compose - XIM bridge - Fix token buffer usage of X11 Compose - Fix compilation with GCC-4.3 - uim-toolbar-gtk-systray - Adjust focus padding in systray Overview of changes from 1.4.0 to 1.4.1 == * Fixed - libuim - Fix crash in a context using toggled IM when updating the custom setting by uim-pref - Anthy, Canna, Mana - Fix crash with Kana input mode - Fix crash upon converting a preedit string into alphanumeric characters - Pinyin (Simplified, Unicode, Traditional) - Fix crash upon selecting a candidate with numeric keys - uim Scheme library - Support SIOD compatible behavior with syntax 'if' - Fix compilation in qt directory with --disable-nls option Overview of changes from 1.4.0-beta to 1.4.0 == * Fixed - Fix the license terms of replace/strsep.c and replace/setenv.c accidencially mis-modified in r790 - libuim - Fix unimplemented return value of uim_input_string() - Fix uneffected --disable-nls - uim Scheme library - Fix lacking heap preallocation for heavy job. This makes uim-pref startup faster Overview of changes from 1.4.0-alpha to 1.4.0-beta == * Fixed - XIM bridge - Startup error of uim-xim due to the 1.3.x-incompatible behavior of uim_scm_symbol_value() - libuim - Fix corrupted return value by uim_scm_return_value() after uim_scm_eval() - uim-sh - Fix broken 'uim-sh -B' error handling - Fix broken backtrace printing - Broken compilation on SPARC and IA-64 (NIIBE Yutaka) - Suppress warnings Overview of changes from 1.3.x to 1.4.0-alpha == * New features - libuim - The modified version of SIOD interpreter has been replaced with SigScheme 0.7.2 * Fixed - [CRITICAL] Fix GC crash on SPARC, IA-64, m68k, and possibly MIPS, Alpha, by introduction of libgcroots --- inputmethod/uim/Makefile | 46 ++++++++++++++++++++++++++----------------- inputmethod/uim/PLIST | 12 ++++++----- inputmethod/uim/buildlink3.mk | 6 +++--- inputmethod/uim/distinfo | 9 +++++---- inputmethod/uim/options.mk | 18 ++++++++++++----- 5 files changed, 56 insertions(+), 35 deletions(-) (limited to 'inputmethod') diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index dd39394e10b..91e38019e8c 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:56 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2008/03/02 01:57:37 obache Exp $ # -DISTNAME= uim-1.3.1 -PKGREVISION= 1 +DISTNAME= uim-1.4.2 CATEGORIES= inputmethod -MASTER_SITES= http://uim.freedesktop.org/releases/ +MASTER_SITES= http://uim.googlecode.com/files/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= VEG03617@nifty.com -HOMEPAGE= http://uim.freedesktop.org/wiki/ +HOMEPAGE= http://code.google.com/p/uim/ COMMENT= Multilingual input method library +PKG_DESTDIR_SUPPORT= user-destdir + USE_DIRS+= xdg-1.1 USE_LIBTOOL= YES -USE_NCURSES= yes # clear_screen, clr_eos +USE_NCURSES= YES # clear_screen, clr_eos USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake intltool pkg-config USE_LANGUAGES= c c++ @@ -21,25 +22,34 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in GNU_CONFIGURE= YES GTK2_IMMODULES= YES CONFIGURE_ARGS+= --disable-emacs +CONFIGURE_ARGS+= --with-libgcroots=installed + +# Avoid to install internal sigscheme's header & library with patch-aa. +# It conflict with lang/sigscheme. +BUILD_DIRS= sigscheme . +INSTALL_DIRS= . .include "options.mk" post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/DOT-UIM ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-CANDWIN ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-PROTOCOL ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${PREFIX}/share/doc/uim - ${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${PREFIX}/share/doc/uim - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uim/uim-fep - ${INSTALL_DATA} ${WRKSRC}/fep/README ${PREFIX}/share/doc/uim/uim-fep - ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${PREFIX}/share/doc/uim/uim-fep + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/doc/DOT-UIM ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-CANDWIN ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/doc/HELPER-PROTOCOL ${DESTDIR}${PREFIX}/share/doc/uim + ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DESTDIR}${PREFIX}/share/doc/uim + ${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 + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep + ${INSTALL_DATA} ${WRKSRC}/fep/README ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep + ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libgcroots/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST index d495cc5f415..5b6e8e38805 100644 --- a/inputmethod/uim/PLIST +++ b/inputmethod/uim/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2007/01/20 16:56:43 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/03/02 01:57:37 obache Exp $ ${QT}bin/uim-chardict-qt ${UIM_DICT_GTK}bin/uim-dict-gtk bin/uim-fep @@ -22,10 +22,10 @@ include/uim/uim-im-switcher.h include/uim/uim-scm.h include/uim/uim-util.h include/uim/uim.h -${GTK}lib/gtk-2.0/2.10.0/immodules/im-uim.la -${QT}lib/kde3/uim_panelapplet.la lib/libuim-custom.la lib/libuim.la +${GTK}lib/gtk-2.0/2.10.0/immodules/im-uim.la +${KDE}lib/kde3/uim_panelapplet.la lib/pkgconfig/uim.pc ${ANTHY}lib/uim/plugin/libuim-anthy.la ${CANNA}lib/uim/plugin/libuim-canna.la @@ -36,6 +36,8 @@ ${QT}libexec/uim-candwin-qt libexec/uim-helper-server man/man1/uim-xim.1 share/applications/uim.desktop +share/doc/uim/COMPATIBILITY +share/doc/uim/CUSTOM share/doc/uim/DOT-UIM share/doc/uim/HELPER-CANDWIN share/doc/uim/HELPER-PROTOCOL @@ -48,9 +50,9 @@ share/doc/uim/uim-fep/README share/doc/uim/uim-fep/README.ja share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo -${QT}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo -${QT}share/kde/apps/kicker/applets/uimapplet.desktop share/locale/ko/LC_MESSAGES/uim.mo +${QT}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo +${KDE}share/kde/apps/kicker/applets/uimapplet.desktop share/uim/action.scm share/uim/anthy-custom.scm share/uim/anthy-key-custom.scm diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk index e5c1c5f81ac..909f4ad9fb3 100644 --- a/inputmethod/uim/buildlink3.mk +++ b/inputmethod/uim/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/08/05 18:49:29 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2008/03/02 01:57:37 obache Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ UIM_BUILDLINK3_MK:= ${UIM_BUILDLINK3_MK}+ @@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= uim BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}uim .if !empty(UIM_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.uim+= uim>=0.4.6 -BUILDLINK_ABI_DEPENDS.uim?= uim>=1.2.0 +BUILDLINK_API_DEPENDS.uim+= uim>=1.4.2 +BUILDLINK_ABI_DEPENDS.uim?= uim>=1.4.2 BUILDLINK_PKGSRCDIR.uim?= ../../inputmethod/uim .endif # UIM_BUILDLINK3_MK diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo index 1b0abbbed3f..a29ab80a4a2 100644 --- a/inputmethod/uim/distinfo +++ b/inputmethod/uim/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2007/01/20 16:56:43 wiz Exp $ +$NetBSD: distinfo,v 1.13 2008/03/02 01:57:37 obache Exp $ -SHA1 (uim-1.3.1.tar.bz2) = a596b5f9a3f5d7b2470b430601fbfa0c10a1c6dc -RMD160 (uim-1.3.1.tar.bz2) = e2c34afd0193e91659cb72f047bc0d29ce7cbea8 -Size (uim-1.3.1.tar.bz2) = 1658713 bytes +SHA1 (uim-1.4.2.tar.bz2) = 2ece459ac14e95b2bb2be6135c1a134354dcef09 +RMD160 (uim-1.4.2.tar.bz2) = 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 +Size (uim-1.4.2.tar.bz2) = 2723523 bytes +SHA1 (patch-aa) = f94187c44a5f6823aa77514e5087093f8148808a diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index 3668f65427b..4b8771564f3 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.10 2007/01/20 16:56:43 wiz Exp $ +# $NetBSD: options.mk,v 1.11 2008/03/02 01:57:37 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim -PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt +PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt kde PKG_SUGGESTED_OPTIONS= anthy canna gtk .include "../../mk/bsd.options.mk" @@ -45,15 +45,23 @@ CONFIGURE_ARGS+= --without-gtk2 PLIST_SUBST+= GTK="@comment " .endif -.if !empty(PKG_OPTIONS:Mqt) -. include "../../x11/kdelibs3/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) . include "../../x11/qt3-libs/buildlink3.mk" BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc -# Not worked this option. need immodule patch for Qt3 +# This option don't work. Need immodule patch for Qt3(uim-1.4.x not support Qt4) #CONFIGURE_ARGS+= --with-qt-immodule PLIST_SUBST+= HELPERDATA= PLIST_SUBST+= QT= .else PLIST_SUBST+= QT="@comment " .endif + +.if !empty(PKG_OPTIONS:Mkde) +. include "../../x11/kdelibs3/buildlink3.mk" +. include "../../x11/qt3-libs/buildlink3.mk" +CONFIGURE_ARGS+= --enable-kde-applet=yes +PLIST_SUBST+= KDE= +.else +PLIST_SUBST+= KDE="@comment " +.endif -- cgit v1.2.3