diff options
Diffstat (limited to 'desktop/idesk')
| -rw-r--r-- | desktop/idesk/compilefix.diff | 11 | ||||
| -rw-r--r-- | desktop/idesk/create_user_dir.diff | 18 | ||||
| -rw-r--r-- | desktop/idesk/idesk.SlackBuild | 50 | ||||
| -rw-r--r-- | desktop/idesk/idesk.info | 8 | ||||
| -rw-r--r-- | desktop/idesk/imlib2-config-fake | 4 |
5 files changed, 31 insertions, 60 deletions
diff --git a/desktop/idesk/compilefix.diff b/desktop/idesk/compilefix.diff deleted file mode 100644 index 2d64318916..0000000000 --- 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 652c424041..0000000000 --- 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 3040b30b93..232d4c043a 100644 --- a/desktop/idesk/idesk.SlackBuild +++ b/desktop/idesk/idesk.SlackBuild @@ -8,19 +8,22 @@ # 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} +VERSION=${VERSION:-0.7.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -62,33 +65,26 @@ 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 +# really insist on using it. fake it out. +export PATH=$(pwd):$PATH +cat $CWD/imlib2-config-fake > imlib2-config +chmod +x imlib2-config + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/idesk/idesk.info b/desktop/idesk/idesk.info index 20e75adcb9..64eb6a412d 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" diff --git a/desktop/idesk/imlib2-config-fake b/desktop/idesk/imlib2-config-fake new file mode 100644 index 0000000000..e6c4f196d9 --- /dev/null +++ b/desktop/idesk/imlib2-config-fake @@ -0,0 +1,4 @@ +#!/bin/sh + +[ "$1" = "--libs" ] && echo "-lImlib2" +exit 0 |