# HG changeset patch
# User Liu Peng <rocky@slitaz.org>
# Date 1245649055 -28800
# Node ID 8b3ae6a93757695b47ae57fce4f3bf588109bdd7
# Parent  0fba0aa4ee0ea966a7377e2cfb94e4f421263b90
scim: Update to version 1.4.9

diff -r 0fba0aa4ee0e -r 8b3ae6a93757 scim-dev/receipt
--- a/scim-dev/receipt	Mon Jun 22 02:07:46 2009 +0200
+++ b/scim-dev/receipt	Mon Jun 22 13:37:35 2009 +0800
@@ -1,8 +1,9 @@
 PACKAGE="scim-dev"
-VERSION="1.4.7"
+VERSION="1.4.9"
 CATEGORY="development"
 SHORT_DESC="Smart Common Input Method (SCIM) development files."
-MAINTAINER="slitaz@pworld.otherinbox.com"
+MAINTAINER="rocky@slitaz.org"
+DEPENDS="scim"
 WEB_SITE="http://www.scim-im.org/"
 WANTED="scim"
 
@@ -10,9 +11,9 @@
 genpkg_rules()
 {
     mkdir -p $fs/usr
+    cp -a $_pkg/usr/lib $fs/usr
     cp -a $_pkg/usr/include $fs/usr
-    cp -a $_pkg/usr/lib $fs/usr
     find $fs/usr/lib -type f -not -name '*a' -exec rm {} \;
     find $fs/usr/lib -type l -exec rm {} \;
-    cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
+    cp -a $_pkg/usr/lib/pkgconfig/* $fs/usr/lib/pkgconfig
 }
diff -r 0fba0aa4ee0e -r 8b3ae6a93757 scim/receipt
--- a/scim/receipt	Mon Jun 22 02:07:46 2009 +0200
+++ b/scim/receipt	Mon Jun 22 13:37:35 2009 +0800
@@ -1,22 +1,27 @@
 PACKAGE="scim"
-VERSION="1.4.7"
-CATEGORY="x-window"
-SHORT_DESC="Smart Common Input Method (SCIM)"
-MAINTAINER="slitaz@pworld.otherinbox.com"
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="xorg-dev xorg-dev-proto gtk+-dev"
+VERSION="1.4.9"
+CATEGORY="utilities"
+SHORT_DESC="Smart Common Input Method (SCIM)."
+MAINTAINER="rocky@slitaz.org"
+DEPENDS="gtk+"
+BUILD_DEPENDS="gtk+-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.scim-im.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+CONFIG_FILES="/etc/scim/config /etc/scim/global"
 
 # Rules to configure and make the package.
 compile_rules()
 {
     cd $src
-    ./configure --prefix=/usr --infodir=/usr/share/info \
-    --sysconfdir=/etc --with-x \
-    --with-gtk-im-module-dir=$(ls -d /usr/lib/gtk-2*/2*/immodules/) \
-    --mandir=/usr/share/man $CONFIGURE_ARGS &&
+    patch -p1 < ../stuff/scim-glibc-2.10.patch &&
+    ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --with-x \
+        --with-gtk-im-module-dir=$(ls -d /usr/lib/gtk-2*/2*/immodules/) \
+        --mandir=/usr/share/man \
+        --infodir=/usr/share/info \
+        $CONFIGURE_ARGS &&
     make &&
     make DESTDIR=$PWD/_pkg install
 }
@@ -24,27 +29,37 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr
+    mkdir -p $fs/usr/share/pixmaps
+    cp -a $_pkg/etc $fs/
     cp -a $_pkg/usr/bin $fs/usr
-    strip -s $fs/usr/bin/*
     cp -a $_pkg/usr/lib $fs/usr
-    mkdir -p $fs/usr/share
     cp -a $_pkg/usr/share/scim $fs/usr/share
+    cp $_pkg/usr/share/pixmaps/scim-setup.png $fs/usr/share/pixmaps
     find $fs/usr/lib -name '*.la' -exec rm {} \;
     find $fs/usr/lib -name '*.a' -exec rm {} \;
-    find $fs/usr/lib -name '*.so' -exec strip -s {} \;
-    mkdir -p $fs/usr/share/pixmaps
-    cp $_pkg/usr/share/pixmaps/scim-setup.png $fs/usr/share/pixmaps
     rm -rf $fs/usr/lib/pkgconfig
-    chmod +x $fs/usr/bin/*
+    chmod +x $fs/usr/bin/scim-setup
 }
 
 post_install()
 {
     echo "Processing post-install commands..."
-    echo -n "updating gtk.immodules... "
+    echo -n "Updating gtk.immodules... "
     /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
     echo "done."
+cat <<EOT
+In order to start scim and use chinese after boot time,
+add the following code to your ~/.profile file:
+------------
+export XMODIFIERS=@im=SCIM
+export XIM="scim"
+export XINPUT="xim"
+export XIM_PROGRAM="scim -d"
+export GTK_IM_MODULE=scim
+export QT_IM_MODULE=scim
+scim -d &
+------------
+EOT
 }
 
 post_remove()
diff -r 0fba0aa4ee0e -r 8b3ae6a93757 scim/stuff/scim-glibc-2.10.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scim/stuff/scim-glibc-2.10.patch	Mon Jun 22 13:37:35 2009 +0800
@@ -0,0 +1,13 @@
+glibc 2.10 error: invalid conversion from 'const char*' to 'char*'
+ref: http://lists.opensuse.org/opensuse-packaging/2009-06/msg00001.html
+--- scim-1.4.7/src/ltdl.cpp.orig	Mon Jun 22 10:28:27 2009
++++ scim-1.4.7/src/ltdl.cpp	Mon Jun 22 10:25:11 2009
+@@ -3360,7 +3360,7 @@
+ {
+   lt_dlhandle	handle		= 0;
+   char *	tmp		= 0;
+-  char *	ext		= 0;
++  const char *	ext		= 0;
+   size_t	len;
+   int		errors		= 0;
+