diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-28 02:07:28 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-01 19:35:40 +0700 |
| commit | 69e67750d40c506933fb5e3da66576ccba8307d2 (patch) | |
| tree | 737bda8403e132c49a3ddae25ab21ba87955a54d | |
| parent | 1a4584cc34952a3b4be62b5c462de04aa8a3b5f8 (diff) | |
| download | slackbuilds-69e67750d40c506933fb5e3da66576ccba8307d2.tar.gz | |
graphics/gtkam: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | graphics/gtkam/gtkam.SlackBuild | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/graphics/gtkam/gtkam.SlackBuild b/graphics/gtkam/gtkam.SlackBuild index f86565feba..2a2dc5f752 100644 --- a/graphics/gtkam/gtkam.SlackBuild +++ b/graphics/gtkam/gtkam.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtkam @@ -32,15 +34,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,8 +49,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,11 +74,13 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # Add --without-gimp if you don't want to compile the GIMP plugin +# 20220228 bkw: add LIBS, it wasn't picking them up automatically on 15.0. +LIBS="$( pkg-config --libs gtk+-2.0 )" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |