Update to 0.15.2

1 files changed, 27 insertions, 14 deletions

diff --git a/dconf/build/dconf.SlackBuild b/dconf/build/dconf.SlackBuild
index 243344a6..4ccb4e9d 100755
--- a/dconf/build/dconf.SlackBuild
+++ b/dconf/build/dconf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2011, 2013  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -30,9 +30,11 @@
 # URL:         http://live.gnome.org/dconf/
 # Needs:       
 # Changelog:   
-# 0.7.5-1:     26/Jun/2011 by Eric Hameleers <alien@slackware.com>
+# 0.7.5-1:     26/jun/2011 by Eric Hameleers <alien@slackware.com>
 #              * Initial build. Adding "--disable-editor" to configure
 #                removes the need for gtk-3.0.
+# 0.15.2-1:    19/nov/2013 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh dconf.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -40,10 +42,8 @@
 #
 # -----------------------------------------------------------------------------
 
-# Set initial variables:
-
 PRGNAM=dconf
-VERSION=${VERSION:-0.7.5}
+VERSION=${VERSION:-0.15.2}
 MINVER=$(echo $VERSION | cut -d. -f1,2)
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
@@ -59,21 +59,23 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://download.gnome.org/sources/dconf/0.7/dconf-0.7.5.tar.bz2
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-SRCURL="http://download.gnome.org/sources/${PRGNAM}/${MINVER}/${PRGNAM}-${VERSION}.tar.bz2"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
+SRCURL="http://download.gnome.org/sources/${PRGNAM}/${MINVER}/${PRGNAM}-${VERSION}.tar.xz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    armv6hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -84,11 +86,22 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
 esac
 
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -106,7 +119,7 @@ mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 mkdir -p $PKG             # place for the package to be built
 rm -rf $PKG/*             # always erase old package's contents
 rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
-rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+rm -rf $OUTPUT/{configure,make,install,error,makepkg,patch}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
@@ -161,7 +174,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-editor \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log