Re: UPDATE x11/icewm-1.6.4

On Wed, 29 Jan 2020 18:50:02 +0100
Björn Ketelaars wrote:

> Enclosed diff brings icewm to 1.6.4. Overview of changes can be found
> at https://github.com/ice-wm/icewm/releases/. While here update
> HOMEPAGE.
>
> (Lightly) run tested on amd64.
>
> Comments/OK?

I've built it on powerpc and amd64, and ran it for an afternoon on
amd64 without issues.

OK cwen@

> diff --git Makefile Makefile
> index 15af55123f5..9f2b5b35bdd 100644
> --- Makefile
> +++ Makefile
> @@ -3,13 +3,13 @@
> # unconditionally uses machine/apmvar.h and related
> # structures/defines
> ONLY_FOR_ARCHS= ${APM_ARCHS}
>
> -V= 1.6.2
> +V= 1.6.4
> COMMENT= small and fast window manager
> DISTNAME= icewm-${V}
> EXTRACT_SUFX= .tar.lz
> CATEGORIES= x11
>
> -HOMEPAGE= https://www.ice-wm.org/
> +HOMEPAGE= https://ice-wm.org/
>
> # LGPLv2 only
> PERMIT_PACKAGE= Yes
> diff --git distinfo distinfo
> index b4deafc4663..54fa162eb04 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (icewm-1.6.2.tar.lz) =
> j/Ca4REHXyINv1zbE0AaLCoFHMq4yBFn0jTW5FDGqiQ= -SIZE
> (icewm-1.6.2.tar.lz) = 1673647 +SHA256 (icewm-1.6.4.tar.lz) =
> c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs= +SIZE
> (icewm-1.6.4.tar.lz) = 1684348 diff --git
> patches/patch-man_icewm-preferences_pod
> patches/patch-man_icewm-preferences_pod index
> c4422af55a8..b2ba9bdf036 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.4
> 2019/11/09 14:06:33 fcambus Exp Index: man/icewm-preferences.pod
> --- man/icewm-preferences.pod.orig
> +++ man/icewm-preferences.pod
> -@@ -977,7 +977,7 @@ B<WM_CLASS> to allow B<runonce> for
> B<CPUStatusCommand +@@ -982,7 +982,7 @@ B<WM_CLASS> to allow
> B<runonce> for B<CPUStatusCommand
> Combine all CPUs to one.
>
> diff --git patches/patch-src_default_h patches/patch-src_default_h
> index 9206aaba826..f4e4e5b7705 100644
> --- patches/patch-src_default_h
> +++ patches/patch-src_default_h
> @@ -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)
> -@@ -206,7 +206,7 @@ XIV(bool, cpuCombine,
> true) +@@ -205,7 +205,7 @@ XIV(bool,
> cpuCombine, true) XSV(const char *,
> netCommand, TERM " -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
> diff --git patches/patch-src_icesh_cc patches/patch-src_icesh_cc
> index 1d257d81791..af81036cb9c 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
> -@@ -1823,6 +1823,8 @@ void IceSh::doSync()
> +@@ -1930,6 +1930,8 @@ void IceSh::doSync()
>
> bool IceSh::colormaps()
> {
> @@ -14,7 +14,7 @@ Index: src/icesh.cc
> if ( !isAction("colormaps", 0))
> return false;
>
> -@@ -1831,7 +1833,7 @@ bool IceSh::colormaps()
> +@@ -1938,7 +1940,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);
> -@@ -1858,11 +1860,13 @@ bool IceSh::colormaps()
> +@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
>
> bool IceSh::guiEvents()
> {
> diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
> index 934057626d2..36be4293f0d 100644
> --- patches/patch-src_yapp_cc
> +++ patches/patch-src_yapp_cc
> @@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.8 2019/08/26 19:43:45
> bcallah Exp $ Index: src/yapp.cc
> --- src/yapp.cc.orig
> +++ src/yapp.cc
> -@@ -264,7 +264,7 @@ int YApplication::mainLoop() {
> +@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
> // This is irrelevant when using monotonic clocks:
> // if time travel to past, decrease the timeouts
> if (diff < zerotime()) {
>