diff -urN /tmp/icewm/files/patch-src__wmapp.cc ./files/patch-src__wmapp.cc
--- /tmp/icewm/files/patch-src__wmapp.cc	2014-02-23 17:04:51.000000000 +0100
+++ ./files/patch-src__wmapp.cc	2018-05-03 20:57:02.794823000 +0200
@@ -1,6 +1,15 @@
---- src/wmapp.cc.orig
+--- src/wmapp.cc.orig	2013-11-17 16:54:39 UTC
 +++ src/wmapp.cc
-@@ -337,7 +337,7 @@
+@@ -221,7 +221,7 @@ static void registerProtocols2(Window xid) {
+ #endif
+ 
+     long pid = getpid();
+-    const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")";
++    const char wmname[] = "IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")";
+ 
+ #ifdef GNOME1_HINTS
+     XChangeProperty(xapp->display(), xid, 
+@@ -337,7 +337,7 @@ static void initFontPath(IApp *app) {
              int ndirs; // ------------------- retrieve the old X's font path ---
              char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
  
@@ -9,7 +18,7 @@
              newFontPath[ndirs] = fontsdir;
  
              if (fontPath)
-@@ -383,7 +383,7 @@
+@@ -383,7 +383,7 @@ static void initFontPath(IApp *app) {
              XChangeProperty(xapp->display(), manager->handle(),
                              XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
                              (unsigned char *) fontsdir, strlen(fontsdir));
diff -urN /tmp/icewm/files/patch-src__wmapp.h ./files/patch-src__wmapp.h
--- /tmp/icewm/files/patch-src__wmapp.h	2014-02-23 17:04:51.000000000 +0100
+++ ./files/patch-src__wmapp.h	2018-05-03 20:57:02.798288000 +0200
@@ -1,6 +1,6 @@
---- src/wmapp.h.orig
+--- src/wmapp.h.orig	2013-11-17 16:54:39 UTC
 +++ src/wmapp.h
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ class YWMApp:  (private)
      Window managerWindow;
  };
  
diff -urN /tmp/icewm/files/patch-src__wmmgr.cc ./files/patch-src__wmmgr.cc
--- /tmp/icewm/files/patch-src__wmmgr.cc	2015-01-01 18:15:01.000000000 +0100
+++ ./files/patch-src__wmmgr.cc	2018-05-03 20:57:02.801765000 +0200
@@ -1,8 +1,6 @@
-diff --git src/wmmgr.cc src/wmmgr.cc
-index 4252bf6..dc1e703 100644
---- src/wmmgr.cc
+--- src/wmmgr.cc.orig	2013-11-17 16:54:39 UTC
 +++ src/wmmgr.cc
-@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
+@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClient
          case ICEWM_ACTION_RESTARTWM:
          case ICEWM_ACTION_WINDOWLIST:
          case ICEWM_ACTION_ABOUT:
diff -urN /tmp/icewm/files/patch-src_wmabout.cc ./files/patch-src_wmabout.cc
--- /tmp/icewm/files/patch-src_wmabout.cc	2018-03-03 16:37:03.000000000 +0100
+++ ./files/patch-src_wmabout.cc	2018-05-03 20:57:02.791162000 +0200
@@ -1,5 +1,5 @@
---- src/wmabout.cc.orig	2018-02-25 21:00:14.796410000 -0800
-+++ src/wmabout.cc	2018-02-25 21:00:22.254233000 -0800
+--- src/wmabout.cc.orig	2013-11-17 16:54:39 UTC
++++ src/wmabout.cc
 @@ -23,7 +23,7 @@
  AboutDlg *aboutDlg = 0;
  
diff -urN /tmp/icewm/files/patch-src_ybutton.cc ./files/patch-src_ybutton.cc
--- /tmp/icewm/files/patch-src_ybutton.cc	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src_ybutton.cc	2018-05-03 20:57:02.804175000 +0200
@@ -0,0 +1,17 @@
+--- src/ybutton.cc.orig	2018-05-03 18:52:38 UTC
++++ src/ybutton.cc
+@@ -158,10 +158,10 @@ void YButton::paintFocus(Graphics &g, const YRect &/*r
+         g.setPenStyle(false);
+     } else {
+         XRectangle focus[] = {
+-            { dp, dp, width() - ds, 1 },
+-            { dp, dp + 1, 1, height() - ds - 2 },
+-            { dp + width() - ds - 1, dp + 1, 1, height() - ds - 2 },
+-            { dp, dp + height() - ds - 1, width() - ds, 1 }
++            { (short)dp, (short)dp, (unsigned short)(width() - ds), 1 },
++            { (short)dp, (short)(dp + 1), 1, (unsigned short)(height() - ds - 2) },
++            { (short)(dp + width() - ds - 1), (short)(dp + 1), 1, (unsigned short)(height() - ds - 2) },
++            { (short)dp, (short)(dp + height() - ds - 1), (unsigned short)(width() - ds), 1 }
+         };
+ 
+         g.setClipRectangles(focus, 4);