diff options
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 | 40 |
2 files changed, 20 insertions, 31 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 deleted file mode 100644 index 1d9590fd..00000000 --- a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 c0c50fb4..d03adc6e 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, 2011 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2006, 2007, 2008 Eric Hameleers, Eindhoven, NL +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,18 +33,19 @@ # ----------------------------------------------------------------------------- -PRGNAM=scim -VERSION=${VERSION:-1.4.9} -BUILD=${BUILD:-5} +PKGNAM=scim +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # 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 ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi if [ "$ARCH" = "i486" ]; then @@ -68,17 +69,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf ${PRGNAM}-${VERSION} -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 +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ @@ -95,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --sysconfdir=/etc \ --disable-static \ + --with-gtk-version=2 \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux @@ -265,15 +265,15 @@ fi EOINS # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # Install documentation and user manual cp -a docs/manual/zh_CN/user-manual.html \ - $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/ + $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/ cp -a docs/manual/zh_CN/figures/*.png \ - $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures/ + $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures/ # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ @@ -285,5 +285,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz |