wok rev 3531

scim: Update to version 1.4.9
author Liu Peng <rocky@slitaz.org>
date Mon Jun 22 13:37:35 2009 +0800 (2009-06-22)
parents 0fba0aa4ee0e
children 012d72b2b629
files scim-dev/receipt scim/receipt scim/stuff/scim-glibc-2.10.patch
line diff
     1.1 --- a/scim-dev/receipt	Mon Jun 22 02:07:46 2009 +0200
     1.2 +++ b/scim-dev/receipt	Mon Jun 22 13:37:35 2009 +0800
     1.3 @@ -1,8 +1,9 @@
     1.4  PACKAGE="scim-dev"
     1.5 -VERSION="1.4.7"
     1.6 +VERSION="1.4.9"
     1.7  CATEGORY="development"
     1.8  SHORT_DESC="Smart Common Input Method (SCIM) development files."
     1.9 -MAINTAINER="slitaz@pworld.otherinbox.com"
    1.10 +MAINTAINER="rocky@slitaz.org"
    1.11 +DEPENDS="scim"
    1.12  WEB_SITE="http://www.scim-im.org/"
    1.13  WANTED="scim"
    1.14  
    1.15 @@ -10,9 +11,9 @@
    1.16  genpkg_rules()
    1.17  {
    1.18      mkdir -p $fs/usr
    1.19 +    cp -a $_pkg/usr/lib $fs/usr
    1.20      cp -a $_pkg/usr/include $fs/usr
    1.21 -    cp -a $_pkg/usr/lib $fs/usr
    1.22      find $fs/usr/lib -type f -not -name '*a' -exec rm {} \;
    1.23      find $fs/usr/lib -type l -exec rm {} \;
    1.24 -    cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.25 +    cp -a $_pkg/usr/lib/pkgconfig/* $fs/usr/lib/pkgconfig
    1.26  }
     2.1 --- a/scim/receipt	Mon Jun 22 02:07:46 2009 +0200
     2.2 +++ b/scim/receipt	Mon Jun 22 13:37:35 2009 +0800
     2.3 @@ -1,22 +1,27 @@
     2.4  PACKAGE="scim"
     2.5 -VERSION="1.4.7"
     2.6 -CATEGORY="x-window"
     2.7 -SHORT_DESC="Smart Common Input Method (SCIM)"
     2.8 -MAINTAINER="slitaz@pworld.otherinbox.com"
     2.9 -DEPENDS="gtk+ xorg-libXdamage"
    2.10 -BUILD_DEPENDS="xorg-dev xorg-dev-proto gtk+-dev"
    2.11 +VERSION="1.4.9"
    2.12 +CATEGORY="utilities"
    2.13 +SHORT_DESC="Smart Common Input Method (SCIM)."
    2.14 +MAINTAINER="rocky@slitaz.org"
    2.15 +DEPENDS="gtk+"
    2.16 +BUILD_DEPENDS="gtk+-dev"
    2.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.18  WEB_SITE="http://www.scim-im.org/"
    2.19  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.20 +CONFIG_FILES="/etc/scim/config /etc/scim/global"
    2.21  
    2.22  # Rules to configure and make the package.
    2.23  compile_rules()
    2.24  {
    2.25      cd $src
    2.26 -    ./configure --prefix=/usr --infodir=/usr/share/info \
    2.27 -    --sysconfdir=/etc --with-x \
    2.28 -    --with-gtk-im-module-dir=$(ls -d /usr/lib/gtk-2*/2*/immodules/) \
    2.29 -    --mandir=/usr/share/man $CONFIGURE_ARGS &&
    2.30 +    patch -p1 < ../stuff/scim-glibc-2.10.patch &&
    2.31 +    ./configure --prefix=/usr \
    2.32 +        --sysconfdir=/etc \
    2.33 +        --with-x \
    2.34 +        --with-gtk-im-module-dir=$(ls -d /usr/lib/gtk-2*/2*/immodules/) \
    2.35 +        --mandir=/usr/share/man \
    2.36 +        --infodir=/usr/share/info \
    2.37 +        $CONFIGURE_ARGS &&
    2.38      make &&
    2.39      make DESTDIR=$PWD/_pkg install
    2.40  }
    2.41 @@ -24,27 +29,37 @@
    2.42  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.43  genpkg_rules()
    2.44  {
    2.45 -    mkdir -p $fs/usr
    2.46 +    mkdir -p $fs/usr/share/pixmaps
    2.47 +    cp -a $_pkg/etc $fs/
    2.48      cp -a $_pkg/usr/bin $fs/usr
    2.49 -    strip -s $fs/usr/bin/*
    2.50      cp -a $_pkg/usr/lib $fs/usr
    2.51 -    mkdir -p $fs/usr/share
    2.52      cp -a $_pkg/usr/share/scim $fs/usr/share
    2.53 +    cp $_pkg/usr/share/pixmaps/scim-setup.png $fs/usr/share/pixmaps
    2.54      find $fs/usr/lib -name '*.la' -exec rm {} \;
    2.55      find $fs/usr/lib -name '*.a' -exec rm {} \;
    2.56 -    find $fs/usr/lib -name '*.so' -exec strip -s {} \;
    2.57 -    mkdir -p $fs/usr/share/pixmaps
    2.58 -    cp $_pkg/usr/share/pixmaps/scim-setup.png $fs/usr/share/pixmaps
    2.59      rm -rf $fs/usr/lib/pkgconfig
    2.60 -    chmod +x $fs/usr/bin/*
    2.61 +    chmod +x $fs/usr/bin/scim-setup
    2.62  }
    2.63  
    2.64  post_install()
    2.65  {
    2.66      echo "Processing post-install commands..."
    2.67 -    echo -n "updating gtk.immodules... "
    2.68 +    echo -n "Updating gtk.immodules... "
    2.69      /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
    2.70      echo "done."
    2.71 +cat <<EOT
    2.72 +In order to start scim and use chinese after boot time,
    2.73 +add the following code to your ~/.profile file:
    2.74 +------------
    2.75 +export XMODIFIERS=@im=SCIM
    2.76 +export XIM="scim"
    2.77 +export XINPUT="xim"
    2.78 +export XIM_PROGRAM="scim -d"
    2.79 +export GTK_IM_MODULE=scim
    2.80 +export QT_IM_MODULE=scim
    2.81 +scim -d &
    2.82 +------------
    2.83 +EOT
    2.84  }
    2.85  
    2.86  post_remove()
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/scim/stuff/scim-glibc-2.10.patch	Mon Jun 22 13:37:35 2009 +0800
     3.3 @@ -0,0 +1,13 @@
     3.4 +glibc 2.10 error: invalid conversion from 'const char*' to 'char*'
     3.5 +ref: http://lists.opensuse.org/opensuse-packaging/2009-06/msg00001.html
     3.6 +--- scim-1.4.7/src/ltdl.cpp.orig	Mon Jun 22 10:28:27 2009
     3.7 ++++ scim-1.4.7/src/ltdl.cpp	Mon Jun 22 10:25:11 2009
     3.8 +@@ -3360,7 +3360,7 @@
     3.9 + {
    3.10 +   lt_dlhandle	handle		= 0;
    3.11 +   char *	tmp		= 0;
    3.12 +-  char *	ext		= 0;
    3.13 ++  const char *	ext		= 0;
    3.14 +   size_t	len;
    3.15 +   int		errors		= 0;
    3.16 +