From 2d76c763409a2a6bb74a308faca8384ebabdc2e3 Mon Sep 17 00:00:00 2001
From: David Spencer <idlemoor@slackbuilds.org>
Date: Thu, 17 Nov 2016 17:32:10 +0000
Subject: system/colord-gtk: Update SlackBuild for new options.

Thanks to Chris Willing.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/colord-gtk/README                |  8 ++++++++
 system/colord-gtk/colord-gtk.SlackBuild | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'system')

diff --git a/system/colord-gtk/README b/system/colord-gtk/README
index bc76eaf240..39844abda3 100644
--- a/system/colord-gtk/README
+++ b/system/colord-gtk/README
@@ -1 +1,9 @@
 colord-gtk is the GTK+ support library for colord.
+
+You can use the following options:
+
+VALA=yes   enable vala API support, requires vala
+           (default: disabled, VALA=no)
+
+GTK2=no    disable extra GTK+2 support
+           (default: enabled, GTK2=yes)
diff --git a/system/colord-gtk/colord-gtk.SlackBuild b/system/colord-gtk/colord-gtk.SlackBuild
index 9e26c1719b..4c6464dc5c 100644
--- a/system/colord-gtk/colord-gtk.SlackBuild
+++ b/system/colord-gtk/colord-gtk.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,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"
@@ -69,6 +69,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+GTK2OPT='--enable-gtk2'
+if [ "$GTK2" = 'no' ]; then
+  GTK2OPT=''
+fi
+
+VALAOPT=''
+if [ "$VALA" = 'yes' ]; then
+  VALAOPT='--enable-vala'
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,6 +89,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
+  $GTK2OPT \
+  $VALAOPT \
   --build=$ARCH-slackware-linux
 
 make
-- 
cgit v1.2.3