summaryrefslogtreecommitdiff
path: root/x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch')
-rw-r--r--x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch
new file mode 100644
index 000000000000..85ee0f94567e
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-fix-c++14.patch
@@ -0,0 +1,22 @@
+Fix building with C++14, which errors out due to bool -> T* conversions
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594052
+
+--- a/src/FbTk/Image.cc
++++ b/src/FbTk/Image.cc
+@@ -85,14 +85,14 @@
+
+
+ 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);