idesk: update to 0.7.8.

Switching upstream to maintained fork at
https://github.com/neagix/idesk

Also include upstream patch to use pkg-config instead of imlib2-config,
which has been removed from imlib2
This commit is contained in:
Mat Boehlke 2022-09-30 12:11:19 -05:00 committed by classabbyamp
parent 1fe12e4d94
commit 7192bacfe3
2 changed files with 41 additions and 15 deletions

View File

@ -0,0 +1,31 @@
Taken from https://github.com/neagix/idesk/commit/7ed7fae76d2896e02c115448b569d964dab895ee
use pkg-config to find imlib2
diff --git a/configure.in b/configure.in
index 805585d..b7a1032 100644
--- a/configure.in
+++ b/configure.in
@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib"
dnl Imlib2 detection
-AC_PATH_GENERIC(imlib2, , [
- AC_SUBST(IMLIB_LIBS)
- AC_SUBST(IMLIB_CXXFLAGS) ],
- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev))
-
-dnl the above doesn't work for some reason :/
-IMLIB_LIBS=`imlib2-config --libs`
-IMLIB_CFLAGS=`imlib2-config --cflags`
-AC_SUBST(IMLIB_LIBS)
-AC_SUBST(IMLIB_CXXFLAGS)
-
-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
+
+CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS"
LIBS="$LIBS $IMLIB_LIBS"

View File

@ -1,27 +1,22 @@
# Template file for 'idesk'
pkgname=idesk
version=0.7.5
revision=2
version=0.7.8
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
configure_args="--enable-svg"
hostmakedepends="pkg-config automake"
makedepends="giflib-devel imlib2-devel libjpeg-turbo-devel
libpng-devel libXft-devel libXpm-devel tiff-devel"
libpng-devel libXft-devel libXpm-devel tiff-devel librsvg-devel gdk-pixbuf-devel"
short_desc="Gives users of minimal wm's icons on their desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://idesk.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/idesk/idesk-${version}.tar.bz2"
checksum=d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
homepage="https://github.com/neagix/idesk"
changelog="https://raw.githubusercontent.com/neagix/idesk/master/ChangeLog"
distfiles="https://github.com/neagix/idesk/archive/refs/tags/v${version}.tar.gz"
checksum=cb5ccc4e598d4d6de41a55512f0bff5afae16da499009b109322e43286c1c7bd
pre_configure() {
sed -i -e '1,1i#include <unistd.h>' \
-e '1,1i#include <sys/stat.h>' \
-e '1,1i#include <sys/types.h>' \
src/DesktopConfig.cpp
sed -i 's#usr/local#usr#' examples/default.lnk
sed -i 's#IMLIB2_LIBS=.*#IMLIB2_LIBS=-lImlib2#g' configure
sed -i 's#IMLIB_LIBS=.*#IMLIB_LIBS="-L/usr/lib -Wl,-O1,--sort-common,--as-needed,-z,relro -ljpeg -ltiff -lgif -lpng -lz -lm -lXext -lXext -lX11 -lImlib2"#g' configure
autoreconf -fi
}
post_install() {