Diff below updates icewm to 2.8.0. Changes:
https://github.com/ice-wm/icewm/releases/tag/2.8.0
Changes to the port:
- Add -lintl to LDFLAGS so that all tests get build
- set TEST_ENV so that tests run successfully when using
PORTS_PRIVSEP=Yes
Testing:
- All tests pass
- Run tested on amd64
Comments/OK?
diff --git Makefile Makefile
index f66d6177150..d11ea6257f1 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS= ${APM_ARCHS}
-V= 2.7.0
+V= 2.8.0
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
@@ -56,7 +56,9 @@ CONFIGURE_ARGS= --with-libdir=${PREFIX}/share/icewm \
#CONFIGURE_ARGS+=--with-icesound=sndio
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -lintl"
+
+TEST_ENV= FAKED_MODE=True
# make: don't know how to make %.html: (prerequisite of: icewm.html)
USE_GMAKE= Yes
diff --git distinfo distinfo
index be907d5ef13..f7d25af8f69 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-2.7.0.tar.lz) = xWsdD12O+irz44ADdw6rkWUomqh72PFieBnH+T+UM6M=
-SIZE (icewm-2.7.0.tar.lz) = 1738471
+SHA256 (icewm-2.8.0.tar.lz) = ErfM5nuVsJ80hz9GlI5/HO+e3YhoITngVLeboWXFPkk=
+SIZE (icewm-2.8.0.tar.lz) = 1745937
diff --git patches/patch-man_icewm-preferences_pod
patches/patch-man_icewm-preferences_pod
index 3bb55db25a4..87d15873b1f 100644
--- patches/patch-man_icewm-preferences_pod
+++ patches/patch-man_icewm-preferences_pod
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_icewm-preferences_pod,v 1.9 2021/08/07
10:32:11 sthen Exp $
Index: man/icewm-preferences.pod
--- man/icewm-preferences.pod.orig
+++ man/icewm-preferences.pod
-@@ -1062,7 +1062,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
+@@ -1064,7 +1064,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
Combine all CPUs to one.
diff --git patches/patch-src_icesh_cc patches/patch-src_icesh_cc
index f2d1276ad49..9e755166d3f 100644
--- patches/patch-src_icesh_cc
+++ patches/patch-src_icesh_cc
@@ -5,7 +5,7 @@ Don't do this GNU extension stuff.
Index: src/icesh.cc
--- src/icesh.cc.orig
+++ src/icesh.cc
-@@ -2234,6 +2234,8 @@ void IceSh::doSync()
+@@ -2272,6 +2272,8 @@ void IceSh::doSync()
bool IceSh::colormaps()
{
@@ -14,7 +14,7 @@ Index: src/icesh.cc
if ( !isAction("colormaps", 0))
return false;
-@@ -2242,7 +2244,7 @@ bool IceSh::colormaps()
+@@ -2280,7 +2282,7 @@ bool IceSh::colormaps()
tlog("colormaps");
running = true;
@@ -23,7 +23,7 @@ Index: src/icesh.cc
while (running) {
int n = 0;
Colormap* map = XListInstalledColormaps(display, root, &n);
-@@ -2371,11 +2373,13 @@ void IceSh::monitors()
+@@ -2409,11 +2411,13 @@ void IceSh::monitors()
bool IceSh::guiEvents()
{
