From owner-svn-ports-all@freebsd.org Sat Jun 16 02:49:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94C8710052A0; Sat, 16 Jun 2018 02:49:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3CC0E6F8A2; Sat, 16 Jun 2018 02:49:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2F6C2053E; Sat, 16 Jun 2018 02:49:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5G2n7l1033376; Sat, 16 Jun 2018 02:49:07 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5G2n7B0033374; Sat, 16 Jun 2018 02:49:07 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201806160249.w5G2n7B0033374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 16 Jun 2018 02:49:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472514 - in head/x11-wm/icewm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/x11-wm/icewm: . files X-SVN-Commit-Revision: 472514 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jun 2018 02:49:08 -0000 Author: tobik Date: Sat Jun 16 02:49:07 2018 New Revision: 472514 URL: https://svnweb.freebsd.org/changeset/ports/472514 Log: x11-wm/icewm: Fix build with Clang 6 While here - Fix license - Add missing dependencies PR: 228317 Submitted by: Chris Hutchinson (based on) Kudos to: krion (for patiently test building many iterations of it) Modified: head/x11-wm/icewm/Makefile head/x11-wm/icewm/files/patch-src__wmapp.cc Modified: head/x11-wm/icewm/Makefile ============================================================================== --- head/x11-wm/icewm/Makefile Sat Jun 16 01:44:27 2018 (r472513) +++ head/x11-wm/icewm/Makefile Sat Jun 16 02:49:07 2018 (r472514) @@ -3,19 +3,23 @@ PORTNAME= icewm PORTVERSION= 1.3.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION} MAINTAINER= portmaster@bsdforge.com COMMENT= Window Manager designed for speed, usability and consistency -LICENSE= GPLv2 +LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + USES= gmake iconv:translit localbase pkgconfig -USE_XORG= ice sm x11 xext +USE_CXXSTD= c++98 USE_GNOME= gdkpixbuf2 +USE_XORG= ice sm x11 xext xrender GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-guievents \ --with-cfgdir=${DATADIR} \ Modified: head/x11-wm/icewm/files/patch-src__wmapp.cc ============================================================================== --- head/x11-wm/icewm/files/patch-src__wmapp.cc Sat Jun 16 01:44:27 2018 (r472513) +++ head/x11-wm/icewm/files/patch-src__wmapp.cc Sat Jun 16 02:49:07 2018 (r472514) @@ -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));