From 6cc2ea7b02da4474f146693ae1b7db82686ab2f7 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
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/options.mk | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'inputmethod/uim/options.mk')

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