From owner-svn-ports-all@freebsd.org Tue Aug 28 13:48:02 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 94DF5108CEF4; Tue, 28 Aug 2018 13:48:02 +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 4B63984C3D; Tue, 28 Aug 2018 13:48:02 +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 2C8ED5A1A; Tue, 28 Aug 2018 13:48:02 +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 w7SDm2me053780; Tue, 28 Aug 2018 13:48:02 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7SDm29f053779; Tue, 28 Aug 2018 13:48:02 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201808281348.w7SDm29f053779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 28 Aug 2018 13:48:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478316 - head/x11/fbdesk/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/x11/fbdesk/files X-SVN-Commit-Revision: 478316 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.27 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: Tue, 28 Aug 2018 13:48:02 -0000 Author: tobik Date: Tue Aug 28 13:48:01 2018 New Revision: 478316 URL: https://svnweb.freebsd.org/changeset/ports/478316 Log: x11/fbdesk: Fix build with Clang 6 Image.cc:88:16: error: cannot initialize return object of type 'FbTk::PixmapWithMask *' with an rvalue of type 'bool' return false; ^~~~~ http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/fbdesk-1.4.1_6.log Added: head/x11/fbdesk/files/patch-src_FbTk_Image.cc (contents, props changed) Added: head/x11/fbdesk/files/patch-src_FbTk_Image.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/fbdesk/files/patch-src_FbTk_Image.cc Tue Aug 28 13:48:01 2018 (r478316) @@ -0,0 +1,19 @@ +--- src/FbTk/Image.cc.orig 2018-08-28 13:45:07 UTC ++++ src/FbTk/Image.cc +@@ -85,14 +85,14 @@ PixmapWithMask *Image::load(const std::string &filenam + + + if (filename == "") +- return false; ++ return NULL; + + // determine file ending + std::string extension(StringUtil::toUpper(StringUtil::findExtension(filename))); + + // valid handle? + if (s_image_map.find(extension) == s_image_map.end()) +- return false; ++ return NULL; + + // load file + PixmapWithMask *pm = s_image_map[extension]->load(filename, screen_num);