Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12132/10.3/unstable/main/finkinfo/utils
Modified Files:
uim.info 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- uim.info 11 May 2008 07:03:04 -0000 1.9
+++ uim.info 27 Jun 2008 17:34:34 -0000 1.10
@@ -1,10 +1,10 @@
Package: uim
-Version: 1.4.2
+Version: 1.5.1
Revision: 1
Depends: <<
%N-shlibs (=%v-%r), x11, libgettext3-shlibs, libiconv,
- %N-anthy (=%v-%r) | %N-canna (=%v-%r) | %N-skk (=%v-%r), xinitrc,
- libncurses5-shlibs
+ %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,
@@ -14,11 +14,10 @@
<<
BuildConflicts: freetype
Source: http://uim.googlecode.com/files/%n-%v.tar.bz2
-Source-MD5: f5ac910cfa668343c73ca93e314d80ba
+Source-MD5: 6942807acab60ac49281a8dc9972e577
Patch: %n.patch
GCC: 3.3
SetCFLAGS: -Os -pipe
-SetLDFLAGS: -L/usr/X11R6/lib -lX11
ConfigureParams: <<
--mandir=%p/share/man \
--libexecdir=%p/lib/%n \
@@ -51,8 +50,9 @@
<<
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
+ install -m 755 -d %i/etc/xinitrc.d
+ install -m 755 xinitrc.uim.sh %i/etc/xinitrc.d/50uim.sh
+ install -m 755 xinitrc.uim-toolbar.sh %i/etc/xinitrc.d/51uim-toolbar.sh
<<
SplitOff: <<
@@ -60,15 +60,19 @@
Replaces: %N (<< 0.4.6-6)
Depends: libgettext3-shlibs, libiconv
Files: <<
- lib/libuim{,-custom}.*.dylib
+ lib/libuim-custom.*.dylib
+ lib/libuim-scm.*.dylib
+ lib/libuim.*.dylib
lib/libgcroots.*.dylib
share/locale
lib/uim/plugin/libuim-custom-enabler.so
+ lib/uim/plugin/libuim-look.so
<<
Shlibs: <<
%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)
+ %p/lib/libuim-scm.0.dylib 1.0.0 %n (>= 1.5.0-1)
+ %p/lib/libuim.6.dylib 7.0.0 %n (>= 1.5.0-1)
+ %p/lib/libgcroots.0.dylib 2.0.0 %n (>= 1.4.2-1)
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README*
<<
@@ -80,10 +84,13 @@
BuildDependsOnly: true
Files: <<
include
- lib/libuim{,-custom}.*a lib/libuim{,-custom}.dylib
- lib/libgcroots.*a lib/libgcroots.dylib
+ lib/libuim-custom.*a lib/libuim-custom.dylib
+ lib/libuim-scm.*a lib/libuim-scm.dylib
+ lib/libuim.*a lib/libuim.dylib
+ lib/libgcroots.*a lib/libgcroots.dylib
lib/pkgconfig
lib/uim/plugin/libuim-custom-enabler.*a
+ lib/uim/plugin/libuim-look.*a
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL* NEWS README*
<<
@@ -109,6 +116,7 @@
bin/uim-toolbar-gtk-systray
lib/gtk-2.0
lib/uim/uim-candwin-gtk
+ etc/xinitrc.d/51uim-toolbar.sh
<<
PostInstScript: <<
if [ configure = "$1" ]; then
Index: uim.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/uim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- uim.patch 11 May 2008 07:03:05 -0000 1.1
+++ uim.patch 27 Jun 2008 17:34:34 -0000 1.2
@@ -1,13 +1,12 @@
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 @@
+@@ -0,0 +1,14 @@
+# 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.
++# To see available backend conversion engines, type "uim-xim --list".
+: ${xinitrc_uim_engine=anthy}
+
+case $xinitrc_uim_enable in
@@ -17,6 +16,14 @@
+ fi
+ ;;
+esac
+diff -Naur uim-1.5.1.orig/xinitrc.uim-toolbar.sh
uim-1.5.1/xinitrc.uim-toolbar.sh
+--- uim-1.5.1.orig/xinitrc.uim-toolbar.sh 1970-01-01 09:00:00.000000000
+0900
++++ uim-1.5.1/xinitrc.uim-toolbar.sh 2008-06-27 16:59:14.000000000 +0900
+@@ -0,0 +1,11 @@
++# If you don't want to launch uim-toolbar-gtk, put
xinitrc_uim_toolbar_enable=NO
++# in your .xinitrc
++: ${xinitrc_uim_toolbar_enable=YES}
++
+case $xinitrc_uim_toolbar_enable in
+ [Yy][Ee][Ss])
+ if test -x "$fink_prefix/bin/uim-toolbar-gtk"; then
@@ -24,6 +31,29 @@
+ fi
+ ;;
+esac
+diff -Naur uim-1.5.1.orig/xim/Makefile.in uim-1.5.1/xim/Makefile.in
+--- uim-1.5.1.orig/xim/Makefile.in 2008-05-17 12:42:14.000000000 +0900
++++ uim-1.5.1/xim/Makefile.in 2008-06-28 00:34:08.000000000 +0900
+@@ -82,7 +82,7 @@
+ @XIM_TRUE@ $(am__DEPENDENCIES_1)
+ uim_xim_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(uim_xim_CXXFLAGS) $(CXXFLAGS) \
+- $(uim_xim_LDFLAGS) $(LDFLAGS) -o $@
++ $(LDFLAGS) $(uim_xim_LDFLAGS) -o $@
+ DEFAULT_INCLUDES = [EMAIL PROTECTED]@ -I$(top_builddir)/uim
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -361,8 +361,8 @@
+ @XIM_TRUE@ $(top_builddir)/uim/libuim-x-util.la $(am__append_5)
+ @[EMAIL PROTECTED] = -I$(top_builddir) -I$(top_srcdir) \
+ @XIM_TRUE@ $(am__append_1) $(am__append_2)
[EMAIL PROTECTED]@uim_xim_CFLAGS = @X_CFLAGS@ -Wall $(am__append_3)
[EMAIL PROTECTED]@uim_xim_CXXFLAGS = @X_CFLAGS@ -Wall $(am__append_4)
[EMAIL PROTECTED]@uim_xim_CFLAGS = -Wall $(am__append_3) @X_CFLAGS@
[EMAIL PROTECTED]@uim_xim_CXXFLAGS = -Wall $(am__append_4) @X_CFLAGS@
+ @[EMAIL PROTECTED] = uim-xim.1
+ @[EMAIL PROTECTED] = \
+ @XIM_TRUE@ main.cpp convdisp.cpp \
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
@@ -55,5 +85,5 @@
#ifdef HAVE_CANNA_RK_H
+#define CANNA_NEW_WCHAR_AWARE
#include <canna/RK.h>
+ #include <stdio.h>
#include <stdlib.h>
- #include <errno.h>
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
