multimedia/straw-viewer: Updated for version 0.0.2+20200307_9089523.

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

4 files changed, 14 insertions, 32 deletions

diff --git a/multimedia/straw-viewer/README b/multimedia/straw-viewer/README
index 3ad09abd81cf..b25df5614e1f 100644
--- a/multimedia/straw-viewer/README
+++ b/multimedia/straw-viewer/README
@@ -7,6 +7,11 @@ early development stages and some features are not implemented yet.
 straw-viewer is a fork of youtube-viewer that does not require a Google
 API key. Usage and user interface are identical to youtube-viewer.
 
+For playing videos, this uses mplayer, vlc, or mpv. However, the mplayer
+that ships with Slackware 14.2 has some issues with straw-viewer (or
+actually with youtube: the audio stream cuts out randomly). Using vlc
+or mpv is highly recommended.
+
 Optional dependencies:
 
 perl-Gtk3, perl-File-ShareDir - for gtk-straw-viewer.
diff --git a/multimedia/straw-viewer/list-moreutils.diff b/multimedia/straw-viewer/list-moreutils.diff
deleted file mode 100644
index 3e90735e3b2b..000000000000
--- a/multimedia/straw-viewer/list-moreutils.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur straw-viewer-0.0.1/bin/gtk-straw-viewer straw-viewer-0.0.1.patched/bin/gtk-straw-viewer
---- straw-viewer-0.0.1/bin/gtk-straw-viewer	2020-02-26 05:17:22.000000000 -0500
-+++ straw-viewer-0.0.1.patched/bin/gtk-straw-viewer	2020-02-28 17:04:39.723002906 -0500
-@@ -643,11 +643,11 @@
-             undef $history{lc($line)};
-         }
- 
--        require List::Util;
-+        require List::MoreUtils;
- 
-         # Keep only the most recent non-duplicated entries
--        @history        = reverse(List::Util::uniq(reverse(@history)));
--        @search_history = List::Util::uniq(@search_history);
-+        @history        = reverse(List::MoreUtils::uniq(reverse(@history)));
-+        @search_history = List::MoreUtils::uniq(@search_history);
- 
-         # Set entry completion
-         $completion = Gtk3::EntryCompletion->new;
diff --git a/multimedia/straw-viewer/straw-viewer.SlackBuild b/multimedia/straw-viewer/straw-viewer.SlackBuild
index 4ae5be4d63d4..7ac1fee7a9b5 100644
--- a/multimedia/straw-viewer/straw-viewer.SlackBuild
+++ b/multimedia/straw-viewer/straw-viewer.SlackBuild
@@ -6,13 +6,18 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200310 bkw: update to not-quite-latest git. Next commit after 9089523
+# removes mplayer support, which kinda sucks for Slackware users since
+# mplayer ships with the OS (but mpv and vlc don't). My next update will
+# likely re-add mplayer support, unless it's totally broken.
+
 # 20200302 bkw: new build, based on youtube-viewer, of which straw-viewer
 # is a fork. See https://github.com/trizen/youtube-viewer/issues/308 for
 # why. Packaging a git commit because the latest (only) release has some
 # issues that have been fixed.
 
 PRGNAM=straw-viewer
-VERSION=${VERSION:-0.0.1+20200227_ad7ec17}
+VERSION=${VERSION:-0.0.2+20200307_9089523}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,16 +80,6 @@ echo "=== GTK=$GTK  BUILD_GTK=$BUILD_GTK  GTKOPT=$GTKOPT"
 # actually works fine with 14.2's 3.18. So:
 sed -i 's,"3.20","3.18",' share/gtk-$PRGNAM.glade
 
-# 20200228 bkw: 14.2's perl package has List::Util 1.4.1, which lacks
-# the uniq() function. However, SBo's perl-List-MoreUtils provides it.
-# This means we can ignore the build warning:
-# !  List::Util (1.41) is installed, but we need version >= 1.43
-patch -p1 < $CWD/list-moreutils.diff
-
-# 20200306 bkw: upstream must not have ever run 'make test' in a clean
-# environment...
-sed -i 's,Youtube,Straw,g' t/*.t
-
 perl Build.PL prefix=/usr installdirs=vendor --destdir="$PKG" $GTKOPT
 ./Build
 ./Build test
diff --git a/multimedia/straw-viewer/straw-viewer.info b/multimedia/straw-viewer/straw-viewer.info
index b09a7f334a5d..5144df6a25c5 100644
--- a/multimedia/straw-viewer/straw-viewer.info
+++ b/multimedia/straw-viewer/straw-viewer.info
@@ -1,8 +1,8 @@
 PRGNAM="straw-viewer"
-VERSION="0.0.1+20200227_ad7ec17"
+VERSION="0.0.2+20200307_9089523"
 HOMEPAGE="https://github.com/trizen/straw-viewer/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/straw-viewer-0.0.1+20200227_ad7ec17.tar.xz"
-MD5SUM="405dd0bc791b9a970c8b09dbde909fe3"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/straw-viewer-0.0.2+20200307_9089523.tar.xz"
+MD5SUM="60675a74c96dd9d7fa0f1096f32977c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-LWP-Protocol-https perl-JSON perl-Module-Build perl-List-MoreUtils"