From ceaac30551cde37d86aae1312e46983343f87c55 Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja[at]gmail[dot]com>
Date: Tue, 1 Oct 2019 17:02:03 -0700
Subject: office/grisbi: Updated for version 1.2.2

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
---
 office/grisbi/README            |  2 +-
 office/grisbi/doinst.sh         |  6 ++++++
 office/grisbi/grisbi.SlackBuild | 12 ++++++++++--
 office/grisbi/grisbi.info       |  6 +++---
 4 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'office')

diff --git a/office/grisbi/README b/office/grisbi/README
index f8835546ed..69dafd95ca 100644
--- a/office/grisbi/README
+++ b/office/grisbi/README
@@ -3,4 +3,4 @@ Windows, released under the GPL licence.  Its aim is to provide you with
 the most simple and intuitive software for basic use, and still very
 powerful if you spend a little time on the setup.
 
-Optional dependencies: cunit, libofx and goffice0.8
+Optional dependencies: cunit, libofx and goffice
diff --git a/office/grisbi/doinst.sh b/office/grisbi/doinst.sh
index aea0f894eb..f25bed6fb6 100644
--- a/office/grisbi/doinst.sh
+++ b/office/grisbi/doinst.sh
@@ -11,3 +11,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/office/grisbi/grisbi.SlackBuild b/office/grisbi/grisbi.SlackBuild
index 690264a2eb..3df7924090 100644
--- a/office/grisbi/grisbi.SlackBuild
+++ b/office/grisbi/grisbi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for grisbi
 
-# Copyright 2010-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=grisbi
-VERSION=${VERSION:-1.0.4}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,13 @@ 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 {} \;
 
+# Test for cunit
+if pkg-config --exists cunit; then
+  CUNIT_ENABLED="yes"
+else
+  CUNIT_ENABLED="no"
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --disable-dependency-tracking \
   --disable-silent-rules \
+  --with-cunit=$CUNIT_ENABLED \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/office/grisbi/grisbi.info b/office/grisbi/grisbi.info
index 65b4327803..556dfa8a2f 100644
--- a/office/grisbi/grisbi.info
+++ b/office/grisbi/grisbi.info
@@ -1,8 +1,8 @@
 PRGNAM="grisbi"
-VERSION="1.0.4"
+VERSION="1.2.2"
 HOMEPAGE="http://www.grisbi.org/"
-DOWNLOAD="https://downloads.sourceforge.net/grisbi/grisbi-1.0.4.tar.bz2"
-MD5SUM="23215e7be14cc2ff64ea36f406fc1599"
+DOWNLOAD="https://downloads.sourceforge.net/grisbi/grisbi-1.2.2.tar.bz2"
+MD5SUM="4397b442cd893e07da11fef9bfd8fa49"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3