From 2dc18cf6b94fa33d281a7c3dcc66f79212fc368f Mon Sep 17 00:00:00 2001
From: ArTourter <artourter@gmail.com>
Date: Fri, 6 Jul 2018 23:03:14 +0100
Subject: desktop/redshift: Updated for version 1.12.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 desktop/redshift/README              |  8 +++++++-
 desktop/redshift/redshift.SlackBuild | 16 ++++++++++------
 desktop/redshift/redshift.info       |  8 ++++----
 3 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'desktop/redshift')

diff --git a/desktop/redshift/README b/desktop/redshift/README
index 540fcd8ab8..6b0aadd08d 100644
--- a/desktop/redshift/README
+++ b/desktop/redshift/README
@@ -4,4 +4,10 @@ Redshift adjusts the colour temperature of your screen according to
 your surroundings. This may help your eyes if you are working in
 front of the screen at night.
 
-This package has an optional dependency on geoclue and/or geoclue2.
+This package has a dependency on geoclue2, however it will compile the package
+without it if geoclue2 is not present.
+
+This package will build against python3 for the gui if python3 is available.
+If not, we use the fedora patch to build the gui with python2. If you want to
+compile using python3 on 14.2, you will need the pyxdg and pygobject3-python3
+packages from SBo.
diff --git a/desktop/redshift/redshift.SlackBuild b/desktop/redshift/redshift.SlackBuild
index 52adf1313d..4c26391061 100644
--- a/desktop/redshift/redshift.SlackBuild
+++ b/desktop/redshift/redshift.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain, written 2010.
 
 PRGNAM=redshift
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -52,16 +52,20 @@ 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 {} \;
 
+# Geoclue2 should really be installed for full functionality but will compile
+# without it anyway if not.
 if ! pkg-config --exists geoclue-2.0
 then
    CLUE2="--disable-geoclue2"
 fi
 
-# build redshift-gtk, forcing python2
+# build redshift-gtk, forcing python2 if python3 is not present
 # thanks to the fedora project for the patch
-sed -i 's/\(AM_PATH_PYTHON(\[\)3\.2/\12.7/' configure.ac
-sed -i 's/\(env python\)3/\1/' src/redshift-gtk/redshift-gtk.in
-autopoint -f && AUTOPOINT="intltoolize --automake --copy" autoreconf -vif
+if ! $(command -v python3 &>/dev/null); then
+  sed -i 's/\(AM_PATH_PYTHON(\[\)3\.2/\12.7/' configure.ac
+  sed -i 's/\(env python\)3/\1/' src/redshift-gtk/redshift-gtk.in
+  autopoint -f && AUTOPOINT="intltoolize --automake --copy" autoreconf -vif
+fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,7 +90,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING DESIGN HACKING README NEWS  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md COPYING DESIGN README-colorramp README NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/redshift/redshift.info b/desktop/redshift/redshift.info
index 8b8780b5a3..e0d56e7410 100644
--- a/desktop/redshift/redshift.info
+++ b/desktop/redshift/redshift.info
@@ -1,10 +1,10 @@
 PRGNAM="redshift"
-VERSION="1.11"
+VERSION="1.12"
 HOMEPAGE="http://jonls.dk/redshift/"
-DOWNLOAD="https://github.com/jonls/redshift/releases/download/v1.11/redshift-1.11.tar.xz"
-MD5SUM="a31d768b0348c5202e58612855a9027e"
+DOWNLOAD="https://github.com/jonls/redshift/releases/download/v1.12/redshift-1.12.tar.xz"
+MD5SUM="5d04f2413dacdf3434cb86f373842462"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyxdg"
+REQUIRES="pyxdg geoclue2"
 MAINTAINER="ArTourter"
 EMAIL="artourter@gmail.com"
-- 
cgit v1.2.3