media-libs/herqq: fix build with GCC 6

Patch-by: Peter Levine <plevine457@gmail.com>
Gentoo-bug: 594188

Package-Manager: portage-2.3.1

diff --git a/media-libs/herqq/files/herqq-1.0.0-gcc6.patch b/media-libs/herqq/files/herqq-1.0.0-gcc6.patch
new file mode 100644 (file)
index 0000000..a30d86e
--- /dev/null
+++ b/media-libs/herqq/files/herqq-1.0.0-gcc6.patch
@@ -0,0 +1,24 @@
+Fix build with GCC 6.
+
+Gentoo-bug: 594188
+
+--- a/hupnp/src/devicehosting/devicehost/hservermodel_creator_p.cpp
++++ b/hupnp/src/devicehosting/devicehost/hservermodel_creator_p.cpp
+@@ -493,7 +493,7 @@
+             QString("Failed to initialize device [%1]").arg(
+                 deviceInfo.udn().toString());
+ 
+-        return false;
++        return NULL;
+     }
+ 
+     device->h_ptr->m_deviceDescription =
+@@ -560,7 +560,7 @@
+                     "[%2]").arg(device->info().deviceType().toString(),
+                                 dt.toString());
+ 
+-                return false;
++                return NULL;
+             }
+         }
+     }

diff --git a/media-libs/herqq/herqq-1.0.0-r2.ebuild b/media-libs/herqq/herqq-1.0.0-r2.ebuild
index 6d0770876f99f84e4da15a52770569cb7e4c1c5e..eb6cba224683e2e15432eb868d44c2569354785f 100644 (file)
--- a/media-libs/herqq/herqq-1.0.0-r2.ebuild
+++ b/media-libs/herqq/herqq-1.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( hupnp/ChangeLog )
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
 
 src_prepare() {
        # fix the .pro file for multilib issues