UPDATE x11/icewm-1.6.5

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE x11/icewm-1.6.5

Bjorn Ketelaars
Diff below brings icewm to 1.6.5, which is a maintenance release.
Changes: https://github.com/bbidulock/icewm/blob/1.6.5/ChangeLog.

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index a0f97493575..f9086078717 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 # unconditionally uses machine/apmvar.h and related structures/defines
 ONLY_FOR_ARCHS= ${APM_ARCHS}
 
-V= 1.6.4
+V= 1.6.5
 COMMENT= small and fast window manager
 DISTNAME= icewm-${V}
 EXTRACT_SUFX= .tar.lz
diff --git distinfo distinfo
index 54fa162eb04..cad5b84b9ef 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.4.tar.lz) = c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs=
-SIZE (icewm-1.6.4.tar.lz) = 1684348
+SHA256 (icewm-1.6.5.tar.lz) = 1B5qv4Qv8/hwWoHTUr58WxgcWHVJwYPeBkHDggI0p7I=
+SIZE (icewm-1.6.5.tar.lz) = 1681783
diff --git patches/patch-lib_Makefile_in patches/patch-lib_Makefile_in
index 9840ac6de6e..e08cc79fb0b 100644
--- patches/patch-lib_Makefile_in
+++ patches/patch-lib_Makefile_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.5 2019/11/09 14:06:33 fcambus Exp $
 Index: lib/Makefile.in
 --- lib/Makefile.in.orig
 +++ lib/Makefile.in
-@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
+@@ -365,7 +365,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git patches/patch-man_icewm-preferences_pod patches/patch-man_icewm-preferences_pod
index 5ca305f477d..c63e512f3dd 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.5 2020/02/01 19:48:20 bket Exp $
 Index: man/icewm-preferences.pod
 --- man/icewm-preferences.pod.orig
 +++ man/icewm-preferences.pod
-@@ -982,7 +982,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
+@@ -1004,7 +1004,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 84d5e4eea12..a6ce302ae13 100644
--- patches/patch-src_default_h
+++ patches/patch-src_default_h
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_default_h,v 1.18 2020/02/01 19:48:20 bket Exp $
 Index: src/default.h
 --- src/default.h.orig
 +++ src/default.h
