Index: icewm/Makefile =================================================================== --- icewm/Makefile (revision 470789) +++ icewm/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= icewm PORTVERSION= 1.3.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION} @@ -14,7 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake iconv:translit localbase pkgconfig -USE_XORG= ice sm x11 xext +USE_XORG= ice sm x11 xext xrender +LIB_DEPENDS+= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig USE_GNOME= gdkpixbuf2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-guievents \ @@ -53,6 +55,11 @@ BEASTIE_VARS= STARTUP_PIXMAP=${DATADIR}/taskbar/bsd-daemon.xpm BEASTIE_VARS_OFF= STARTUP_PIXMAP=icewm-logo.xpm +.include + +COMPILER_TYPE= clang +COMPILER_VERSION= 50 + post-extract: .for dir in taskbar themes/Infadel2/taskbar @cd ${WRKSRC}/lib/${dir} && ${MV} start.xpm icewm-logo.xpm @@ -87,4 +94,4 @@ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include Index: icewm/files/patch-src__wmapp.cc =================================================================== --- icewm/files/patch-src__wmapp.cc (revision 470789) +++ icewm/files/patch-src__wmapp.cc (nonexistent) @@ -1,20 +0,0 @@ ---- 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; Index: icewm/files/patch-src__wmapp.h =================================================================== --- icewm/files/patch-src__wmapp.h (revision 470789) +++ icewm/files/patch-src__wmapp.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/wmapp.h.orig -+++ src/wmapp.h -@@ -78,7 +78,7 @@ - Window managerWindow; - }; - --#if 0 -+#ifdef CONFIG_GUIEVENTS - extern YWMApp * wmapp; - #endif - Index: icewm/files/patch-src__wmmgr.cc =================================================================== --- icewm/files/patch-src__wmmgr.cc (revision 470789) +++ icewm/files/patch-src__wmmgr.cc (nonexistent) @@ -1,13 +0,0 @@ -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; Index: icewm/files/patch-src_wmabout.cc =================================================================== --- icewm/files/patch-src_wmabout.cc (revision 470789) +++ icewm/files/patch-src_wmabout.cc (working copy) @@ -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; Index: icewm/files/patch-src_wmapp.cc =================================================================== --- icewm/files/patch-src_wmapp.cc (nonexistent) +++ icewm/files/patch-src_wmapp.cc (working copy) @@ -0,0 +1,29 @@ +--- 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; Index: icewm/files/patch-src_wmapp.h =================================================================== --- icewm/files/patch-src_wmapp.h (nonexistent) +++ icewm/files/patch-src_wmapp.h (working copy) @@ -0,0 +1,11 @@ +--- src/wmapp.h.orig 2013-11-17 16:54:39 UTC ++++ src/wmapp.h +@@ -78,7 +78,7 @@ class YWMApp: (private) + Window managerWindow; + }; + +-#if 0 ++#ifdef CONFIG_GUIEVENTS + extern YWMApp * wmapp; + #endif + Index: icewm/files/patch-src_wmmgr.cc =================================================================== --- icewm/files/patch-src_wmmgr.cc (nonexistent) +++ icewm/files/patch-src_wmmgr.cc (working copy) @@ -0,0 +1,11 @@ +--- src/wmmgr.cc.orig 2013-11-17 16:54:39 UTC ++++ src/wmmgr.cc +@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClient + case ICEWM_ACTION_RESTARTWM: + case ICEWM_ACTION_WINDOWLIST: + case ICEWM_ACTION_ABOUT: +- break; ++ //break; + default: + smActionListener->handleSMAction(message.data.l[1]); + break;