From 53bbb268a98de370499450f495a4c5b540018511 Mon Sep 17 00:00:00 2001
From: Andrzej Telszewski <atelszewski@gmail.com>
Date: Fri, 24 Nov 2017 21:08:57 +0000
Subject: office/osmo: Updated for version 0.4.2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 office/osmo/README                                | 12 +++++++++---
 office/osmo/fix-building-without-webkit2gtk.patch | 18 ++++++++++++++++++
 office/osmo/osmo.SlackBuild                       |  4 +++-
 office/osmo/osmo.info                             |  6 +++---
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 office/osmo/fix-building-without-webkit2gtk.patch

(limited to 'office/osmo')

diff --git a/office/osmo/README b/office/osmo/README
index 7e8336eb0e..270104178a 100644
--- a/office/osmo/README
+++ b/office/osmo/README
@@ -7,7 +7,13 @@ the keyboard. Also, a lot of parameters are configurable to meet the
 user's preferences. On the technical side, Osmo is GTK+3 based tool
 which uses a plain XML database to store all personal data.
 
-Optional build-time dependencies are (available from SlackBuilds.org):
+Optional, build-time dependencies available from SlackBuilds.org:
 - libgringotts:  for backup support,
-- webkit2gtk:    for contacts support,
-- gtkspell3:     for spell checker.
+- webkit2gtk:    for contacts support.
+
+Optional, build-time dependencies not available from SlackBuilds.org:
+- gspell:        for spell checker.
+
+Note:
+Required version of gspell is >= 1.2.0, which requires gtk+-3.0 >= 3.20.
+Slackware 14.2 does not provide new enough gtk+3.
diff --git a/office/osmo/fix-building-without-webkit2gtk.patch b/office/osmo/fix-building-without-webkit2gtk.patch
new file mode 100644
index 0000000000..8c33705cdf
--- /dev/null
+++ b/office/osmo/fix-building-without-webkit2gtk.patch
@@ -0,0 +1,18 @@
+--- src/main.c.orig	2017-05-21 08:52:45.000000000 +0200
++++ src/main.c	2017-11-24 15:39:26.653090218 +0100
+@@ -349,8 +349,15 @@
+     g_free (cal);
+     g_free (appGUI);
+     g_free(cmd_cfg_path);
++
++#ifdef CONTACTS_ENABLED
+     g_free(cmd_mutt_query);
++#endif  /* CONTACTS_ENABLED */
++
++#ifdef HAVE_LIBWEBKIT
+     g_free(cmd_stylesheet_file);
++#endif  /* HAVE_LIBWEBKIT */
++
+ #ifndef WIN32
+     g_free (s_lock);
+ #endif /* WIN32 */
diff --git a/office/osmo/osmo.SlackBuild b/office/osmo/osmo.SlackBuild
index 15452b9908..0b7d22046b 100644
--- a/office/osmo/osmo.SlackBuild
+++ b/office/osmo/osmo.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=osmo
-VERSION=${VERSION:-0.4.0_1}
+VERSION=${VERSION:-0.4.2}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -71,6 +71,8 @@ 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 {} \;
 
+patch -p0 < $CWD/fix-building-without-webkit2gtk.patch
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/office/osmo/osmo.info b/office/osmo/osmo.info
index b0b0649c11..e74c43cc1b 100644
--- a/office/osmo/osmo.info
+++ b/office/osmo/osmo.info
@@ -1,8 +1,8 @@
 PRGNAM="osmo"
-VERSION="0.4.0_1"
+VERSION="0.4.2"
 HOMEPAGE="http://clayo.org/osmo/"
-DOWNLOAD="http://sourceforge.net/projects/osmo-pim/files/osmo-pim/osmo-0.4.0/osmo-0.4.0-1.tar.gz"
-MD5SUM="a05124969e1db0032b6dde4cc2e0be44"
+DOWNLOAD="https://sourceforge.net/projects/osmo-pim/files/osmo-pim/osmo-0.4.2/osmo-0.4.2.tar.gz"
+MD5SUM="053d200f7dc5b098ef3b3d6325810009"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3