Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24953/10.3/unstable/main/finkinfo/utils
Modified Files: uim.info Added Files: uim.patch Log Message: Version bumped. Index: uim.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/uim.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- uim.info 9 Nov 2006 00:37:00 -0000 1.8 +++ uim.info 11 May 2008 07:03:04 -0000 1.9 @@ -1,34 +1,58 @@ Package: uim -Version: 1.0.1 +Version: 1.4.2 Revision: 1 Depends: << - %N-shlibs (=%v-%r), x11, gtk+2, gtk+2-shlibs, glib2-shlibs, - pango1-xft2-shlibs, atk1-shlibs, libgettext3-shlibs, libiconv, + %N-shlibs (=%v-%r), x11, libgettext3-shlibs, libiconv, + %N-anthy (=%v-%r) | %N-canna (=%v-%r) | %N-skk (=%v-%r), xinitrc, libncurses5-shlibs << BuildDepends: << x11-dev, gtk+2-dev, glib2-dev, pango1-xft2-dev, atk1, libgettext3-dev, libiconv-dev, libncurses5, + anthy-dev, canna-dev, intltool, pkgconfig, gettext-bin, gettext-tools << BuildConflicts: freetype -Recommends: skk-dict, prime, canna-server -Source: http://uim.freedesktop.org/releases/%n-%v.tar.gz -Source-MD5: 1de96cb9ca0c570c0d04678a95f9c75a +Source: http://uim.googlecode.com/files/%n-%v.tar.bz2 +Source-MD5: f5ac910cfa668343c73ca93e314d80ba +Patch: %n.patch GCC: 3.3 +SetCFLAGS: -Os -pipe SetLDFLAGS: -L/usr/X11R6/lib -lX11 -ConfigureParams: --libexecdir=%p/lib/%n --without-anthy -InstallScript: make install DESTDIR=%d - -PostInstScript: << -if [ configure = "$1" ]; then - %p/sbin/update-gtk-immodules -fi +ConfigureParams: << + --mandir=%p/share/man \ + --libexecdir=%p/lib/%n \ + --with-libiconv-prefix=%p \ + --without-scim \ + --with-anthy \ + --without-m17nlib \ + --with-canna \ + --without-mana \ + --without-prime \ + --with-x \ + --with-xft \ + --with-libintl-prefix=%p \ + --with-gtk2 \ + --without-gnome2 \ + --without-qt \ + --without-qt-immodule \ + --without-eb \ + --without-libedit \ + --enable-default-toolkit=gtk \ + --enable-fep \ + --enable-dict \ + --enable-nls \ + --enable-pref \ + --disable-emacs \ + --disable-dependency-tracking \ + --disable-kde-applet \ + --disable-gnome-applet \ + DATADIRNAME=share << -PostRmScript: << -if [ upgrade != "$1" ]; then - %p/sbin/update-gtk-immodules -fi +InstallScript: << + make -j1 install DESTDIR=%d + install -m 755 -d %i/etc/xinitrc.d + install -m 755 xinitrc.uim.sh %i/etc/xinitrc.d/50uim.sh << SplitOff: << @@ -37,11 +61,14 @@ Depends: libgettext3-shlibs, libiconv Files: << lib/libuim{,-custom}.*.dylib + lib/libgcroots.*.dylib share/locale + lib/uim/plugin/libuim-custom-enabler.so << Shlibs: << - %p/lib/libuim-custom.0.dylib 2.0.0 %n (>= 1.0.1-1) - %p/lib/libuim.0.dylib 2.0.0 %n (>= 1.0.1-1) + %p/lib/libuim-custom.2.dylib 3.0.0 %n (>= 1.4.2-1) + %p/lib/libuim.5.dylib 6.0.0 %n (>= 1.4.2-1) + %p/lib/libgcroots.0.dylib 2.0.0 %n (>= 1.4.2-1) << DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README* << @@ -50,14 +77,86 @@ Package: %N-dev Replaces: %N (<< 0.4.6-6) Depends: %N-shlibs (= %v-%r) +BuildDependsOnly: true Files: << include lib/libuim{,-custom}.*a lib/libuim{,-custom}.dylib + lib/libgcroots.*a lib/libgcroots.dylib lib/pkgconfig - lib/gtk-2.0/2.4.0/immodules/*.*a - lib/uim/plugin/*.*a + lib/uim/plugin/libuim-custom-enabler.*a +<< +DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README* +<< + +SplitOff3: << +Package: %N-gtk2 +Replaces: %N (<< 1.0.2) +Depends: << + %N (= %v-%r), + gtk+2, + glib2-shlibs, + pango1-xft2-shlibs, + atk1-shlibs, + libgettext3-shlibs, + libiconv +<< +Files: << + bin/uim-dict-gtk + bin/uim-im-switcher-gtk + bin/uim-input-pad-ja + bin/uim-pref-gtk + bin/uim-toolbar-gtk + bin/uim-toolbar-gtk-systray + lib/gtk-2.0 + lib/uim/uim-candwin-gtk +<< +PostInstScript: << +if [ configure = "$1" ]; then + %p/sbin/update-gtk-immodules +fi +<< +PostRmScript: << +if [ upgrade != "$1" ]; then + %p/sbin/update-gtk-immodules +fi +<< +DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README* +<< + +SplitOff4: << +Package: %N-anthy +Replaces: %N (<< 1.0.2) +Depends: %N-shlibs (= %v-%r), anthy +Files: << + lib/uim/plugin/libuim-anthy.* + share/uim/anthy*.scm + share/uim/pixmaps/anthy.* +<< +DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README* +<< + +SplitOff5: << +Package: %N-skk +Depends: %N-shlibs (=%v-%r), skk-dict +Replaces: %N (<< 1.0.2) +Files: << + lib/uim/plugin/libuim-skk.* + share/uim/skk*.scm + share/uim/pixmaps/skk.* +<< +DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README* +<< + +SplitOff6: << +Package: %N-canna +Depends: %N-shlibs (=%v-%r), cannadic, canna-server +Recommends: canna-utils +Replaces: %N (<< 1.0.2) +Files: << + lib/uim/plugin/libuim-canna.* + share/uim/canna*.scm + share/uim/pixmaps/canna.* << -BuildDependsOnly: true DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README* << --- NEW FILE: uim.patch --- diff -Naur uim-1.4.2.orig/xinitrc.uim.sh uim-1.4.2/xinitrc.uim.sh --- uim-1.4.2.orig/xinitrc.uim.sh 1970-01-01 09:00:00.000000000 +0900 +++ uim-1.4.2/xinitrc.uim.sh 2008-03-31 02:51:31.000000000 +0900 @@ -0,0 +1,22 @@ +# If you don't want to launch uim, put xinitrc_uim_enable=NO +# in your .xinitrc +: ${xinitrc_uim_enable=YES} +: ${xinitrc_uim_toolbar_enable=NO} + +# 'anthy', 'canna' and 'skk' are available at this time. +: ${xinitrc_uim_engine=anthy} + +case $xinitrc_uim_enable in + [Yy][Ee][Ss]) + if test -x "$fink_prefix/bin/uim-xim"; then + "$fink_prefix/bin/uim-xim" --engine=$xinitrc_uim_engine & + fi + ;; +esac +case $xinitrc_uim_toolbar_enable in + [Yy][Ee][Ss]) + if test -x "$fink_prefix/bin/uim-toolbar-gtk"; then + "$fink_prefix/bin/uim-toolbar-gtk" & + fi + ;; +esac diff -Naur uim-1.4.2.orig/configure uim-1.4.2/configure --- uim-1.4.2.orig/configure 2008-02-20 21:25:46.000000000 +0900 +++ uim-1.4.2/configure 2008-05-07 02:13:12.000000000 +0900 @@ -22157,6 +22157,7 @@ /* end confdefs.h. */ #undef _WCHAR_T +#define CANNA_NEW_WCHAR_AWARE #include <$ac_header> _ACEOF rm -f conftest.$ac_objext diff -Naur uim-1.4.2.orig/helper/dict-canna.c uim-1.4.2/helper/dict-canna.c --- uim-1.4.2.orig/helper/dict-canna.c 2008-02-19 18:16:27.000000000 +0900 +++ uim-1.4.2/helper/dict-canna.c 2008-05-07 02:13:21.000000000 +0900 @@ -36,6 +36,7 @@ #include <unistd.h> #include <sys/types.h> +#define CANNA_NEW_WCHAR_AWARE #include <canna/RK.h> #include <stdlib.h> diff -Naur uim-1.4.2.orig/uim/canna.c uim-1.4.2/uim/canna.c --- uim-1.4.2.orig/uim/canna.c 2008-02-19 18:16:27.000000000 +0900 +++ uim-1.4.2/uim/canna.c 2008-05-07 02:25:33.000000000 +0900 @@ -36,6 +36,7 @@ #include <config.h> #ifdef HAVE_CANNA_RK_H +#define CANNA_NEW_WCHAR_AWARE #include <canna/RK.h> #include <stdlib.h> #include <errno.h> ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs