Module Name: pkgsrc-wip
Committed By: Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By: nuclearkev
Date: Mon May 13 10:13:29 2024 -0400
Changeset: 7390e5fefde4d1d275d1e8c89d41923b2df229f8
Modified Files:
icewm3/Makefile
icewm3/distinfo
icewm3/patches/patch-src_udir.cc
icewm3/patches/patch-src_ylocale.cc
Removed Files:
icewm3/TODO
Log Message:
icewm3: fixed up and finished TODO
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7390e5fefde4d1d275d1e8c89d41923b2df229f8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
icewm3/Makefile | 7 +++++--
icewm3/TODO | 2 --
icewm3/distinfo | 4 ++--
icewm3/patches/patch-src_udir.cc | 20 +++++++++++++++-----
icewm3/patches/patch-src_ylocale.cc | 4 +++-
5 files changed, 25 insertions(+), 12 deletions(-)
diffs:
diff --git a/icewm3/Makefile b/icewm3/Makefile
index 20fe7fe412..7d0f295722 100644
--- a/icewm3/Makefile
+++ b/icewm3/Makefile
@@ -7,8 +7,8 @@ EXTRACT_SUFX= .tar.lz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/ice-wm/icewm/releases/download/3.4.7/
-COMMENT= Small, fast and light-weight window manager
-LICENSE= gplv2
+COMMENT= Small, fast and light-weight window manager
+LICENSE= gnu-gpl-v2
CONFLICTS+= icewm-imlib-[0-9]*
@@ -18,6 +18,9 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
+CONFIGURE_ARGS+= --enable-corefonts
+CONFIGURE_ARGS+= --enable-i18n
+
USE_TOOLS+= pkg-config gmake
REPLACE_PERL= contrib/icewm-menu-xrandr
diff --git a/icewm3/TODO b/icewm3/TODO
deleted file mode 100644
index 753419ebdb..0000000000
--- a/icewm3/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- fix the dirfd patch to actually use the function
-- testing
diff --git a/icewm3/distinfo b/icewm3/distinfo
index bb6b869cf4..fea5248bdd 100644
--- a/icewm3/distinfo
+++ b/icewm3/distinfo
@@ -3,5 +3,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) = 492e3f1ea3feb76251c05b3bbc1f4c2dafedeffa
-SHA1 (patch-src_ylocale.cc) = cf98ed20c51b257c4ce97d33439044b16738329f
+SHA1 (patch-src_udir.cc) = d9be22dbf29ff5f62d009d3dd1c8177154099f4a
+SHA1 (patch-src_ylocale.cc) = ab3441b72c0864cfa9c3c185809356edf713bc3b
diff --git a/icewm3/patches/patch-src_udir.cc b/icewm3/patches/patch-src_udir.cc
index 0b10f64eca..c7925b8ccd 100644
--- a/icewm3/patches/patch-src_udir.cc
+++ b/icewm3/patches/patch-src_udir.cc
@@ -1,22 +1,32 @@
$NetBSD$
---- src/udir.cc.orig 2024-05-11 00:36:47.708916561 +0000
+Unsure why the class override of the pointer operator isn't working
+
+--- src/udir.cc.orig 2024-03-25 19:03:14.000000000 +0000
+++ src/udir.cc
-@@ -152,7 +152,7 @@ void cdir::rewind() {
+@@ -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 ? 1 : -1;
++ return dirp ? dirfd(dirp->dir()) : -1;
}
adir::adir(const char* path)
-@@ -270,7 +270,7 @@ bool udir::nextFile() {
+@@ -270,7 +271,7 @@ bool udir::nextFile() {
}
int udir::descriptor() const {
- return dirp ? dirfd(*dirp) : -1;
-+ return dirp ? 1 : -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
index 168404a940..d59763bcd2 100644
--- a/icewm3/patches/patch-src_ylocale.cc
+++ b/icewm3/patches/patch-src_ylocale.cc
@@ -1,6 +1,8 @@
$NetBSD$
---- src/ylocale.cc.orig 2024-05-11 00:37:57.995111892 +0000
+Upstream bug. Expects a char **
+
+--- src/ylocale.cc.orig 2024-03-25 19:03:14.000000000 +0000
+++ src/ylocale.cc
@@ -204,7 +204,7 @@ char* YLocale::localeString(const wchar_