Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28081/main/finkinfo/utils
Modified Files:
Tag: pangocairo-branch
uim.info uim.patch
Log Message:
Enable uim to use canna.
Index: uim.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/uim.info,v
retrieving revision 1.4.2.23
retrieving revision 1.4.2.24
diff -u -d -r1.4.2.23 -r1.4.2.24
--- uim.info 27 Apr 2008 17:34:50 -0000 1.4.2.23
+++ uim.info 11 May 2008 07:11:00 -0000 1.4.2.24
@@ -1,17 +1,17 @@
Package: uim
Version: 1.4.2
-Revision: 3
+Revision: 101
Depends: <<
%N-shlibs (=%v-%r), x11, libgettext3-shlibs, libiconv,
- %N-anthy (=%v-%r) | %N-skk (=%v-%r), xinitrc,
+ %N-anthy (=%v-%r) | %N-canna (=%v-%r) | %N-skk (=%v-%r), xinitrc,
libncurses5-shlibs
<<
BuildDepends: <<
glitz, expat1, libpng3, cairo (>= 1.6-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.4-4), pixman (>= 0.10.0-1),
atk1 (>= 1.20.0-1), libgettext3-dev, libiconv-dev, libncurses5,
- anthy-dev,
- intltool (>= 0.36.0-1), pkgconfig (>= 0.21-1), gettext-bin, gettext-tools
+ anthy-dev, canna-dev,
+ intltool (>= 0.36.0-1), pkgconfig (>= 0.22-5), gettext-bin, gettext-tools
<<
BuildConflicts: freetype
Source: http://uim.googlecode.com/files/%n-%v.tar.bz2
@@ -21,7 +21,7 @@
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L/usr/X11R6/lib -lX11 -L%p/lib
+SetLIBS: -L%p/lib -L/usr/X11R6/lib -lX11
SetCFLAGS: -Os -pipe
ConfigureParams: <<
--mandir=%p/share/man \
@@ -30,7 +30,7 @@
--without-scim \
--with-anthy \
--without-m17nlib \
- --without-canna \
+ --with-canna \
--without-mana \
--without-prime \
--with-x \
@@ -157,18 +157,18 @@
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*
-#<<
+SplitOff6: <<
+Package: %N-canna
+Depends: %N-shlibs (=%v-%r), cannadic, canna-server
+Recommends: canna-utils
+Replaces: %N (<= 1.4.2-3)
+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
Index: uim.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/uim.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- uim.patch 30 Mar 2008 18:57:02 -0000 1.1.2.2
+++ uim.patch 11 May 2008 07:11:00 -0000 1.1.2.3
@@ -7,7 +7,7 @@
+: ${xinitrc_uim_enable=YES}
+: ${xinitrc_uim_toolbar_enable=NO}
+
-+# 'anthy' and 'skk' is available at this time.
++# 'anthy', 'canna' and 'skk' are available at this time.
+: ${xinitrc_uim_engine=anthy}
+
+case $xinitrc_uim_enable in
@@ -24,3 +24,36 @@
+ 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
