From 38795c4b65a727c919aae4964d71a4efdeeb849b Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sun, 27 Feb 2022 10:18:54 -0500
Subject: graphics/meshlab: Fix github filename, desktop, doinst.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 graphics/meshlab/doinst.sh          |  6 ++++++
 graphics/meshlab/meshlab.SlackBuild | 32 ++++++++++++++++++--------------
 graphics/meshlab/meshlab.info       |  2 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'graphics')

diff --git a/graphics/meshlab/doinst.sh b/graphics/meshlab/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/graphics/meshlab/doinst.sh
+++ b/graphics/meshlab/doinst.sh
@@ -1,3 +1,9 @@
 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/graphics/meshlab/meshlab.SlackBuild b/graphics/meshlab/meshlab.SlackBuild
index db322a1554..0263dd9551 100644
--- a/graphics/meshlab/meshlab.SlackBuild
+++ b/graphics/meshlab/meshlab.SlackBuild
@@ -22,6 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org:
+# - use the correct filename in the github URL.
+# - make .desktop file validate.
+# - fix doinst.sh.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=meshlab
@@ -40,9 +45,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
@@ -71,19 +73,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --transform="s#$SRCNAM-$VERSION/#$VERSION/#"
-cd $PRGNAM-$VERSION/src
+FILENAME=$PRGNAM-$SRCNAM-$VERSION
+
+rm -rf $FILENAME
+tar xvf $CWD/$FILENAME.tar.gz
+cd $FILENAME/src
 tar xvf $CWD/$VCGLIB-$VERSION.tar.gz --transform="s#$VCGLIB-$VERSION/#$VCGLIB/#"
-cd -
-chown -R root:root $PRGNAM-$VERSION
-find -L $PRGNAM-$VERSION \
+cd ..
+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 \
+  -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 {} \;
-
-cd $PRGNAM-$VERSION
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cmake \
@@ -119,7 +121,9 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # fix version in desktop entry
-sed -i "s#Version=.*#Version=$VERSION#" $PKG/usr/share/applications/$PRGNAM.desktop
+#sed -i "s#Version=.*#Version=$VERSION#" $PKG/usr/share/applications/$PRGNAM.desktop
+# 20220227 bkw: wrong. Version in a .desktop file is the version of the
+# desktop file specification (usually 1.0), not the version of the application.
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/graphics/meshlab/meshlab.info b/graphics/meshlab/meshlab.info
index 13eb48e377..314da964b4 100644
--- a/graphics/meshlab/meshlab.info
+++ b/graphics/meshlab/meshlab.info
@@ -1,7 +1,7 @@
 PRGNAM="meshlab"
 VERSION="2021.10"
 HOMEPAGE="http://www.meshlab.net/"
-DOWNLOAD="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-2021.10/meshlab-2021.10.tar.gz \
+DOWNLOAD="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-2021.10/meshlab-Meshlab-2021.10.tar.gz \
           https://github.com/cnr-isti-vclab/vcglib/archive/2021.10/vcglib-2021.10.tar.gz"
 MD5SUM="bb1d2f373549cce1d48fb589033f6b2a \
         12cce090b9292e3306f6ee4848e58e1e"
-- 
cgit v1.2.3