summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-03-17 16:08:40 -0400
committerMichael Palimaka <kensington@gentoo.org>2017-03-19 20:05:38 +1100
commit2bb94cb4ddfd0e0b0cca32c21469610b80c3cec9 (patch)
tree26b4471ac45b08b86bd3d7a41af56402a21d44a0
parentsci-libs/minuit: Remove old (diff)
downloadgentoo-2bb94cb4ddfd0e0b0cca32c21469610b80c3cec9.tar.gz
gentoo-2bb94cb4ddfd0e0b0cca32c21469610b80c3cec9.tar.bz2
gentoo-2bb94cb4ddfd0e0b0cca32c21469610b80c3cec9.zip
x11-misc/qtfm: Fix GCC-6 build (bug #612522)
-rw-r--r--x11-misc/qtfm/files/qtfm-5.5-gcc6.patch11
-rw-r--r--x11-misc/qtfm/qtfm-5.5-r1.ebuild2
2 files changed, 13 insertions, 0 deletions
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 00000000000..371ee6afa56
--- /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 eaff4fb11c7..e44d0d3c0fb 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 \