icewm: update to 3.5.0

[Aleksey Cheusov <vle%gmx.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Aleksey Cheusov <vle%gmx.net@localhost>
Pushed By:	cheusov
Date:		Mon Jun 3 01:56:59 2024 +0400
Changeset:	2a17108f83820522e8234390fe2fecf7663b4923

Modified Files:
	icewm3/Makefile
	icewm3/distinfo
Removed Files:
	icewm3/patches/patch-src_udir.cc
	icewm3/patches/patch-src_ylocale.cc

Log Message:
icewm: update to 3.5.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2a17108f83820522e8234390fe2fecf7663b4923

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

diffstat:
 icewm3/Makefile                     | 11 ++++++++---
 icewm3/distinfo                     |  8 +++-----
 icewm3/patches/patch-src_udir.cc    | 33 ---------------------------------
 icewm3/patches/patch-src_ylocale.cc | 25 -------------------------
 4 files changed, 11 insertions(+), 66 deletions(-)

diffs:
diff --git a/icewm3/Makefile b/icewm3/Makefile
index ed6be46954..92535940f6 100644
--- a/icewm3/Makefile
+++ b/icewm3/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD$
 
-DISTNAME=	icewm-3.4.7
+DISTNAME=	icewm-3.5.0
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ice-wm/icewm/releases/download/${PKGVERSION_NOREV}/}
-EXTRACT_SUFX=	.tar.lz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://ice-wm.org/
@@ -21,12 +20,18 @@ USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--enable-corefonts
 CONFIGURE_ARGS+=	--enable-i18n
 
-USE_TOOLS+=	pkg-config gmake perl
+TOOL_DEPENDS+=	multimarkdown-[0-9]*:../../textproc/multimarkdown
+
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config gmake perl autoreconf autoconf automake
 
 REPLACE_PERL=	contrib/icewm-menu-xrandr
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fis
+
 post-extract:
 	cp ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
diff --git a/icewm3/distinfo b/icewm3/distinfo
index 9c3cd8bd07..0f8b89d89a 100644
--- a/icewm3/distinfo
+++ b/icewm3/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-BLAKE2s (icewm-3.4.7.tar.lz) = ecd121af13067430da4e9d2f92e167f37c28f9575bc9e333e4e197681e96f7e4
-SHA512 (icewm-3.4.7.tar.lz) = 6db8186dec7e286515416737ec1796bc9d0c2399ae109f6fb7aebca9938c3ab6c674546b60952b63bf65d0336d3b873f316af175646f873d6c8127c5b1cdceda
-Size (icewm-3.4.7.tar.lz) = 1837566 bytes
-SHA1 (patch-src_udir.cc) = 072f30f5a6700b355ff945825e0d838f935afbb6
-SHA1 (patch-src_ylocale.cc) = c4f33796e2391787c79d672661619b81b2712873
+BLAKE2s (icewm-3.5.0.tar.gz) = 85fd2f655706373765b00f7dc7b0b98857079030de971dcff8661e33a4fa64fa
+SHA512 (icewm-3.5.0.tar.gz) = 1c64051d440ee9de5262df6e4b13014cdc4e876cc0c2e67245517b71e902dc42c607b0dbbf608383b9bbbbedef6645901237a5fa252d0362a5cc9d29800ce0c0
+Size (icewm-3.5.0.tar.gz) = 2487105 bytes
diff --git a/icewm3/patches/patch-src_udir.cc b/icewm3/patches/patch-src_udir.cc
deleted file mode 100644
index bab7e75382..0000000000
--- a/icewm3/patches/patch-src_udir.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Unsure why the class override of the pointer operator isn't working
-Reported at: https://github.com/bbidulock/icewm/issues/774
-
---- src/udir.cc.orig	2024-03-25 19:03:14.000000000 +0000
-+++ src/udir.cc
-@@ -22,6 +22,7 @@ public:
-     operator DIR*() const { return ptr; }
-     operator bool() const { return ptr != nullptr; }
- 
-+    DIR* dir() const { return ptr; }
-     char* name() const { return de->d_name; }
-     int length() const { return int(strlen(name())); }
-     int size() const { return 1 + length(); }
-@@ -152,7 +153,7 @@ void cdir::rewind() {
- }
- 
- int cdir::descriptor() const {
--    return dirp ? dirfd(*dirp) : -1;
-+    return dirp ? dirfd(dirp->dir()) : -1;
- }
- 
- adir::adir(const char* path)
-@@ -270,7 +271,7 @@ bool udir::nextFile() {
- }
- 
- int udir::descriptor() const {
--    return dirp ? dirfd(*dirp) : -1;
-+    return dirp ? dirfd(dirp->dir()) : -1;
- }
- 
- sdir::sdir(upath path)
diff --git a/icewm3/patches/patch-src_ylocale.cc b/icewm3/patches/patch-src_ylocale.cc
deleted file mode 100644
index 74bdda92c4..0000000000
--- a/icewm3/patches/patch-src_ylocale.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Upstream bug. Expects a char **
-Reported at: https://github.com/bbidulock/icewm/issues/775
-
---- src/ylocale.cc.orig	2024-03-25 19:03:14.000000000 +0000
-+++ src/ylocale.cc
-@@ -204,7 +204,7 @@ char* YLocale::localeString(const wchar_
- 
-     errno = 0;
-     size_t count = iconv(instance->converter->localer(),
--                         &inbuf, &inlen, &outbuf, &outlen);
-+                         (char **)&inbuf, &inlen, &outbuf, &outlen);
-     if (count == size_t(-1)) {
-         static unsigned count, shift;
-         if (++count <= 2 || (count - 2) >= (1U << shift)) {
-@@ -239,7 +239,7 @@ wchar_t* YLocale::unicodeString(const ch
- 
-     errno = 0;
-     size_t count = iconv(instance->converter->unicode(),
--                         &inbuf, &inlen, &outbuf, &outlen);
-+                         (char **)&inbuf, &inlen, &outbuf, &outlen);
-     if (count == size_t(-1)) {
-         static unsigned count, shift;
-         if (++count >= (1U << shift)) {