diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2011-04-25 13:37:00 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:45:18 +0200 |
| commit | 75a4a592e5ccda30715f93563d741b83e0dcf39e (patch) | |
| tree | 502f745607e77a2c4386ad38d818ddcafe81489c /source/x/scim | |
| parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
| download | current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz | |
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!
Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
As always, thanks to the Slackware community for testing, suggestions,
and feedback. :-)
Have fun!
Diffstat (limited to 'source/x/scim')
| -rw-r--r-- | source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch | 11 | ||||
| -rwxr-xr-x | source/x/scim/scim.SlackBuild | 23 |
2 files changed, 29 insertions, 5 deletions
diff --git a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch new file mode 100644 index 00000000..1d9590fd --- /dev/null +++ b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch @@ -0,0 +1,11 @@ +--- scim-1.4.9/src/ltdl.cpp.bak 2008-11-02 14:42:40.000000000 +0800 ++++ scim-1.4.9/src/ltdl.cpp 2010-09-12 00:23:24.085978400 +0800 +@@ -3361,7 +3361,7 @@ + { + lt_dlhandle handle = 0; + char * tmp = 0; +- char * ext = 0; ++ const char * ext = 0; + size_t len; + int errors = 0; + diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild index 168ae991..c0c50fb4 100755 --- a/source/x/scim/scim.SlackBuild +++ b/source/x/scim/scim.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006,2007,2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -35,9 +35,17 @@ PRGNAM=scim VERSION=${VERSION:-1.4.9} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -56,6 +64,8 @@ elif [ "$ARCH" = "armel" ]; then LIBDIRSUFFIX="" fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PRGNAM @@ -65,8 +75,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PRGNAM}-${VERSION} -tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz +tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1 cd ${PRGNAM}-${VERSION} || exit 1 + +zcat $CWD/scim-1.4.9-fix-ltdl.cpp.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |