CVS commit: pkgsrc/sysutils/idesk

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Jul 29 06:02:09 UTC 2022

Modified Files:
        pkgsrc/sysutils/idesk: Makefile distinfo
Added Files:
        pkgsrc/sysutils/idesk/patches: patch-configure

Log Message:
sysutils/idesk: Fix for graphics/imlib2 update

Add minimal support to `pkg-config imlib2`; imlib2-config has been
dropped since imlib2-1.7.5.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/idesk/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/idesk/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/idesk/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/idesk/Makefile
diff -u pkgsrc/sysutils/idesk/Makefile:1.43 pkgsrc/sysutils/idesk/Makefile:1.44
--- pkgsrc/sysutils/idesk/Makefile:1.43 Mon Aug 17 20:20:05 2020
+++ pkgsrc/sysutils/idesk/Makefile      Fri Jul 29 06:02:09 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2020/08/17 20:20:05 leot Exp $
+# $NetBSD: Makefile,v 1.44 2022/07/29 06:02:09 rin Exp $
 #
 
 DISTNAME=      idesk-0.7.5
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    sysutils x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=idesk/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/sysutils/idesk/distinfo
diff -u pkgsrc/sysutils/idesk/distinfo:1.8 pkgsrc/sysutils/idesk/distinfo:1.9
--- pkgsrc/sysutils/idesk/distinfo:1.8  Tue Oct 26 11:19:42 2021
+++ pkgsrc/sysutils/idesk/distinfo      Fri Jul 29 06:02:09 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:19:42 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/07/29 06:02:09 rin Exp $
 
 BLAKE2s (idesk-0.7.5.tar.bz2) = 839bfab1d7974efd3fca4662ab07542deccbd0397ecb6a8161d0c72f11fd6c64
 SHA512 (idesk-0.7.5.tar.bz2) = 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
 Size (idesk-0.7.5.tar.bz2) = 185858 bytes
 SHA1 (patch-aa) = 6eedf7f366552ad626becb66524ddbe21ef8739a
+SHA1 (patch-configure) = 8a14af2671d5ba06dd78db8f098a96e415f4e7e3

Added files:

Index: pkgsrc/sysutils/idesk/patches/patch-configure
diff -u /dev/null pkgsrc/sysutils/idesk/patches/patch-configure:1.1
--- /dev/null   Fri Jul 29 06:02:09 2022
+++ pkgsrc/sysutils/idesk/patches/patch-configure       Fri Jul 29 06:02:09 2022
@@ -0,0 +1,32 @@
+$NetBSD: patch-configure,v 1.1 2022/07/29 06:02:09 rin Exp $
+
+Add minimal support to `pkg-config imlib2`; imlib2-config has been
+dropped since imlib2-1.7.5.
+
+--- configure.orig     2022-07-29 02:55:46.473250206 +0900
++++ configure  2022-07-29 03:03:32.631168267 +0900
+@@ -7031,7 +7031,12 @@
+ echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
+   no_imlib2=""
+   if test "$IMLIB2_CONFIG" = "no" ; then
+-     no_imlib2=yes
++     if pkg-config imlib2; then
++        IMLIB2_CFLAGS="`pkg-config imlib2 --cflags`"
++        IMLIB2_LIBS="`pkg-config imlib2 --libs`"
++     else
++        no_imlib2=yes
++     fi
+   else
+      IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`"
+      IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
+@@ -7067,8 +7072,8 @@
+ 
+ 
+ 
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
++IMLIB_LIBS=$IMLIB2_LIBS
++IMLIB_CFLAGS=$IMLIB2_CFLAGS
+ 
+ 
+