Attachment #193678 for bug #228317

Lines 3-9 Link Here

(-)icewm/Makefile (-2 / +5 lines)
3		3
4	PORTNAME= icewm	4	PORTNAME= icewm
5	PORTVERSION= 1.3.8	5	PORTVERSION= 1.3.8
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= x11-wm	7	CATEGORIES= x11-wm
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
9		9
Lines 14-21 Link Here
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	USES= gmake iconv:translit localbase pkgconfig	16	USES= gmake iconv:translit localbase pkgconfig
17	USE_XORG= ice sm x11 xext	17	USE_XORG= ice sm x11 xext xrender
		18	LIB_DEPENDS+= libfreetype.so:print/freetype2 \
		19	libfontconfig.so:x11-fonts/fontconfig
18	USE_GNOME= gdkpixbuf2	20	USE_GNOME= gdkpixbuf2
		21	CPPFLAGS+= -Wno-null-dereference
19	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --enable-guievents \	23	CONFIGURE_ARGS= --enable-guievents \
21	--with-cfgdir=${DATADIR} \	24	--with-cfgdir=${DATADIR} \




--- src/wmapp.cc.orig
+++ src/wmapp.cc
@@ -337,7 +337,7 @@
             int ndirs; // ------------------- retrieve the old X's font path ---
             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
 
-            char ** newFontPath = new char *[ndirs + 1];
+            const char ** newFontPath = new const char *[ndirs + 1];
             newFontPath[ndirs] = fontsdir;
 
             if (fontPath)
@@ -383,7 +383,7 @@
             XChangeProperty(xapp->display(), manager->handle(),
                             XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
                             (unsigned char *) fontsdir, strlen(fontsdir));
-            XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
+            XSetFontPath(xapp->display(), (char **) newFontPath, ndirs + 1);
 
             if (fontPath) XFreeFontPath(fontPath);
             delete[] fontsdir;

Lines 1-11 Link Here

(-)icewm/files/patch-src__wmapp.h (-11 lines)
1	--- src/wmapp.h.orig
2	+++ src/wmapp.h
3	@@ -78,7 +78,7 @@
4	Window managerWindow;
5	};
6
7	-#if 0
8	+#ifdef CONFIG_GUIEVENTS
9	extern YWMApp * wmapp;
10	#endif
11




diff --git src/wmmgr.cc src/wmmgr.cc
index 4252bf6..dc1e703 100644
--- src/wmmgr.cc
+++ src/wmmgr.cc
@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
         case ICEWM_ACTION_RESTARTWM:
         case ICEWM_ACTION_WINDOWLIST:
         case ICEWM_ACTION_ABOUT:
-            break;
+            //break;
         default:
             smActionListener->handleSMAction(message.data.l[1]);
             break;

Lines 1-5 Link Here

(-)icewm/files/patch-src_wmabout.cc (-2 / +2 lines)
1	--- src/wmabout.cc.orig 2018-02-25 21:00:14.796410000 -0800	1	--- src/wmabout.cc.orig 2013-11-17 16:54:39 UTC
2	+++ src/wmabout.cc 2018-02-25 21:00:22.254233000 -0800	2	+++ src/wmabout.cc
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@
4	AboutDlg *aboutDlg = 0;	4	AboutDlg *aboutDlg = 0;
5		5




--- src/wmapp.cc.orig	2013-11-17 16:54:39 UTC
+++ src/wmapp.cc
@@ -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));
 
-            char ** newFontPath = new char *[ndirs + 1];
+            const char ** newFontPath = new const char *[ndirs + 1];
             newFontPath[ndirs] = fontsdir;
 
             if (fontPath)
@@ -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));
-            XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
+            const char ** newFontPath = new const char *[ndirs + 1];
 
             if (fontPath) XFreeFontPath(fontPath);
             delete[] fontsdir;

Line 0 Link Here

(-)icewm/files/patch-src_wmapp.h (+11 lines)
	1	--- src/wmapp.h.orig 2013-11-17 16:54:39 UTC
	2	+++ src/wmapp.h
	3	@@ -78,7 +78,7 @@ class YWMApp: (private)
	4	Window managerWindow;
	5	};
	6
	7	-#if 0
	8	+#ifdef CONFIG_GUIEVENTS
	9	extern YWMApp * wmapp;
	10	#endif
	11

Line 0 Link Here

(-)icewm/files/patch-src_wmmgr.cc (+11 lines)
	1	--- src/wmmgr.cc.orig 2013-11-17 16:54:39 UTC
	2	+++ src/wmmgr.cc
	3	@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClient
	4	case ICEWM_ACTION_RESTARTWM:
	5	case ICEWM_ACTION_WINDOWLIST:
	6	case ICEWM_ACTION_ABOUT:
	7	- break;
	8	+ //break;
	9	default:
	10	smActionListener->handleSMAction(message.data.l[1]);
	11	break;




