games/xcowsay: Updated for version 1.5.1.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 19 insertions, 24 deletions

diff --git a/games/xcowsay/README b/games/xcowsay/README
index 26b743f4fa..c401df986d 100644
--- a/games/xcowsay/README
+++ b/games/xcowsay/README
@@ -1,3 +1,5 @@
+xcowsay (display a cute cow and speech bubble)
+
 xcowsay displays a cute cow and message on your desktop. Inspired by
 the original cowsay.
 
@@ -9,11 +11,13 @@ xcowsay includes all these amazing features:
  * Can draw thought and speech bubbles.
  * Daemon mode! Send your cow messages over DBus!
  * Three different sized cows provided.
- * fortune(6) wrapper program xcowfortune: cow will deliver pearls of wisdom!
+ * fortune(6) wrapper xcowfortune: cow will deliver pearls of wisdom!
  * Replace the naffness that is xmessage(1).
  * Should work with any window manager.
  * Supports UTF-8 characters properly.
  * Use alternative non-cow images if you like.
 
-Note: Please don't ask for this to be updated for version 1.5. I know
-it exists. See README_1.5.txt for an explanation.
+If you're using older hardware and have problems with this, you may
+have better results with xcowsay-1.4. To do this, get the old source:
+https://github.com/nickg/xcowsay/releases/download/v1.4/xcowsay-1.4.tar.gz
+and run the script with VERSION=1.4 in the environment.
diff --git a/games/xcowsay/README_1.5.txt b/games/xcowsay/README_1.5.txt
deleted file mode 100644
index 4e71bd4fd5..0000000000
--- a/games/xcowsay/README_1.5.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-For now, the xcowsay SlackBuild remains one version behind the latest
-release. This is because the latest (1.5) release doesn't work for
-everybody.
-
-Starting with version 1.5, xcowsay requires a compositing window manager
-that supports alpha channels. This build is for version 1.4, the last
-one which works correctly with traditional window managers such as
-WindowMaker or FVWM. Version 1.4 also works fine in environments where
-1.5 would work. If you *really* want version 1.5, download its source
-to the SlackBuild's directory and build it with a command like:
-
-# VERSION=1.5 BUILD=1 TAG=_custom ./xcowsay.SlackBuild
-
-Hopefully, some future version of xcowsay will make the compositing
-support optional (and maybe even autodetected), so this script can be
-updated to track new xcowsay releases again.
diff --git a/games/xcowsay/slack-desc b/games/xcowsay/slack-desc
index 2fc416d549..ad71e0f4cd 100644
--- a/games/xcowsay/slack-desc
+++ b/games/xcowsay/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-xcowsay: xcowsay (displays a cute cow and message on your desktop)
+xcowsay: xcowsay (display a cute cow and speech bubble)
 xcowsay:
 xcowsay: xcowsay displays a cute cow and message on your desktop. Inspired by
 xcowsay: the original cowsay.
diff --git a/games/xcowsay/xcowsay.SlackBuild b/games/xcowsay/xcowsay.SlackBuild
index 0605052be1..1cb75cce7e 100644
--- a/games/xcowsay/xcowsay.SlackBuild
+++ b/games/xcowsay/xcowsay.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201103 bkw:
+# - Update for v1.5.1. The changelog for this version says this:
+#   Fix black squares around cow and bubble on non-compositing window manager.
+#   And it works fine in the window managers I've tried it with, so
+#   it's probably fine to upgrade. Add note to README about how to
+#   build 1.4, if someone needs it.
+
 # 20200221 bkw:
 # - BUILD=2
 # - Add man pages for xcow(dream|fortune|think)
@@ -16,7 +23,7 @@
 #   at some point.
 
 PRGNAM=xcowsay
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/games/xcowsay/xcowsay.info b/games/xcowsay/xcowsay.info
index 6ec9929895..e8fe4e159d 100644
--- a/games/xcowsay/xcowsay.info
+++ b/games/xcowsay/xcowsay.info
@@ -1,8 +1,8 @@
 PRGNAM="xcowsay"
-VERSION="1.4"
+VERSION="1.5.1"
 HOMEPAGE="http://www.doof.me.uk/xcowsay/"
-DOWNLOAD="https://github.com/nickg/xcowsay/releases/download/v1.4/xcowsay-1.4.tar.gz"
-MD5SUM="1e9933c6f48f1e8fffbeaeb6ba0e2bc8"
+DOWNLOAD="https://github.com/nickg/xcowsay/releases/download/v1.5.1/xcowsay-1.5.1.tar.gz"
+MD5SUM="e57cfd50979de8cd590968a8d3230eaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""