multimedia/rpi-imager: New maintainer, Updated for version 1.8.5.

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

4 files changed, 49 insertions, 21 deletions

diff --git a/multimedia/rpi-imager/remove_update_checking.patch b/multimedia/rpi-imager/remove_update_checking.patch
new file mode 100644
index 0000000000..f1e5d6b284
--- /dev/null
+++ b/multimedia/rpi-imager/remove_update_checking.patch
@@ -0,0 +1,17 @@
+diff --color --unified --recursive --text orig/src/main.qml new/src/main.qml
+--- orig/src/main.qml	2023-11-18 09:52:10.767398847 +0100
++++ new/src/main.qml	2023-11-18 09:53:12.521334474 +0100
+@@ -1500,13 +1500,6 @@
+                     }
+                 }
+             }
+-
+-            if (imageWriter.getBoolSetting("check_version") && "latest_version" in imager && "url" in imager) {
+-                if (!imageWriter.isEmbeddedMode() && imageWriter.isVersionNewer(imager["latest_version"])) {
+-                    updatepopup.url = imager["url"]
+-                    updatepopup.openPopup()
+-                }
+-            }
+             if ("default_os" in imager) {
+                 selectNamedOS(imager["default_os"], osmodel)
+             }
diff --git a/multimedia/rpi-imager/rpi-imager.SlackBuild b/multimedia/rpi-imager/rpi-imager.SlackBuild
index 2da32e41e6..38f5d83136 100644
--- a/multimedia/rpi-imager/rpi-imager.SlackBuild
+++ b/multimedia/rpi-imager/rpi-imager.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for rpi-imager
 
 # Copyright 2023 suncon The Earth
+# Copyright 2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=rpi-imager
-VERSION=${VERSION:-1.7.5}
+VERSION=${VERSION:-1.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,6 +39,9 @@ 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
@@ -72,6 +76,7 @@ cd $TMP
 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 \
@@ -79,17 +84,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# patch out the debian update check
+patch -Np1 -i $CWD/remove_update_checking.patch
+
 mkdir -p build
 cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release ../src
-  make
-  make install/strip DESTDIR=$PKG
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cmake -S ../src \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -G Ninja
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -101,11 +111,12 @@ cp -a doc/man/rpi-imager.1 $PKG/usr/man/man1/
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a license.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/rpi-imager/rpi-imager.info b/multimedia/rpi-imager/rpi-imager.info
index 5f7bb57161..eaae10512a 100644
--- a/multimedia/rpi-imager/rpi-imager.info
+++ b/multimedia/rpi-imager/rpi-imager.info
@@ -1,10 +1,10 @@
 PRGNAM="rpi-imager"
-VERSION="1.7.5"
-HOMEPAGE="https://www.raspberrypi.com/software"
-DOWNLOAD="https://github.com/raspberrypi/rpi-imager/archive/refs/tags/v1.7.5/rpi-imager-1.7.5.tar.gz"
-MD5SUM="9125b363b245a770aabbe0f02d9d9014"
+VERSION="1.8.5"
+HOMEPAGE="https://github.com/raspberrypi/rpi-imager/"
+DOWNLOAD="https://github.com/raspberrypi/rpi-imager/archive/v1.8.5/rpi-imager-1.8.5.tar.gz"
+MD5SUM="6d09b83ff545135bc2cec405df186bcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="suncon"
-EMAIL="suncon@posteo.net"
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/multimedia/rpi-imager/slack-desc b/multimedia/rpi-imager/slack-desc
index 1daabe36ec..0513b319cb 100644
--- a/multimedia/rpi-imager/slack-desc
+++ b/multimedia/rpi-imager/slack-desc
@@ -8,12 +8,12 @@
           |-----handy-ruler------------------------------------------------------|
 rpi-imager: rpi-imager (Raspberry Pi Imaging Utility)
 rpi-imager:
-rpi-imager: Raspberry Pi Imager is the quick and easy way to install Raspberry
-rpi-imager: Pi OS and other operating systems to a microSD card, ready to use
-rpi-imager: with your Raspberry Pi.
+rpi-imager: User-friendly tool for creating bootable media for Raspberry Pi
+rpi-imager: devices.
+rpi-imager:
+rpi-imager: Homepage: https:/github.com/raspberrypi/rpi-imager
 rpi-imager:
 rpi-imager:
 rpi-imager:
 rpi-imager:
 rpi-imager:
-rpi-imager: https://www.raspberrypi.com/software