From ce432ca8e3e780c213eed3f61f042cf929b3f917 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 8 Feb 2022 01:10:12 -0500
Subject: desktop/mhsetroot: New maintainer.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/mhsetroot/README               |  4 +++-
 desktop/mhsetroot/mhsetroot.SlackBuild | 30 +++++++++++++++++++-----------
 desktop/mhsetroot/mhsetroot.info       |  4 ++--
 desktop/mhsetroot/slack-desc           |  2 +-
 4 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'desktop')

diff --git a/desktop/mhsetroot/README b/desktop/mhsetroot/README
index 4492ee2575..7733ba3b77 100644
--- a/desktop/mhsetroot/README
+++ b/desktop/mhsetroot/README
@@ -1,5 +1,7 @@
-A background image setter
+mhsetroot (sets background image for X)
 
 Forked from hsetroot, adding more flexibility to the program, such as 
 setting actual dimensions to the image itself to be shown on the 
 desktop.
+
+There is no man page, but you can run "mhsetroot --help".
diff --git a/desktop/mhsetroot/mhsetroot.SlackBuild b/desktop/mhsetroot/mhsetroot.SlackBuild
index 7c1bf93dda..426321a3c0 100644
--- a/desktop/mhsetroot/mhsetroot.SlackBuild
+++ b/desktop/mhsetroot/mhsetroot.SlackBuild
@@ -22,6 +22,19 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>.
+
+# 20220208 bkw: BUILD=2
+# - take over maintenance.
+# - install AUTHORS and COPYING to doc dir.
+
+# 20220208 bkw: There is a mhsetroot-2.0 on the sourceforge page,
+# but it has issues. There is no documentatation at all (not even a
+# README), it aborts with a double-free error every time it exits,
+# it creates a "~/mhsetrootimage" when it runs (not in a dot dir), and
+# its options are totally incompatible with 1.6.2's. Not updating to
+# 2.0, but possibly the 2.x branch will mature someday.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mhsetroot
@@ -38,9 +51,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
@@ -73,11 +83,8 @@ 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 640 -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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
@@ -88,9 +95,10 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog README  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/mhsetroot/mhsetroot.info b/desktop/mhsetroot/mhsetroot.info
index 144d4f0097..f9ab2f04fa 100644
--- a/desktop/mhsetroot/mhsetroot.info
+++ b/desktop/mhsetroot/mhsetroot.info
@@ -6,5 +6,5 @@ MD5SUM="cd27d820be6eadcc6c99b26e133b8e9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
-MAINTAINER="Mike Heras"
-EMAIL="userxbw@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/mhsetroot/slack-desc b/desktop/mhsetroot/slack-desc
index 1f46e9710a..36473cdfa7 100644
--- a/desktop/mhsetroot/slack-desc
+++ b/desktop/mhsetroot/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-mhsetroot: mhsetroot (sets background image )
+mhsetroot: mhsetroot (sets background image for X)
 mhsetroot:
 mhsetroot: A background image setter.
 mhsetroot:
-- 
cgit v1.2.3