Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3420/10.4/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.4/unstable/main/finkinfo/utils/uim.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- uim.info    9 Nov 2006 00:37:00 -0000       1.4
+++ uim.info    30 Mar 2008 19:01:00 -0000      1.5
@@ -1,52 +1,58 @@
 Package: uim
-Version: 1.0.1
-Revision: 1002
+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-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,
   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: 4.0
+SetCFLAGS: -Os -pipe
 SetLDFLAGS: -L/usr/X11R6/lib -lX11
 ConfigureParams: <<
   --mandir=%p/share/man \
   --libexecdir=%p/lib/%n \
-  --disable-emacs \
+  --with-libiconv-prefix=%p \
   --without-scim \
-  --without-anthy \
+  --with-anthy \
   --without-m17nlib \
   --without-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
-<<
-InstallScript: make install DESTDIR=%d
-
-PostInstScript: <<
-if [ configure = "$1" ]; then
-    %p/sbin/update-gtk-immodules
-fi
+  --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: <<
@@ -55,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*
 <<
@@ -68,17 +77,89 @@
 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
 <<
-BuildDependsOnly: true
 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.*
+#<<
+#DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README*
+#<<
+
 DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README*
 Description: Light-weight, full-featured input method lib
 DescDetail: <<

--- 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' and 'skk' is 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


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to