desktop/idesk: Updated for version 0.7.8.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

4 files changed, 20 insertions, 61 deletions

diff --git a/desktop/idesk/compilefix.diff b/desktop/idesk/compilefix.diff
deleted file mode 100644
index 2d643189167d..000000000000
--- a/desktop/idesk/compilefix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur idesk-0.7.5/src/DesktopConfig.cpp idesk-0.7.5.patched/src/DesktopConfig.cpp
---- idesk-0.7.5/src/DesktopConfig.cpp	2005-11-10 18:07:58.000000000 -0500
-+++ idesk-0.7.5.patched/src/DesktopConfig.cpp	2014-07-05 00:14:38.000000000 -0400
-@@ -1,3 +1,7 @@
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+
- /* vim:tabstop=4:expandtab:shiftwidth=4
-  * 
-  * Idesk -- DesktopConfig.cpp
diff --git a/desktop/idesk/create_user_dir.diff b/desktop/idesk/create_user_dir.diff
deleted file mode 100644
index 652c424041cc..000000000000
--- a/desktop/idesk/create_user_dir.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur idesk-0.7.5/src/DesktopConfig.cpp idesk-0.7.5.patched/src/DesktopConfig.cpp
---- idesk-0.7.5/src/DesktopConfig.cpp	2005-11-10 18:07:58.000000000 -0500
-+++ idesk-0.7.5.patched/src/DesktopConfig.cpp	2014-08-15 20:50:47.000000000 -0400
-@@ -236,11 +236,13 @@
- 
-     directory += "/.idesktop/";
- 
-+	 mkdir(directory.c_str(), 0755);
-+
-     fileCount = scandir(directory.c_str(), &files, 0, alphasort);
-     
-     if (fileCount == -1)
-     {
--        cout << "Error: you have to create the .idesktop dir on your HOME!!\n";
-+        cout << "Error: Can't find or create the .idesktop dir on your HOME!!\n";
-         _exit (1);
-     }
- 
diff --git a/desktop/idesk/idesk.SlackBuild b/desktop/idesk/idesk.SlackBuild
index 8644bb97b19c..232d4c043acd 100644
--- a/desktop/idesk/idesk.SlackBuild
+++ b/desktop/idesk/idesk.SlackBuild
@@ -8,22 +8,23 @@
 
 # Disclaimer:
 
-# idesk is old and unmaintained. I wrote this SlackBuild at the request
-# of someone on IRC, and decided "what the hell, I'll submit it". If
-# you're reading this because you want to change anything about it, you're
-# welcome to take over maintenance of this build (seriously, I don't use
-# idesk, beyond running it once and seeing that it worked). The only
-# maintenance I'll ever do for this build is to fix any build problems
-# on future versions of Slackware (unless upstream suddenly releases a
-# new version, but it's been a dead project for almost 10 years now).
+# idesk is old and semi-maintained. I wrote this SlackBuild at the
+# request of someone on IRC, and decided "what the hell, I'll submit
+# it". If you're reading this because you want to change anything
+# about it, you're welcome to take over maintenance of this build
+# (seriously, I don't use idesk, beyond running it once and seeing
+# that it worked). Now that there's a new release, I'll keep this
+# updated.
+
+# 20230902 bkw: switch to semi-maintained fork, v0.7.8.
 
 # 20230108 bkw: BUILD=2, work around imlib2-0.10.0 breakage.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=idesk
-VERSION=${VERSION:-0.7.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.7.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -64,31 +65,18 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# missing #include files, newer g++ cares more than the ones from 2005.
-patch -p1 < $CWD/compilefix.diff
-
-# The next two stanzas allow the program to start up without the user
-# having to create or edit any config files. It won't *do* much but at
-# least we can tell if it works or not. This seems like a minor deviation
-# from the Slackware way, but in reality it lets me automate my testing
-# so it ultimately increases the amount of slack in the universe.
-
-# don't abort if ~/.idesktop/ dir doesn't exist (just create it). Seriously,
-# that almost belongs on thedailywtf.
-patch -p1 < $CWD/create_user_dir.diff
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # don't reference /usr/local in default.lnk (which gets installed in
 # /usr/share/idesk as well as /usr/doc). Also use kdialog for the
-# "about" icon, as Slackware doesn't ship Xdialog.
+# "about" icon, as Slackware doesn't ship zenity.
 sed -i \
   -e 's,/usr/local,/usr,g' \
-  -e 's,Xdialog,kdialog,g' \
+  -e 's,zenity *--info *--text,kdialog --msgbox,g' \
   examples/*
 
 # 20230108 bkw: imlib2 dropped their imlib2-config script, this configure
diff --git a/desktop/idesk/idesk.info b/desktop/idesk/idesk.info
index 20e75adcb929..64eb6a412d8a 100644
--- a/desktop/idesk/idesk.info
+++ b/desktop/idesk/idesk.info
@@ -1,8 +1,8 @@
 PRGNAM="idesk"
-VERSION="0.7.5"
-HOMEPAGE="http://idesk.sourceforge.net/html/index.html"
-DOWNLOAD="http://downloads.sourceforge.net/project/idesk/idesk/idesk-0.7.5/idesk-0.7.5.tar.bz2"
-MD5SUM="beb48c97815c7b085e3b3d601297fbb8"
+VERSION="0.7.8"
+HOMEPAGE="https://github.com/neagix/idesk"
+DOWNLOAD="https://github.com/neagix/idesk/archive/v0.7.8/idesk-0.7.8.tar.gz"
+MD5SUM="8e65d423498868cd62705e57a2ab1b5b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"