-@@ -38,7 +38,7 @@ XIV(bool, showTaskBar,                          true)
+@@ -37,7 +37,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)
-@@ -173,10 +173,10 @@ XIV(int, netWorkAreaBehaviour,                  0)
+@@ -171,10 +171,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)
-@@ -205,7 +205,7 @@ XIV(bool, cpuCombine,                           true)
+@@ -203,7 +203,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 ef1b8f21f55..f1d0d5f5936 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
-@@ -1930,6 +1930,8 @@ void IceSh::doSync()
+@@ -2195,6 +2195,8 @@ void IceSh::doSync()
 
  bool IceSh::colormaps()
  {
@@ -14,7 +14,7 @@ Index: src/icesh.cc
      if ( !isAction("colormaps", 0))
          return false;
 
-@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
+@@ -2203,7 +2205,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);
-@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
+@@ -2305,11 +2307,13 @@ bool IceSh::delay()
 
  bool IceSh::guiEvents()
  {
diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
index fab224c3c15..7712e7e4144 100644
--- patches/patch-src_yapp_cc
+++ patches/patch-src_yapp_cc
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.9 2020/02/01 19:48:20 bket Exp $
 Index: src/yapp.cc
 --- src/yapp.cc.orig
 +++ src/yapp.cc
-@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
+@@ -280,7 +280,7 @@ int YApplication::mainLoop() {
              // This is irrelevant when using monotonic clocks:
              // if time travel to past, decrease the timeouts
              if (diff < zerotime()) {
diff --git pkg/PLIST pkg/PLIST
index d9d6ff2ccc5..25e0bbbab9a 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -13,6 +13,7 @@ bin/icewm-set-gnomewm
 @man man/man1/icesh.1
 @man man/man1/icesound.1
 @man man/man1/icewm-menu-fdo.1
+@man man/man1/icewm-menu-xrandr.1
 @man man/man1/icewm-session.1
 @man man/man1/icewm-set-gnomewm.1
 @man man/man1/icewm.1
@@ -40,6 +41,7 @@ share/doc/icewm/icewm-env.5.html
 share/doc/icewm/icewm-focus_mode.5.html
 share/doc/icewm/icewm-keys.5.html
 share/doc/icewm/icewm-menu-fdo.1.html
+share/doc/icewm/icewm-menu-xrandr.1.html
 share/doc/icewm/icewm-menu.5.html
 share/doc/icewm/icewm-preferences.5.html
 share/doc/icewm/icewm-prefoverride.5.html

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/icewm-1.6.5

Bjorn Ketelaars
On Wed 08/04/2020 10:21, Bjorn Ketelaars wrote:
> Diff below brings icewm to 1.6.5, which is a maintenance release.
> Changes: https://github.com/bbidulock/icewm/blob/1.6.5/ChangeLog.
>
> Run tested on amd64.
>
> Comments/OK?

I was contacted off list by Greg Jones who found an issue with the
taskbar that has been fixed upstream [0]. For now cherrypick this fix.
New diff enclosed.

Comments/OK?


[0] https://github.com/bbidulock/icewm/commit/2db0be3fce12793d2bc930f4289214631695f8


diff --git Makefile Makefile
index a0f97493575..f9086078717 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 # unconditionally uses machine/apmvar.h and related structures/defines
 ONLY_FOR_ARCHS= ${APM_ARCHS}
 
-V= 1.6.4
+V= 1.6.5
 COMMENT= small and fast window manager
 DISTNAME= icewm-${V}
 EXTRACT_SUFX= .tar.lz
diff --git distinfo distinfo
index 54fa162eb04..cad5b84b9ef 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.4.tar.lz) = c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs=
-SIZE (icewm-1.6.4.tar.lz) = 1684348
+SHA256 (icewm-1.6.5.tar.lz) = 1B5qv4Qv8/hwWoHTUr58WxgcWHVJwYPeBkHDggI0p7I=
+SIZE (icewm-1.6.5.tar.lz) = 1681783
diff --git patches/patch-lib_Makefile_in patches/patch-lib_Makefile_in
index 9840ac6de6e..e08cc79fb0b 100644
--- patches/patch-lib_Makefile_in
+++ patches/patch-lib_Makefile_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.5 2019/11/09 14:06:33 fcambus Exp $
 Index: lib/Makefile.in
 --- lib/Makefile.in.orig
 +++ lib/Makefile.in
-@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
+@@ -365,7 +365,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git patches/patch-man_icewm-preferences_pod patches/patch-man_icewm-preferences_pod
index 5ca305f477d..c63e512f3dd 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.5 2020/02/01 19:48:20 bket Exp $
 Index: man/icewm-preferences.pod
 --- man/icewm-preferences.pod.orig
 +++ man/icewm-preferences.pod
-@@ -982,7 +982,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
+@@ -1004,7 +1004,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 84d5e4eea12..a6ce302ae13 100644
--- patches/patch-src_default_h
+++ patches/patch-src_default_h
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_default_h,v 1.18 2020/02/01 19:48:20 bket Exp $
 Index: src/default.h
 --- src/default.h.orig
 +++ src/default.h
-@@ -38,7 +38,7 @@ XIV(bool, showTaskBar,                          true)
+@@ -37,7 +37,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)
-@@ -173,10 +173,10 @@ XIV(int, netWorkAreaBehaviour,                  0)
+@@ -171,10 +171,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)
-@@ -205,7 +205,7 @@ XIV(bool, cpuCombine,                           true)
+@@ -203,7 +203,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 ef1b8f21f55..f1d0d5f5936 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
-@@ -1930,6 +1930,8 @@ void IceSh::doSync()
+@@ -2195,6 +2195,8 @@ void IceSh::doSync()
 
  bool IceSh::colormaps()
  {
@@ -14,7 +14,7 @@ Index: src/icesh.cc
      if ( !isAction("colormaps", 0))
          return false;
 
-@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
+@@ -2203,7 +2205,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);
-@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
+@@ -2305,11 +2307,13 @@ bool IceSh::delay()
 
  bool IceSh::guiEvents()
  {
diff --git patches/patch-src_wmtaskbar_cc patches/patch-src_wmtaskbar_cc
new file mode 100644
index 00000000000..c590e9849e2
--- /dev/null
+++ patches/patch-src_wmtaskbar_cc
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix type. From
+https://github.com/bbidulock/icewm/commit/2db0be3fce12793d2bc930f4289214631695f8fb
+
+Index: src/wmtaskbar.cc
+--- src/wmtaskbar.cc.orig
++++ src/wmtaskbar.cc
+@@ -209,7 +209,7 @@ TaskBar::~TaskBar() {
+ #ifdef IWM_STATES
+     delete fCPUStatus; fCPUStatus = 0;
+ #endif
+-    delete fNetStatus; fCPUStatus = 0;
++    delete fNetStatus; fNetStatus = 0;
+     delete fAddressBar; fAddressBar = 0;
+     delete fTasks; fTasks = 0;
+     delete fWindowTray; fWindowTray = 0;
diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
index fab224c3c15..7712e7e4144 100644
--- patches/patch-src_yapp_cc
+++ patches/patch-src_yapp_cc
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.9 2020/02/01 19:48:20 bket Exp $
 Index: src/yapp.cc
 --- src/yapp.cc.orig
 +++ src/yapp.cc
-@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
+@@ -280,7 +280,7 @@ int YApplication::mainLoop() {
              // This is irrelevant when using monotonic clocks:
              // if time travel to past, decrease the timeouts
              if (diff < zerotime()) {
diff --git pkg/PLIST pkg/PLIST
index d9d6ff2ccc5..25e0bbbab9a 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -13,6 +13,7 @@ bin/icewm-set-gnomewm
 @man man/man1/icesh.1
 @man man/man1/icesound.1
 @man man/man1/icewm-menu-fdo.1
+@man man/man1/icewm-menu-xrandr.1
 @man man/man1/icewm-session.1
 @man man/man1/icewm-set-gnomewm.1
 @man man/man1/icewm.1
@@ -40,6 +41,7 @@ share/doc/icewm/icewm-env.5.html
 share/doc/icewm/icewm-focus_mode.5.html
 share/doc/icewm/icewm-keys.5.html
 share/doc/icewm/icewm-menu-fdo.1.html
+share/doc/icewm/icewm-menu-xrandr.1.html
 share/doc/icewm/icewm-menu.5.html
 share/doc/icewm/icewm-preferences.5.html
 share/doc/icewm/icewm-prefoverride.5.html

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/icewm-1.6.5

Bjorn Ketelaars
On Sun 24/05/2020 14:03, Bjorn Ketelaars wrote:

> On Wed 08/04/2020 10:21, Bjorn Ketelaars wrote:
> > Diff below brings icewm to 1.6.5, which is a maintenance release.
> > Changes: https://github.com/bbidulock/icewm/blob/1.6.5/ChangeLog.
> >
> > Run tested on amd64.
> >
> > Comments/OK?
>
> I was contacted off list by Greg Jones who found an issue with the
> taskbar that has been fixed upstream [0]. For now cherrypick this fix.
> New diff enclosed.
>
> Comments/OK?

Upstream of icewm released a new version (1.6.6), which fixes the
taskbar. Overview on changes can be found at
https://github.com/ice-wm/icewm/releases/tag/1.6.6.

Comments/OK?


diff --git Makefile Makefile
index a0f97493575..febd21b6cba 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 # unconditionally uses machine/apmvar.h and related structures/defines
 ONLY_FOR_ARCHS= ${APM_ARCHS}
 
-V= 1.6.4
+V= 1.6.6
 COMMENT= small and fast window manager
 DISTNAME= icewm-${V}
 EXTRACT_SUFX= .tar.lz
diff --git distinfo distinfo
index 54fa162eb04..f50c9813398 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.4.tar.lz) = c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs=
-SIZE (icewm-1.6.4.tar.lz) = 1684348
+SHA256 (icewm-1.6.6.tar.lz) = d/US4LzcnG7I4aEMgiuCOFSCZbq8cN/k63a0Ug1gwBw=
+SIZE (icewm-1.6.6.tar.lz) = 1684639
diff --git patches/patch-doc_icewm_adoc patches/patch-doc_icewm_adoc
index f013af21948..8bb9a04dfec 100644
--- patches/patch-doc_icewm_adoc
+++ patches/patch-doc_icewm_adoc
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_icewm_adoc,v 1.1 2019/03/14 13:48:23 bcallah Exp $
 Index: doc/icewm.adoc
 --- doc/icewm.adoc.orig
 +++ doc/icewm.adoc
-@@ -395,10 +395,10 @@ $ICEWM_PRIVCFG; $XDG_CONFIG_HOME/icewm; $HOME/.icewm
+@@ -396,10 +396,10 @@ $ICEWM_PRIVCFG; $XDG_CONFIG_HOME/icewm; $HOME/.icewm
  The first of these which is defined and existent is used to search
  for the user's personal customization.
 
@@ -16,7 +16,7 @@ Index: doc/icewm.adoc
  the compiled-in default directory with default files
 
  The directories are searched in the above order, so any file located
-@@ -407,8 +407,8 @@ creating the same directory hierarchy under `$HOME/.ic
+@@ -408,8 +408,8 @@ creating the same directory hierarchy under `$HOME/.ic
 
  To customize icewm yourself, you could create the `$HOME/.icewm`
  directory and copy the files that you wish to modify, like
diff --git patches/patch-lib_Makefile_in patches/patch-lib_Makefile_in
index 9840ac6de6e..e08cc79fb0b 100644
--- patches/patch-lib_Makefile_in
+++ patches/patch-lib_Makefile_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.5 2019/11/09 14:06:33 fcambus Exp $
 Index: lib/Makefile.in
 --- lib/Makefile.in.orig
 +++ lib/Makefile.in
-@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
+@@ -365,7 +365,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git patches/patch-man_icewm-preferences_pod patches/patch-man_icewm-preferences_pod
index 5ca305f477d..3fe1a64ae85 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.5 2020/02/01 19:48:20 bket Exp $
 Index: man/icewm-preferences.pod
 --- man/icewm-preferences.pod.orig
 +++ man/icewm-preferences.pod
-@@ -982,7 +982,7 @@ B<WM_CLASS> to allow B<runonce> for B<CPUStatusCommand
+@@ -1008,7 +1008,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 84d5e4eea12..bab7dee4fa8 100644
--- patches/patch-src_default_h
+++ patches/patch-src_default_h
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_default_h,v 1.18 2020/02/01 19:48:20 bket Exp $
 Index: src/default.h
 --- src/default.h.orig
 +++ src/default.h
-@@ -38,7 +38,7 @@ XIV(bool, showTaskBar,                          true)
+@@ -37,7 +37,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)
-@@ -173,10 +173,10 @@ XIV(int, netWorkAreaBehaviour,                  0)
+@@ -172,10 +172,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)
-@@ -205,7 +205,7 @@ XIV(bool, cpuCombine,                           true)
+@@ -204,7 +204,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 ef1b8f21f55..eae728da32e 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
-@@ -1930,6 +1930,8 @@ void IceSh::doSync()
+@@ -2197,6 +2197,8 @@ void IceSh::doSync()
 
  bool IceSh::colormaps()
  {
@@ -14,7 +14,7 @@ Index: src/icesh.cc
      if ( !isAction("colormaps", 0))
          return false;
 
-@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
+@@ -2205,7 +2207,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);
-@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
+@@ -2307,11 +2309,13 @@ bool IceSh::delay()
 
  bool IceSh::guiEvents()
  {
diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
index fab224c3c15..7712e7e4144 100644
--- patches/patch-src_yapp_cc
+++ patches/patch-src_yapp_cc
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.9 2020/02/01 19:48:20 bket Exp $
 Index: src/yapp.cc
 --- src/yapp.cc.orig
 +++ src/yapp.cc
-@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
+@@ -280,7 +280,7 @@ int YApplication::mainLoop() {
              // This is irrelevant when using monotonic clocks:
              // if time travel to past, decrease the timeouts
              if (diff < zerotime()) {
diff --git pkg/PLIST pkg/PLIST
index d9d6ff2ccc5..25e0bbbab9a 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -13,6 +13,7 @@ bin/icewm-set-gnomewm
 @man man/man1/icesh.1
 @man man/man1/icesound.1
 @man man/man1/icewm-menu-fdo.1
+@man man/man1/icewm-menu-xrandr.1
 @man man/man1/icewm-session.1
 @man man/man1/icewm-set-gnomewm.1
 @man man/man1/icewm.1
@@ -40,6 +41,7 @@ share/doc/icewm/icewm-env.5.html
 share/doc/icewm/icewm-focus_mode.5.html
 share/doc/icewm/icewm-keys.5.html
 share/doc/icewm/icewm-menu-fdo.1.html
+share/doc/icewm/icewm-menu-xrandr.1.html
 share/doc/icewm/icewm-menu.5.html
 share/doc/icewm/icewm-preferences.5.html
 share/doc/icewm/icewm-prefoverride.5.html

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/icewm-1.6.6

Charlene Wendling
Hi,

On Sun, 14 Jun 2020 11:15:17 +0200
Bjorn Ketelaars wrote:

> On Sun 24/05/2020 14:03, Bjorn Ketelaars wrote:
> > On Wed 08/04/2020 10:21, Bjorn Ketelaars wrote:
> > > Diff below brings icewm to 1.6.5, which is a maintenance release.
> > > Changes: https://github.com/bbidulock/icewm/blob/1.6.5/ChangeLog.
> > >
> > > Run tested on amd64.
> > >
> > > Comments/OK?
> >
> > I was contacted off list by Greg Jones who found an issue with the
> > taskbar that has been fixed upstream [0]. For now cherrypick this
> > fix. New diff enclosed.
> >
> > Comments/OK?
>
> Upstream of icewm released a new version (1.6.6), which fixes the
> taskbar. Overview on changes can be found at
> https://github.com/ice-wm/icewm/releases/tag/1.6.6.
>
> Comments/OK?

It builds and works fine on macppc, including icewm-menu-xrandr.

OK cwen@


> diff --git Makefile Makefile
> index a0f97493575..febd21b6cba 100644
> --- Makefile
> +++ Makefile
> @@ -3,7 +3,7 @@
>  # unconditionally uses machine/apmvar.h and related
>  # structures/defines
>  ONLY_FOR_ARCHS= ${APM_ARCHS}
>  
> -V= 1.6.4
> +V= 1.6.6
>  COMMENT= small and fast window manager
>  DISTNAME= icewm-${V}
>  EXTRACT_SUFX= .tar.lz
> diff --git distinfo distinfo
> index 54fa162eb04..f50c9813398 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (icewm-1.6.4.tar.lz) =
> c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs= -SIZE
> (icewm-1.6.4.tar.lz) = 1684348 +SHA256 (icewm-1.6.6.tar.lz) =
> d/US4LzcnG7I4aEMgiuCOFSCZbq8cN/k63a0Ug1gwBw= +SIZE
> (icewm-1.6.6.tar.lz) = 1684639 diff --git
> patches/patch-doc_icewm_adoc patches/patch-doc_icewm_adoc index
> f013af21948..8bb9a04dfec 100644
> --- patches/patch-doc_icewm_adoc
> +++ patches/patch-doc_icewm_adoc
> @@ -3,7 +3,7 @@ $OpenBSD: patch-doc_icewm_adoc,v 1.1 2019/03/14
> 13:48:23 bcallah Exp $ Index: doc/icewm.adoc
>  --- doc/icewm.adoc.orig
>  +++ doc/icewm.adoc
> -@@ -395,10 +395,10 @@ $ICEWM_PRIVCFG; $XDG_CONFIG_HOME/icewm;
> $HOME/.icewm +@@ -396,10 +396,10 @@ $ICEWM_PRIVCFG;
> $XDG_CONFIG_HOME/icewm; $HOME/.icewm The first of these which is
> defined and existent is used to search for the user's personal
> customization.
> @@ -16,7 +16,7 @@ Index: doc/icewm.adoc
>   the compiled-in default directory with default files
>  
>   The directories are searched in the above order, so any file located
> -@@ -407,8 +407,8 @@ creating the same directory hierarchy under
> `$HOME/.ic +@@ -408,8 +408,8 @@ creating the same directory hierarchy
> under `$HOME/.ic
>   To customize icewm yourself, you could create the `$HOME/.icewm`
>   directory and copy the files that you wish to modify, like
> diff --git patches/patch-lib_Makefile_in patches/patch-lib_Makefile_in
> index 9840ac6de6e..e08cc79fb0b 100644
> --- patches/patch-lib_Makefile_in
> +++ patches/patch-lib_Makefile_in
> @@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.5 2019/11/09
> 14:06:33 fcambus Exp $ Index: lib/Makefile.in
>  --- lib/Makefile.in.orig
>  +++ lib/Makefile.in
> -@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
> +@@ -365,7 +365,7 @@ target_vendor = @target_vendor@
>   top_build_prefix = @top_build_prefix@
>   top_builddir = @top_builddir@
>   top_srcdir = @top_srcdir@
> diff --git patches/patch-man_icewm-preferences_pod
> patches/patch-man_icewm-preferences_pod index 5ca305f477d..
> 3fe1a64ae85 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.5
> 2020/02/01 19:48:20 bket Exp $ Index: man/icewm-preferences.pod
>  --- man/icewm-preferences.pod.orig
>  +++ man/icewm-preferences.pod
> -@@ -982,7 +982,7 @@ B<WM_CLASS> to allow B<runonce> for
> B<CPUStatusCommand +@@ -1008,7 +1008,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 84d5e4eea12..bab7dee4fa8 100644
> --- patches/patch-src_default_h
> +++ patches/patch-src_default_h
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_default_h,v 1.18 2020/02/01
> 19:48:20 bket Exp $ Index: src/default.h
>  --- src/default.h.orig
>  +++ src/default.h
> -@@ -38,7 +38,7 @@ XIV(bool, showTaskBar,
> true) +@@ -37,7 +37,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)
> -@@ -173,10 +173,10 @@ XIV(int,
> netWorkAreaBehaviour,                  0) +@@ -172,10 +172,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)
> -@@ -205,7 +205,7 @@ XIV(bool, cpuCombine,
> true) +@@ -204,7 +204,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 ef1b8f21f55..eae728da32e 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
> -@@ -1930,6 +1930,8 @@ void IceSh::doSync()
> +@@ -2197,6 +2197,8 @@ void IceSh::doSync()
>  
>   bool IceSh::colormaps()
>   {
> @@ -14,7 +14,7 @@ Index: src/icesh.cc
>       if ( !isAction("colormaps", 0))
>           return false;
>  
> -@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
> +@@ -2205,7 +2207,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);
> -@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
> +@@ -2307,11 +2309,13 @@ bool IceSh::delay()
>  
>   bool IceSh::guiEvents()
>   {
> diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
> index fab224c3c15..7712e7e4144 100644
> --- patches/patch-src_yapp_cc
> +++ patches/patch-src_yapp_cc
> @@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.9 2020/02/01 19:48:20
> bket Exp $ Index: src/yapp.cc
>  --- src/yapp.cc.orig
>  +++ src/yapp.cc
> -@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
> +@@ -280,7 +280,7 @@ int YApplication::mainLoop() {
>               // This is irrelevant when using monotonic clocks:
>               // if time travel to past, decrease the timeouts
>               if (diff < zerotime()) {
> diff --git pkg/PLIST pkg/PLIST
> index d9d6ff2ccc5..25e0bbbab9a 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -13,6 +13,7 @@ bin/icewm-set-gnomewm
>  @man man/man1/icesh.1
>  @man man/man1/icesound.1
>  @man man/man1/icewm-menu-fdo.1
> +@man man/man1/icewm-menu-xrandr.1
>  @man man/man1/icewm-session.1
>  @man man/man1/icewm-set-gnomewm.1
>  @man man/man1/icewm.1
> @@ -40,6 +41,7 @@ share/doc/icewm/icewm-env.5.html
>  share/doc/icewm/icewm-focus_mode.5.html
>  share/doc/icewm/icewm-keys.5.html
>  share/doc/icewm/icewm-menu-fdo.1.html
> +share/doc/icewm/icewm-menu-xrandr.1.html
>  share/doc/icewm/icewm-menu.5.html
>  share/doc/icewm/icewm-preferences.5.html
>  share/doc/icewm/icewm-prefoverride.5.html
>