x11-misc/qtfm: Fix GCC-6 build (bug #612522)

diff --git a/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch b/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch
new file mode 100644 (file)
index 0000000..371ee6a
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-5.5-gcc6.patch
@@ -0,0 +1,11 @@
+--- qtfm-5.5/src/mymodel.cpp.old       2012-05-27 20:05:45.000000000 -0400
++++ qtfm-5.5/src/mymodel.cpp   2017-03-17 15:41:37.136770140 -0400
+@@ -166,7 +166,7 @@
+ \r
+     if(item) return item->absoluteFilePath();\r
+ \r
+-    return false;\r
++    return NULL;\r
+ }\r
+ \r
+ //---------------------------------------------------------------------------------------\r

diff --git a/x11-misc/qtfm/qtfm-5.5-r1.ebuild b/x11-misc/qtfm/qtfm-5.5-r1.ebuild
index eaff4fb11c71e48d710c036c016f7b91b3dfc5df..e44d0d3c0fb8b2fb7b038ec54f837a1601f07aef 100644 (file)
--- a/x11-misc/qtfm/qtfm-5.5-r1.ebuild
+++ b/x11-misc/qtfm/qtfm-5.5-r1.ebuild
@@ -18,6 +18,8 @@ RDEPEND="sys-apps/file
        dev-qt/qtgui:4"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
+
 src_prepare() {
        default
        sed -i \