audio/mp3splt-gtk: New-style icons.

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

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

4 files changed, 50 insertions, 24 deletions

diff --git a/audio/mp3splt-gtk/README b/audio/mp3splt-gtk/README
index 719414c0b7de..faffc585b7e9 100644
--- a/audio/mp3splt-gtk/README
+++ b/audio/mp3splt-gtk/README
@@ -1,3 +1,5 @@
+mp3splt-gtk (gtk2 gui from the mp3splt project)
+
 Mp3Splt-project is a utility to split mp3 and ogg files selecting a
 begin and an end time position, without decoding. It's very useful to
 split large mp3/ogg to make smaller files or to split entire albums to
diff --git a/audio/mp3splt-gtk/doinst.sh b/audio/mp3splt-gtk/doinst.sh
index 4e8ba7071dea..3e5691a052b5 100644
--- a/audio/mp3splt-gtk/doinst.sh
+++ b/audio/mp3splt-gtk/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild
index af4fd5eb7aaa..f3e8a859dcc7 100644
--- a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild
+++ b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild
@@ -22,11 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20140819 bkw:
-# - Updated for v0.9.1a
-# - Use make install-strip instead of find/xargs/strip
-# - Get rid of redundant/empty TODO and INSTALL from /usr/doc
-# - Don't waste time building doxygen docs, since we don't install them
+# 20211121 bkw: note to self: upstream moved to github and
+# combined all 3 projects (libmp3splt, mp3splt, mp3splt-gtk) into
+# one repo. Probably should combine the SlackBuilds, too. See
+# https://github.com/mp3splt/mp3splt
+
+# 20211121 bkw: BUILD=2
+# - new-style icons.
+# - don't pollute /usr/share/pixmaps with internal-use-only images.
+# - GSTREAMER=no and audacious support are gone. I didn't do this,
+#   rworkman did, just reminding myself why: mp3splt-gtk doesn't
+#   support our newer version of audacious. Sorry, Arthur.
+
+# 20150304 bkw:
+# - Upstream accepted my patch, in somewhat modified form, as revision
+#   1509 in their SVN repo. Update this build to use their patch instead
+#   of mine.
+# - Bump BUILD.
 
 # 20150107 bkw:
 # - Updated for v0.9.2
@@ -34,17 +46,17 @@
 # - Added default_player.diff: if GSTREAMER=no, the default player
 #   will be audacious. Sent patch to upstream too.
 
-# 20150304 bkw:
-# - Upstream accepted my patch, in somewhat modified form, as revision
-#   1509 in their SVN repo. Update this build to use their patch instead
-#   of mine.
-# - Bump BUILD.
+# 20140819 bkw:
+# - Updated for v0.9.1a
+# - Use make install-strip instead of find/xargs/strip
+# - Get rid of redundant/empty TODO and INSTALL from /usr/doc
+# - Don't waste time building doxygen docs, since we don't install them
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mp3splt-gtk
 VERSION=${VERSION:-0.9.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -56,9 +68,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -91,15 +100,14 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # patch made with 'svn diff -c 1509' in a checked-out repo.
 patch -p1 < $CWD/default_player-r1509.diff
 
+sed -i '/Icon/s,=.*,='$PRGNAM',' $PRGNAM.desktop.in
+
 # Disabled audacious support, upstream mp3splt-gtk does not yet support audacious-3.6
 CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -115,11 +123,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-doxygen_doc \
   --build=$ARCH-slackware-linux
 
-make
-make install-strip DESTDIR=$PKG
+make appicondir=/usr/share/$PRGNAM
+make install-strip DESTDIR=$PKG appicondir=/usr/share/$PRGNAM
+
+gzip -9 $PKG/usr/man/man?/*
+
+HICOLOR=$PKG/usr/share/icons/hicolor
+SVG=src/mp3splt-gtk_ico.svg
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$HICOLOR/$size/apps
+  mkdir -p $dir
+  convert -resize $size $SVG $dir/$PRGNAM.png
+done
 
-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/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/mp3splt-gtk/mp3splt-gtk.info b/audio/mp3splt-gtk/mp3splt-gtk.info
index 4a9635504eac..900e1ab64e55 100644
--- a/audio/mp3splt-gtk/mp3splt-gtk.info
+++ b/audio/mp3splt-gtk/mp3splt-gtk.info
@@ -1,7 +1,7 @@
 PRGNAM="mp3splt-gtk"
 VERSION="0.9.2"
 HOMEPAGE="http://mp3splt.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/mp3splt/mp3splt-gtk-0.9.2.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/mp3splt/mp3splt-gtk-0.9.2.tar.gz"
 MD5SUM="17cd1445a13e127a03c13b740e1945fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""