svn commit: r478316 - head/x11/fbdesk/files
Tobias Kortkamp
tobik at FreeBSD.org
Tue Aug 28 13:48:02 UTC 2018
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);
More information about the svn-ports-all
mailing list