Hi ports --
Attached is a small update to icewm-1.5.5
Changelog is here: https://github.com/ice-wm/icewm/releases/tag/1.5.5
Works well on amd64; big endian testing appreciated.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 29 Apr 2019 16:12:28 -0000 1.67
+++ Makefile 7 Jun 2019 14:23:06 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.67 2019/04/29 16:12:28 bcallah Exp $
-V= 1.5.4
+V= 1.5.5
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.xz
@@ -10,7 +10,7 @@ HOMEPAGE= https://www.ice-wm.org/
MAINTAINER= Brian Callahan <[email protected]>
# LGPLv2 only
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xext Xft Xinerama
WANTLIB += Xrandr Xrender ao c expat ffi fontconfig freetype fribidi
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 29 Apr 2019 16:12:28 -0000 1.19
+++ distinfo 7 Jun 2019 14:23:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.5.4.tar.xz) = iVyB1mcqPqqRx2oIB+qP6meJuKPIYmY18cEdfFygWeo=
-SIZE (icewm-1.5.4.tar.xz) = 1689668
+SHA256 (icewm-1.5.5.tar.xz) = 8cE0SyCp6GNRQ/cO4nkwtV+BPBXKYfhNd1hNMRtqwCc=
+SIZE (icewm-1.5.5.tar.xz) = 1707656
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 30 Mar 2019 13:42:35 -0000 1.2
+++ patches/patch-lib_Makefile_in 7 Jun 2019 14:23:06 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.2 20
Index: lib/Makefile.in
--- lib/Makefile.in.orig
+++ lib/Makefile.in
-@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
+@@ -360,7 +360,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Index: patches/patch-src_icesh_cc
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-src_icesh_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_icesh_cc
--- patches/patch-src_icesh_cc 29 Apr 2019 16:12:28 -0000 1.2
+++ patches/patch-src_icesh_cc 7 Jun 2019 14:23:06 -0000
@@ -5,16 +5,16 @@ Don't do this GNU extension stuff.
Index: src/icesh.cc
--- src/icesh.cc.orig
+++ src/icesh.cc
-@@ -726,6 +726,8 @@ bool IceSh::wmcheck()
+@@ -1315,6 +1315,8 @@ bool IceSh::change()
bool IceSh::colormaps()
{
+ void (*previous)(int);
+
- if (strcmp(*argp, "colormaps"))
+ if ( !isAction("colormaps", 0))
return false;
- ++argp;
-@@ -735,7 +737,7 @@ bool IceSh::colormaps()
+
+@@ -1323,7 +1325,7 @@ bool IceSh::colormaps()
tlog("colormaps");
running = true;
@@ -23,15 +23,14 @@ Index: src/icesh.cc
while (running) {
int n = 0;
Colormap* map = XListInstalledColormaps(display, root, &n);
-@@ -769,12 +771,14 @@ bool IceSh::colormaps()
+@@ -1350,11 +1352,13 @@ bool IceSh::colormaps()
bool IceSh::guiEvents()
{
+ void (*previous)(int);
+
- if (strcmp(*argp, "guievents"))
+ if ( !isAction("guievents", 0))
return false;
- ++argp;
running = true;
- sighandler_t previous = signal(SIGINT, catcher);