Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1204/main/finkinfo/utils

Modified Files:
      Tag: pangocairo-branch
        uim.info uim.patch 
Log Message:
1. Depends on xinitrc. (not BuildDepends)
2. Add a customizable variable xinitrc_uim_toolbar_enable for xinitrc.


Index: uim.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/uim.info,v
retrieving revision 1.4.2.20
retrieving revision 1.4.2.21
diff -u -d -r1.4.2.20 -r1.4.2.21
--- uim.info    30 Mar 2008 18:12:50 -0000      1.4.2.20
+++ uim.info    30 Mar 2008 18:57:02 -0000      1.4.2.21
@@ -1,16 +1,16 @@
 Package: uim
 Version: 1.4.2
-Revision: 1
+Revision: 2
 Depends: <<
   %N-shlibs (=%v-%r), x11, libgettext3-shlibs, libiconv,
-  %N-anthy (=%v-%r) | %N-skk (=%v-%r),
+  %N-anthy (=%v-%r) | %N-skk (=%v-%r), xinitrc,
   libncurses5-shlibs
 <<
 BuildDepends: <<
   glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 2.4.1-1), 
freetype219 (>= 2.3.5-1),
   xft2-dev, x11-dev, gtk+2-dev (>= 2.12.0-1), glib2-dev (>= 2.14.0-1), 
pango1-xft2-ft219-dev (>= 1.18.2-1),
   atk1 (>= 1.20.0-1), libgettext3-dev, libiconv-dev, libncurses5,
-  xinitrc, anthy-dev, 
+  anthy-dev,
   intltool (>= 0.36.0-1), pkgconfig (>= 0.21-1), gettext-bin, gettext-tools
 <<
 BuildConflicts: freetype
@@ -101,14 +101,14 @@
   gtk+2 (>= 2.12.0-1),
   glib2-shlibs (>= 2.14.0-1),
   pango1-xft2-ft219-shlibs (>= 1.18.2-1),
-  atk1-shlibs (>= 1.20.0-1), 
+  atk1-shlibs (>= 1.20.0-1),
   cairo-shlibs,
   glitz-shlibs,
   expat1-shlibs,
   freetype219-shlibs,
   fontconfig2-shlibs,
   libgettext3-shlibs,
-  libiconv  
+  libiconv
 <<
 Files: <<
   bin/uim-dict-gtk

Index: uim.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/Attic/uim.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- uim.patch   30 Mar 2008 18:12:50 -0000      1.1.2.1
+++ uim.patch   30 Mar 2008 18:57:02 -0000      1.1.2.2
@@ -1,10 +1,11 @@
 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,14 @@
+@@ -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}
@@ -16,3 +17,10 @@
 +    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