From 1fcf50de3b83e5cc9d64f0254f61bcaed4a43176 Mon Sep 17 00:00:00 2001
From: Christophe Lermytte <gentoo@lermytte.be>
Date: Wed, 16 Nov 2016 18:01:00 +0100
Subject: net-misc/gupnp-tools: add upstream commit as a patch.

Gentoo-Bug: https://bugs.gentoo.org/598284

Closes: https://github.com/gentoo/gentoo/pull/2847
---
 ...gupnp-tools-fix-compiling-when-using-recent-gupnp-av.patch | 11 +++++++++++
 net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild                | 10 +++++++++-
 net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild                |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 net-misc/gupnp-tools/files/gupnp-tools-fix-compiling-when-using-recent-gupnp-av.patch

diff --git a/net-misc/gupnp-tools/files/gupnp-tools-fix-compiling-when-using-recent-gupnp-av.patch b/net-misc/gupnp-tools/files/gupnp-tools-fix-compiling-when-using-recent-gupnp-av.patch
new file mode 100644
index 000000000000..0d959580bb50
--- /dev/null
+++ b/net-misc/gupnp-tools/files/gupnp-tools-fix-compiling-when-using-recent-gupnp-av.patch
@@ -0,0 +1,11 @@
+diff --git a/src/av-cp/playlist-treeview.h b/src/av-cp/playlist-treeview.h
+index 8637ae8..16b131e 100644
+--- a/src/av-cp/playlist-treeview.h
++++ b/src/av-cp/playlist-treeview.h
+@@ -23,6 +23,8 @@
+ 
+ #include <config.h>
+ #include <gtk/gtk.h>
++
++#include <libgupnp/gupnp.h>
+ #include <libgupnp-av/gupnp-av.h>
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
index 47ada59264e6..ad806d818a24 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Free replacements of Intel UPnP tools that use GUPnP"
 HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
@@ -30,3 +30,11 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
+
+src_prepare() {
+	# Fixes 598284 with upstream patch
+	# https://git.gnome.org/browse/gupnp-tools/commit/?id=e9ec9634207e4c2eea6d268ee29b57e687c1f178
+	epatch "${FILESDIR}"/${PN}-fix-compiling-when-using-recent-gupnp-av.patch
+	gnome2_src_prepare
+}
+
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild
index 6752b6fb0f15..a078a07c6982 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild
@@ -27,3 +27,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
 "
+
+# Fixes 598284 with upstream patch
+# https://git.gnome.org/browse/gupnp-tools/commit/?id=e9ec9634207e4c2eea6d268ee29b57e687c1f178
+PATCHES=( "${FILESDIR}/${PN}-fix-compiling-when-using-recent-gupnp-av.patch" )
-- 
cgit v1.2.3-65-gdbad