[dolphin-emu] 25/33: Use miniupnpc warning fix from upstream

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository dolphin-emu.

commit 3e601ed6a92833d467186925f8f55eddd47fb84e
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sun Nov 16 14:38:35 2014 +0000

    Use miniupnpc warning fix from upstream
---
 debian/patches/07_fix-findminiupnpc-warnings.patch | 24 +++++++++++++
 debian/patches/35_cmake-miniupnpc-fixes.patch      | 41 ----------------------
 debian/patches/series                              |  2 +-
 3 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/debian/patches/07_fix-findminiupnpc-warnings.patch b/debian/patches/07_fix-findminiupnpc-warnings.patch
new file mode 100644
index 0000000..67b13b1
--- /dev/null
+++ b/debian/patches/07_fix-findminiupnpc-warnings.patch
@@ -0,0 +1,24 @@
+Description: Fix FindMiniupnpc.cmake warnings
+Author: Tillmann Karras <tilkax at gmail.com>
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/269e2aefa79075cca3b4ea63812456549ddc0867
+
+--- a/CMakeTests/FindMiniupnpc.cmake
++++ b/CMakeTests/FindMiniupnpc.cmake
+@@ -128,7 +128,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+ 	   static struct IGDdatas data;
+ 	   int main()
+ 	   {
+-	   char externalIP[16]     = "";
++	   char externalIP[16]     = \"\";
+ 	   UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
+ 
+ 	   return 0;
+@@ -148,7 +148,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+ 		static struct IGDdatas data;
+ 		int main()
+ 		{
+-		char externalIP[16]     = "";
++		char externalIP[16]     = \"\";
+ 		UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
+ 
+ 		return 0;
diff --git a/debian/patches/35_cmake-miniupnpc-fixes.patch b/debian/patches/35_cmake-miniupnpc-fixes.patch
deleted file mode 100644
index e9b05ee..0000000
--- a/debian/patches/35_cmake-miniupnpc-fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix some problems with FindMiniupnpc.cmake
-Index: dolphin-emu-4.0.2/CMakeTests/FindMiniupnpc.cmake
-===================================================================
---- dolphin-emu-4.0.2.orig/CMakeTests/FindMiniupnpc.cmake	2013-11-29 13:05:19.000000000 -0800
-+++ dolphin-emu-4.0.2/CMakeTests/FindMiniupnpc.cmake	2013-11-30 22:06:42.731136906 -0800
-@@ -78,7 +78,7 @@
- 	int main()
- 	{
- 	struct UPNPDev *devlist = NULL;
--	int upnp_delay = 5000;
-+	int upnp_delay = 1;
- 	const char *upnp_multicastif = NULL;
- 	const char *upnp_minissdpdsock = NULL;
- 	int upnp_sameport = 0;
-@@ -102,7 +102,7 @@
- 	   int main()
- 	   {
- 	   struct UPNPDev *devlist = NULL;
--	   int upnp_delay = 5000;
-+	   int upnp_delay = 1;
- 	   const char *upnp_multicastif = NULL;
- 	   const char *upnp_minissdpdsock = NULL;
- 	   int upnp_sameport = 0;
-@@ -128,7 +128,7 @@
- 	   static struct IGDdatas data;
- 	   int main()
- 	   {
--	   char externalIP[16]     = "";
-+	   char externalIP[16];
- 	   UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
- 
- 	   return 0;
-@@ -148,7 +148,7 @@
- 		static struct IGDdatas data;
- 		int main()
- 		{
--		char externalIP[16]     = "";
-+		char externalIP[16];
- 		UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
- 
- 		return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 9577b00..06d13ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,6 @@
 03_fixes-for-polarssl-1.3.patch
 04_use-polarssl-aes.patch
 06_remove-powerpcdisasm.patch
-35_cmake-miniupnpc-fixes.patch
+07_fix-findminiupnpc-warnings.patch
 37_cmake-sfml-fixes.patch
 80_sfml-use-2.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git