Fix build. Already fixed upstream I think...

4 files changed, 59 insertions, 1 deletions

diff --git a/net/gupnp/distinfo b/net/gupnp/distinfo
index 10183b011d4..07fa88e3fbb 100644
--- a/net/gupnp/distinfo
+++ b/net/gupnp/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.16 2014/06/06 12:33:41 wiz Exp $
+$NetBSD: distinfo,v 1.17 2014/06/24 06:10:54 dholland Exp $
 
 SHA1 (gupnp-0.20.12.tar.xz) = fbc23c0fa0df70f44d50b2ed88dc2c4dc06d166c
 RMD160 (gupnp-0.20.12.tar.xz) = ec84d9d351ca0f6d8b5821719f39d0b25abad2b1
 Size (gupnp-0.20.12.tar.xz) = 394316 bytes
 SHA1 (patch-ab) = e43380eac64d815fff1a1b62f73e35e1bdfb9633
 SHA1 (patch-ad) = 3c10a9883b7c6e0508fe93f26f0e2334a09fb816
+SHA1 (patch-libgupnp_gupnp-acl.h) = 058eb86efcb11088b32d2784e8779d389e4d27b1
+SHA1 (patch-libgupnp_gupnp-device.h) = 7462830251fc959025615e697f6a45e386a3ea5d
+SHA1 (patch-libgupnp_gupnp-service.h) = 07040032c139bd1174bf09e8acc980df011a61f0
diff --git a/net/gupnp/patches/patch-libgupnp_gupnp-acl.h b/net/gupnp/patches/patch-libgupnp_gupnp-acl.h
new file mode 100644
index 00000000000..b89ecec8bba
--- /dev/null
+++ b/net/gupnp/patches/patch-libgupnp_gupnp-acl.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-libgupnp_gupnp-acl.h,v 1.1 2014/06/24 06:10:54 dholland Exp $
+
+Fix build.
+
+--- libgupnp/gupnp-acl.h.orig	2014-05-29 12:51:43.000000000 +0000
++++ libgupnp/gupnp-acl.h
+@@ -68,8 +68,14 @@ typedef struct _GUPnPAcl GUPnPAcl;
+ typedef struct _GUPnPAclInterface GUPnPAclInterface;
+ 
+ /* Forward declarations to avoid recursive includes */
++#ifndef GUPNPDEVICE_DEFINED
++#define GUPNPDEVICE_DEFINED
+ typedef struct _GUPnPDevice GUPnPDevice;
++#endif
++#ifndef GUPNPSERVICE_DEFINED
++#define GUPNPSERVICE_DEFINED
+ typedef struct _GUPnPService GUPnPService;
++#endif
+ 
+ struct _GUPnPAclInterface {
+     GTypeInterface parent;
diff --git a/net/gupnp/patches/patch-libgupnp_gupnp-device.h b/net/gupnp/patches/patch-libgupnp_gupnp-device.h
new file mode 100644
index 00000000000..dbc35516126
--- /dev/null
+++ b/net/gupnp/patches/patch-libgupnp_gupnp-device.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-libgupnp_gupnp-device.h,v 1.1 2014/06/24 06:10:54 dholland Exp $
+
+Fix build.
+
+--- libgupnp/gupnp-device.h~	2014-05-29 12:47:53.000000000 +0000
++++ libgupnp/gupnp-device.h
+@@ -51,7 +51,10 @@ gupnp_device_get_type (void) G_GNUC_CONS
+                  GUPnPDeviceClass))
+ 
+ typedef struct _GUPnPDevicePrivate GUPnPDevicePrivate;
++#ifndef GUPNPDEVICE_DEFINED
++#define GUPNPDEVICE_DEFINED
+ typedef struct _GUPnPDevice GUPnPDevice;
++#endif
+ typedef struct _GUPnPDeviceClass GUPnPDeviceClass;
+ 
+ /**
diff --git a/net/gupnp/patches/patch-libgupnp_gupnp-service.h b/net/gupnp/patches/patch-libgupnp_gupnp-service.h
new file mode 100644
index 00000000000..424b93e794e
--- /dev/null
+++ b/net/gupnp/patches/patch-libgupnp_gupnp-service.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-libgupnp_gupnp-service.h,v 1.1 2014/06/24 06:10:54 dholland Exp $
+
+Fix build.
+
+--- libgupnp/gupnp-service.h~	2014-05-29 12:47:53.000000000 +0000
++++ libgupnp/gupnp-service.h
+@@ -65,7 +65,10 @@ gupnp_service_action_get_type (void) G_G
+ #define GUPNP_TYPE_SERVICE_ACTION (gupnp_service_action_get_type ())
+ 
+ typedef struct _GUPnPServicePrivate GUPnPServicePrivate;
++#ifndef GUPNPSERVICE_DEFINED
++#define GUPNPSERVICE_DEFINED
+ typedef struct _GUPnPService GUPnPService;
++#endif
+ typedef struct _GUPnPServiceClass GUPnPServiceClass;
+ 
+ /**