--- a/components/libidn/patches/002-includes.patch Wed Aug 10 08:37:31 2016 -0700
+++ b/components/libidn/patches/002-includes.patch Tue Aug 16 06:48:55 2016 -0700
@@ -1,55 +1,15 @@
---- lib/idna.h.orig Wed Dec 21 08:03:15 2011
-+++ lib/idna.h Wed Dec 21 08:05:57 2011
-@@ -36,7 +36,7 @@
- # endif
+Provide the correct include file for finding the uint32_t definition.
+
+This patch will be sent upstream.
+
+--- lib/stringprep.h.orig 2016-03-29 07:36:25.142643305 -0700
++++ lib/stringprep.h 2016-03-29 07:36:48.406250204 -0700
+@@ -44,7 +44,7 @@
# include <stddef.h> /* size_t */
+ # include <sys/types.h> /* ssize_t */
-# include <idn-int.h> /* uint32_t */
+# include <idn/idn-int.h> /* uint32_t */
# ifdef __cplusplus
extern "C"
---- lib/pr29.h.orig Wed Dec 21 08:03:20 2011
-+++ lib/pr29.h Wed Dec 21 08:06:20 2011
-@@ -44,7 +44,7 @@
- # include <stdlib.h>
-
- /* Get uint32_t. */
--# include <idn-int.h>
-+# include <idn/idn-int.h>
-
- /* Error codes. */
- typedef enum
---- lib/punycode.h.orig Wed Dec 21 08:03:26 2011
-+++ lib/punycode.h Wed Dec 21 08:06:49 2011
-@@ -81,7 +81,7 @@
- #endif
-
- #include <stddef.h> /* size_t */
--#include <idn-int.h> /* uint32_t */
-+#include <idn/idn-int.h> /* uint32_t */
-
- enum punycode_status
- {
---- lib/stringprep.h.orig Wed Dec 21 08:03:32 2011
-+++ lib/stringprep.h Wed Dec 21 08:07:08 2011
-@@ -36,7 +36,7 @@
-
- # include <stddef.h> /* size_t */
- # include <unistd.h> /* ssize_t */
--# include <idn-int.h> /* uint32_t */
-+# include <idn/idn-int.h> /* uint32_t */
-
- # ifdef __cplusplus
- extern "C"
---- lib/tld.h.orig Wed Dec 21 08:03:38 2011
-+++ lib/tld.h Wed Dec 21 08:07:20 2011
-@@ -47,7 +47,7 @@
- # include <stdlib.h>
-
- /* Get uint32_t. */
--# include <idn-int.h>
-+# include <idn/idn-int.h>
-
- /* Interval of valid code points in the TLD. */
- struct Tld_table_element