diff options
Diffstat (limited to 'source/x/scim-pinyin')
-rwxr-xr-x | source/x/scim-pinyin/scim-pinyin.SlackBuild | 33 | ||||
-rw-r--r-- | source/x/scim-pinyin/scim-pinyin.gcc43.diff | 44 |
2 files changed, 7 insertions, 70 deletions
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild index 9eefad63..87fa81d2 100755 --- a/source/x/scim-pinyin/scim-pinyin.SlackBuild +++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- # -# Slackware SlackBuild script +# Slackware SlackBuild script # =========================== # By: Eric Hameleers <alien@slackware.com> # For: scim-pinyin @@ -36,21 +36,21 @@ PKGNAM=scim-pinyin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -68,12 +68,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 +tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 cd ${PKGNAM}-${VERSION} || exit 1 -# Apply fix for our gcc 4.3.x -zcat $CWD/scim-pinyin.gcc43.diff.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 \) \ @@ -96,22 +93,6 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 -#cd skim -#echo Building skim ... -#CFLAGS="$SLKCFLAGS" \ -#./configure \ -# --prefix=$(kde-config --prefix) \ -# --localstatedir=/var \ -# --sysconfdir=/etc \ -# --disable-static \ -# --without-arts \ -# --program-prefix= \ -# --program-suffix= \ -# --build=$ARCH-slackware-linux -#make $NUMJOBS || make || exit 1 -#make DESTDIR=$PKG install || exit 1 -#cd - - # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/source/x/scim-pinyin/scim-pinyin.gcc43.diff b/source/x/scim-pinyin/scim-pinyin.gcc43.diff deleted file mode 100644 index 6f9bd387..00000000 --- a/source/x/scim-pinyin/scim-pinyin.gcc43.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur scim-pinyin-0.5.91.orig/src/scim_phrase.cpp scim-pinyin-0.5.91/src/scim_phrase.cpp ---- scim-pinyin-0.5.91.orig/src/scim_phrase.cpp 2005-01-06 22:30:58.000000000 +0900 -+++ scim-pinyin-0.5.91/src/scim_phrase.cpp 2008-06-21 13:16:32.000000000 +0900 -@@ -27,6 +27,7 @@ - - #define SCIM_PHRASE_MAX_RELATION 1000 - -+#include <cstring> - #include <scim.h> - #include "scim_pinyin_private.h" - #include "scim_phrase.h" -diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp scim-pinyin-0.5.91/src/scim_pinyin.cpp ---- scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp 2005-08-08 15:11:16.000000000 +0900 -+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp 2008-06-21 13:16:30.000000000 +0900 -@@ -28,6 +28,7 @@ - #define Uses_SCIM_CONFIG_PATH - #define Uses_SCIM_LOOKUP_TABLE - -+#include <cstring> - #include <scim.h> - #include "scim_pinyin.h" - -diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp ---- scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp 2005-08-06 21:06:49.000000000 +0900 -+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp 2008-06-21 13:21:13.000000000 +0900 -@@ -26,6 +26,7 @@ - #define Uses_SCIM_CONFIG_PATH - #define Uses_SCIM_LOOKUP_TABLE - -+#include <cstring> - #include <scim.h> - #include "scim_pinyin_private.h" - #include "scim_phrase.h" -diff -Naur scim-pinyin-0.5.91.orig/src/scim_special_table.cpp scim-pinyin-0.5.91/src/scim_special_table.cpp ---- scim-pinyin-0.5.91.orig/src/scim_special_table.cpp 2005-01-06 22:31:02.000000000 +0900 -+++ scim-pinyin-0.5.91/src/scim_special_table.cpp 2008-06-21 13:25:25.000000000 +0900 -@@ -20,6 +20,7 @@ - #define Uses_STL_IOMANIP - #define Uscs_C_STRING - -+#include <cstring> - #include <time.h> - #include <scim.h> - #include "scim_pinyin_private.h" |