From: Peter Levine Date: Fri, 17 Mar 2017 20:08:40 +0000 (-0400) Subject: x11-misc/qtfm: Fix GCC-6 build (bug #612522) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bb94cb4ddfd0e0b0cca32c21469610b80c3cec9;p=gentoo.git 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 index 000000000000..371ee6afa562 --- /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 @@ + + if(item) return item->absoluteFilePath(); + +- return false; ++ return NULL; + } + + //--------------------------------------------------------------------------------------- diff --git a/x11-misc/qtfm/qtfm-5.5-r1.ebuild b/x11-misc/qtfm/qtfm-5.5-r1.ebuild index eaff4fb11c71..e44d0d3c0fb8 100644 --- 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 \