Hi ports --
Attached is an update to IceWM.
Changelog: https://github.com/ice-wm/icewm/releases
Works fine on amd64; big endian tests appreciated.
Note that I've removed myself as maintainer; I've moved on from IceWM.
Now would be a good time for a user to step up and maintain this.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile 13 Jun 2019 21:53:34 -0000 1.69
+++ Makefile 26 Aug 2019 00:12:15 -0000
@@ -1,22 +1,21 @@
# $OpenBSD: Makefile,v 1.69 2019/06/13 21:53:34 bcallah Exp $
-V= 1.5.5
+V= 1.6.1
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
-EXTRACT_SUFX= .tar.xz
+EXTRACT_SUFX= .tar.lz
CATEGORIES= x11
HOMEPAGE= https://www.ice-wm.org/
-MAINTAINER= Brian Callahan <[email protected]>
# LGPLv2 only
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xext Xft Xinerama
-WANTLIB += Xrandr Xrender ao c expat ffi fontconfig freetype fribidi
-WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 iconv intl m ogg pcre sndfile
-WANTLIB += vorbis vorbisenc xcb z
+WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
+WANTLIB += Xext Xfixes Xft Xinerama Xrandr Xrender ao c expat
+WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
+WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
COMPILER= base-clang ports-gcc base-gcc
@@ -47,12 +46,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
# make: don't know how to make %.html: (prerequisite of: icewm.html)
USE_GMAKE= Yes
-
-.include <bsd.port.arch.mk>
-
-.if ${PROPERTIES:Mapm}
-PATCH_LIST= patch-* apm-*
-.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/doc/icewm.adoc
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 13 Jun 2019 21:53:34 -0000 1.20
+++ distinfo 26 Aug 2019 00:12:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.5.5.tar.xz) = 8cE0SyCp6GNRQ/cO4nkwtV+BPBXKYfhNd1hNMRtqwCc=
-SIZE (icewm-1.5.5.tar.xz) = 1707656
+SHA256 (icewm-1.6.1.tar.lz) = 5xkW9cg5II8nnH/8+G0rGRYy/wU6PO0QtjH/r7Zhmhw=
+SIZE (icewm-1.6.1.tar.lz) = 1651274
Index: patches/apm-patch-src_aapm_cc
===================================================================
RCS file: patches/apm-patch-src_aapm_cc
diff -N patches/apm-patch-src_aapm_cc
--- patches/apm-patch-src_aapm_cc 14 Mar 2019 13:48:23 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: apm-patch-src_aapm_cc,v 1.5 2019/03/14 13:48:23 bcallah Exp $
-
-Index: src/aapm.cc
---- src/aapm.cc.orig
-+++ src/aapm.cc
-@@ -32,12 +32,11 @@
- #include <dev/acpica/acpiio.h>
- #endif
-
--#ifdef __NetBSD__
-+#if defined __NetBSD__ || defined __OpenBSD__
- #include <sys/file.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
--#include <dev/apm/apmbios.h>
--#include <dev/apm/apmio.h>
-+#include <machine/apmvar.h>
- #endif
-
- #include <math.h>
-@@ -62,7 +61,7 @@ extern YColorName taskBarBg;
- void YApm::ApmStr(char *s, bool Tool) {
- #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(i386)
- struct apm_info ai;
--#elif defined __NetBSD__
-+#elif defined __NetBSD__ || defined __OpenBSD__
- struct apm_power_info ai;
- #else
- char buf[APM_LINE_LEN];
-@@ -103,7 +102,7 @@ void YApm::ApmStr(char *s, bool Tool) {
- BATlife = ai.ai_batt_life;
- BATtime = ai.ai_batt_time == 0 ? -1 : ai.ai_batt_time;
- strlcpy(units, "sec", sizeof units);
--#elif defined __NetBSD__
-+#elif defined __NetBSD__ || defined __OpenBSD__
- memset(&ai, 0, sizeof(ai));
- if (ioctl(fd, APM_IOC_GETPOWER, &ai) == -1)
- {
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-lib_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 13 Jun 2019 21:53:34 -0000 1.3
+++ patches/patch-lib_Makefile_in 26 Aug 2019 00:12:15 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.3 20
Index: lib/Makefile.in
--- lib/Makefile.in.orig
+++ lib/Makefile.in
-@@ -360,7 +360,7 @@ target_vendor = @target_vendor@
+@@ -358,7 +358,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
Index: patches/patch-man_icewm-preferences_pod
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-man_icewm-preferences_pod,v
retrieving revision 1.2
diff -u -p -r1.2 patch-man_icewm-preferences_pod
--- patches/patch-man_icewm-preferences_pod 29 Apr 2019 16:12:28 -0000 1.2
+++ patches/patch-man_icewm-preferences_pod 26 Aug 2019 00:12:15 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_icewm-preferences_po
Index: man/icewm-preferences.pod
--- man/icewm-preferences.pod.orig
+++ man/icewm-preferences.pod
-@@ -970,7 +970,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
+@@ -985,7 +985,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
Combine all CPUs to one.
Index: patches/patch-src_default_h
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-src_default_h,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_default_h
--- patches/patch-src_default_h 14 Mar 2019 13:48:23 -0000 1.15
+++ patches/patch-src_default_h 26 Aug 2019 00:12:15 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_default_h,v 1.15 201
Index: src/default.h
--- src/default.h.orig
+++ src/default.h
-@@ -37,7 +37,7 @@ XIV(bool, showTaskBar, true)
+@@ -38,7 +38,7 @@ XIV(bool, showTaskBar, true)
XIV(bool, taskBarAtTop, false)
XIV(bool, taskBarKeepBelow, false)
XIV(bool, taskBarShowClock, true)
@@ -11,7 +11,7 @@ Index: src/default.h
XIV(bool, taskBarShowApmAuto, true)
XIV(bool, taskBarShowApmTime, true)
XIV(bool, taskBarShowApmGraph, true)
-@@ -171,10 +171,10 @@ XIV(int, netWorkAreaBehaviour, 0)
+@@ -173,10 +173,10 @@ XIV(int, netWorkAreaBehaviour, 0)
XSV(const char *, acpiIgnoreBatteries, 0)
XSV(const char *, mailBoxPath, 0)
@@ -25,7 +25,7 @@ Index: src/default.h
XSV(const char *, clockCommand, "xclock -name icewm -title Clock")
XSV(const char *, clockClassHint, "icewm.XClock")
XSV(const char *, runDlgCommand, 0)
-@@ -204,7 +204,7 @@ XIV(bool, cpuCombine, true)
+@@ -206,7 +206,7 @@ XIV(bool, cpuCombine, true)
XSV(const char *, netCommand, "xterm -name 'ss' -title 'Socket Statistics' -hold -e sh -c 'which ss > /dev/null && watch -t ss -putswl || netstat -c'")
XSV(const char *, netClassHint, "ss.XTerm")
#else
Index: patches/patch-src_icesh_cc
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-src_icesh_cc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_icesh_cc
--- patches/patch-src_icesh_cc 13 Jun 2019 21:53:34 -0000 1.3
+++ patches/patch-src_icesh_cc 26 Aug 2019 00:12:15 -0000
@@ -5,7 +5,7 @@ Don't do this GNU extension stuff.
Index: src/icesh.cc
--- src/icesh.cc.orig
+++ src/icesh.cc
-@@ -1315,6 +1315,8 @@ bool IceSh::change()
+@@ -1663,6 +1663,8 @@ bool IceSh::change()
bool IceSh::colormaps()
{
@@ -14,7 +14,7 @@ Index: src/icesh.cc
if ( !isAction("colormaps", 0))
return false;
-@@ -1323,7 +1325,7 @@ bool IceSh::colormaps()
+@@ -1671,7 +1673,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);
-@@ -1350,11 +1352,13 @@ bool IceSh::colormaps()
+@@ -1698,11 +1700,13 @@ bool IceSh::colormaps()
bool IceSh::guiEvents()
{
Index: patches/patch-src_yapp_cc
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-src_yapp_cc,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_yapp_cc
--- patches/patch-src_yapp_cc 29 Apr 2019 16:12:28 -0000 1.7
+++ patches/patch-src_yapp_cc 26 Aug 2019 00:12:15 -0000
@@ -3,11 +3,11 @@ $OpenBSD: patch-src_yapp_cc,v 1.7 2019/0
Index: src/yapp.cc
--- src/yapp.cc.orig
+++ src/yapp.cc
-@@ -265,7 +265,7 @@ int YApplication::mainLoop() {
+@@ -264,7 +264,7 @@ int YApplication::mainLoop() {
// This is irrelevant when using monotonic clocks:
// if time travel to past, decrease the timeouts
if (diff < zerotime()) {
-- warn("time warp of %ld.%06ld", diff.tv_sec, diff.tv_usec);
+- warn("time warp of %ld.%06ld", long(diff.tv_sec), diff.tv_usec);
+ warn("time warp of %lld.%06ld", diff.tv_sec, diff.tv_usec);
decreaseTimeouts(diff);
} else {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/icewm/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 29 Apr 2019 16:12:28 -0000 1.19
+++ pkg/PLIST 26 Aug 2019 00:12:15 -0000
@@ -9,7 +9,6 @@ bin/icewm-menu-xrandr
bin/icewm-set-gnomewm
@bin bin/icewmbg
@bin bin/icewmhint
-@bin bin/icewmtray
@man man/man1/icehelp.1
@man man/man1/icesh.1
@man man/man1/icesound.1
@@ -19,7 +18,6 @@ bin/icewm-set-gnomewm
@man man/man1/icewm.1
@man man/man1/icewmbg.1
@man man/man1/icewmhint.1
-@man man/man1/icewmtray.1
@man man/man5/icewm-env.5
@man man/man5/icewm-focus_mode.5
@man man/man5/icewm-keys.5
@@ -57,7 +55,6 @@ share/doc/icewm/icewm.1.html
share/doc/icewm/icewm.html
share/doc/icewm/icewmbg.1.html
share/doc/icewm/icewmhint.1.html
-share/doc/icewm/icewmtray.1.html
share/icewm/
share/icewm/icons/
share/icewm/icons/about_16x16.xpm