--- src/ybutton.cc.orig	2018-05-24 19:56:18 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 }
+            { static_cast<int>(dp), static_cast<int>(dp), static_cast<int>(width()) - ds, 1 },
+            { static_cast<int>(dp), static_cast<int>(dp) + 1, 1, static_cast<int>(height()) - ds - 2 },
+            { static_cast<int>(dp) + width() - ds - 1, static_cast<int>(dp) + 1, 1, static_cast<int>(height()) - ds - 2 },
+            { static_cast<int>(dp), static_cast<int>(dp) + height() - ds - 1, static_cast<int>(width()) - ds, 1 }
         };
 
         g.setClipRectangles(focus, 4);

Return to bug 228317

Lines 1-20 Link Here

(-)icewm/files/patch-src__wmapp.cc (-20 lines)
1	--- src/wmapp.cc.orig
2	+++ src/wmapp.cc
3	@@ -337,7 +337,7 @@
4	int ndirs; // ------------------- retrieve the old X's font path ---
5	char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
6
7	- char ** newFontPath = new char *[ndirs + 1];
8	+ const char ** newFontPath = new const char *[ndirs + 1];
9	newFontPath[ndirs] = fontsdir;
10
11	if (fontPath)
12	@@ -383,7 +383,7 @@
13	XChangeProperty(xapp->display(), manager->handle(),
14	XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
15	(unsigned char *) fontsdir, strlen(fontsdir));
16	- XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
17	+ XSetFontPath(xapp->display(), (char **) newFontPath, ndirs + 1);
18
19	if (fontPath) XFreeFontPath(fontPath);
20	delete[] fontsdir;

Lines 1-13 Link Here

(-)icewm/files/patch-src__wmmgr.cc (-13 lines)
1	diff --git src/wmmgr.cc src/wmmgr.cc
2	index 4252bf6..dc1e703 100644
3	--- src/wmmgr.cc
4	+++ src/wmmgr.cc
5	@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
6	case ICEWM_ACTION_RESTARTWM:
7	case ICEWM_ACTION_WINDOWLIST:
8	case ICEWM_ACTION_ABOUT:
9	- break;
10	+ //break;
11	default:
12	smActionListener->handleSMAction(message.data.l[1]);
13	break;

Line 0 Link Here

(-)icewm/files/patch-src_wmapp.cc (+29 lines)
	1	--- src/wmapp.cc.orig 2013-11-17 16:54:39 UTC
	2	+++ src/wmapp.cc
	3	@@ -221,7 +221,7 @@ static void registerProtocols2(Window xid) {
	4	#endif
	5
	6	long pid = getpid();
	7	- const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")";
	8	+ const char wmname[] = "IceWM " VERSION" (" HOSTOS"/" HOSTCPU")";
	9
	10	#ifdef GNOME1_HINTS
	11	XChangeProperty(xapp->display(), xid,
	12	@@ -337,7 +337,7 @@ static void initFontPath(IApp *app) {
	13	int ndirs; // ------------------- retrieve the old X's font path ---
	14	char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
	15
	16	- char ** newFontPath = new char *[ndirs + 1];
	17	+ const char ** newFontPath = new const char *[ndirs + 1];
	18	newFontPath[ndirs] = fontsdir;
	19
	20	if (fontPath)
	21	@@ -383,7 +383,7 @@ static void initFontPath(IApp *app) {
	22	XChangeProperty(xapp->display(), manager->handle(),
	23	XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
	24	(unsigned char *) fontsdir, strlen(fontsdir));
	25	- XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
	26	+ const char ** newFontPath = new const char *[ndirs + 1];
	27
	28	if (fontPath) XFreeFontPath(fontPath);
	29	delete[] fontsdir;

Line 0 Link Here

(-)icewm/files/patch-src_ybutton.cc (+17 lines)
	1	--- src/ybutton.cc.orig 2018-05-24 19:56:18 UTC
	2	+++ src/ybutton.cc
	3	@@ -158,10 +158,10 @@ void YButton::paintFocus(Graphics &g, const YRect &/*r
	4	g.setPenStyle(false);
	5	} else {
	6	XRectangle focus[] = {
	7	- { dp, dp, width() - ds, 1 },
	8	- { dp, dp + 1, 1, height() - ds - 2 },
	9	- { dp + width() - ds - 1, dp + 1, 1, height() - ds - 2 },
	10	- { dp, dp + height() - ds - 1, width() - ds, 1 }
	11	+ { static_cast<int>(dp), static_cast<int>(dp), static_cast<int>(width()) - ds, 1 },
	12	+ { static_cast<int>(dp), static_cast<int>(dp) + 1, 1, static_cast<int>(height()) - ds - 2 },
	13	+ { static_cast<int>(dp) + width() - ds - 1, static_cast<int>(dp) + 1, 1, static_cast<int>(height()) - ds - 2 },
	14	+ { static_cast<int>(dp), static_cast<int>(dp) + height() - ds - 1, static_cast<int>(width()) - ds, 1 }
	15	};
	16
	17	g.setClipRectangles(focus, 4);