diff options
Diffstat (limited to 'source/x/scim')
-rw-r--r-- | source/x/scim/scim-disable-subdir-objects.patch | 22 | ||||
-rwxr-xr-x | source/x/scim/scim.SlackBuild | 19 |
2 files changed, 34 insertions, 7 deletions
diff --git a/source/x/scim/scim-disable-subdir-objects.patch b/source/x/scim/scim-disable-subdir-objects.patch new file mode 100644 index 00000000..f5327df5 --- /dev/null +++ b/source/x/scim/scim-disable-subdir-objects.patch @@ -0,0 +1,22 @@ +From 88fbabed7dc236642021f8263f1b25bf67c6806e Mon Sep 17 00:00:00 2001 +From: Tz-Huan Huang <tzhuan@gmail.com> +Date: Fri, 24 Oct 2014 13:12:32 +0800 +Subject: [PATCH] Disable subdir-objects + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3d89eb1..f3901ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain]) + ########################################################### + + # Init automake stuff +-AM_INIT_AUTOMAKE([subdir-objects]) ++AM_INIT_AUTOMAKE([]) + AM_CONFIG_HEADER([config.h]) + + # Init libtool diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild index 816a5001..53c665cc 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, 2012, 2013 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -23,7 +23,7 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- # -# Slackware SlackBuild script +# Slackware SlackBuild script # =========================== # By: Eric Hameleers <alien@slackware.com> # For: scim @@ -35,21 +35,21 @@ PKGNAM=scim VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-2} # 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" @@ -79,6 +79,11 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 cd ${PKGNAM}-${VERSION} || exit 1 +# Upstream patch to fix crashes in gtk3 apps. +zcat $CWD/scim-disable-subdir-objects.patch.gz | patch -p1 --verbose || exit 1 + +./bootstrap + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |