diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-05-28 05:10:06 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2014-05-28 05:10:06 +0000 |
| commit | 7a5d57584874af8616113777cc8a6569635bccba (patch) | |
| tree | 388da450f5ed1beb7f29c92e7490d9deec18e5d2 /net | |
| parent | 9ca76c4f29df099eb5ab38fb7416899e9008b4eb (diff) | |
| download | freebsd-ports-7a5d57584874af8616113777cc8a6569635bccba.zip | |
- Update patch to avoid "error: redefinition of typedef"
- Bump PORTREVISION for package change
Diffstat (limited to 'net')
| -rw-r--r-- | net/gupnp/Makefile | 1 | ||||
| -rw-r--r-- | net/gupnp/files/patch-libgupnp-gupnp-acl.h | 10 | ||||
| -rw-r--r-- | net/gupnp/files/patch-libgupnp-gupnp-device.h | 7 | ||||
| -rw-r--r-- | net/gupnp/files/patch-libgupnp-gupnp-service.h | 7 | ||||
| -rw-r--r-- | net/gupnp/files/patch-libgupnp-gupnp-services.c | 16 |
5 files changed, 19 insertions, 22 deletions
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile index 14e5651d2fbf..56d910fa7305 100644 --- a/net/gupnp/Makefile +++ b/net/gupnp/Makefile @@ -3,6 +3,7 @@ PORTNAME= gupnp PORTVERSION= 0.20.11 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= GNOME diff --git a/net/gupnp/files/patch-libgupnp-gupnp-acl.h b/net/gupnp/files/patch-libgupnp-gupnp-acl.h index a962ec2b5569..1e5a96a72fbc 100644 --- a/net/gupnp/files/patch-libgupnp-gupnp-acl.h +++ b/net/gupnp/files/patch-libgupnp-gupnp-acl.h @@ -1,13 +1,15 @@ --- libgupnp/gupnp-acl.h.orig 2014-05-04 20:49:23.000000000 +0800 -+++ libgupnp/gupnp-acl.h 2014-05-09 01:00:57.105329801 +0800 -@@ -50,8 +50,12 @@ ++++ libgupnp/gupnp-acl.h 2014-05-28 13:01:03.041207000 +0800 +@@ -50,8 +50,14 @@ typedef struct _GUPnPAclInterface GUPnPAclInterface; /* Forward declarations to avoid recursive includes */ -+#if !defined(GUPnPDevice) ++#if !defined(__typedef_GUPnPDevice__) ++#define __typedef_GUPnPDevice__ typedef struct _GUPnPDevice GUPnPDevice; +#endif -+#if !defined(GUPnPService) ++#if !defined(__typedef_GUPnPService__) ++#define __typedef_GUPnPService__ typedef struct _GUPnPService GUPnPService; +#endif diff --git a/net/gupnp/files/patch-libgupnp-gupnp-device.h b/net/gupnp/files/patch-libgupnp-gupnp-device.h index faded8fc8c64..87779c1b90de 100644 --- a/net/gupnp/files/patch-libgupnp-gupnp-device.h +++ b/net/gupnp/files/patch-libgupnp-gupnp-device.h @@ -1,10 +1,11 @@ --- libgupnp/gupnp-device.h.orig 2013-12-01 19:32:50.000000000 +0800 -+++ libgupnp/gupnp-device.h 2014-05-09 01:24:34.890234566 +0800 -@@ -51,7 +51,9 @@ ++++ libgupnp/gupnp-device.h 2014-05-28 13:01:03.041207000 +0800 +@@ -51,7 +51,10 @@ GUPnPDeviceClass)) typedef struct _GUPnPDevicePrivate GUPnPDevicePrivate; -+#if !defined(GUPnPDevice) ++#if !defined(__typedef_GUPnPDevice__) ++#define __typedef_GUPnPDevice__ typedef struct _GUPnPDevice GUPnPDevice; +#endif typedef struct _GUPnPDeviceClass GUPnPDeviceClass; diff --git a/net/gupnp/files/patch-libgupnp-gupnp-service.h b/net/gupnp/files/patch-libgupnp-gupnp-service.h index cde5dab7f072..f27257051a96 100644 --- a/net/gupnp/files/patch-libgupnp-gupnp-service.h +++ b/net/gupnp/files/patch-libgupnp-gupnp-service.h @@ -1,10 +1,11 @@ --- libgupnp/gupnp-service.h.orig 2013-12-01 19:32:50.000000000 +0800 -+++ libgupnp/gupnp-service.h 2014-05-09 01:23:09.030240692 +0800 -@@ -65,7 +65,9 @@ ++++ libgupnp/gupnp-service.h 2014-05-28 13:01:03.041207000 +0800 +@@ -65,7 +65,10 @@ #define GUPNP_TYPE_SERVICE_ACTION (gupnp_service_action_get_type ()) typedef struct _GUPnPServicePrivate GUPnPServicePrivate; -+#if !defined(GUPnPService) ++#if !defined(__typedef_GUPnPService__) ++#define __typedef_GUPnPService__ typedef struct _GUPnPService GUPnPService; +#endif typedef struct _GUPnPServiceClass GUPnPServiceClass; diff --git a/net/gupnp/files/patch-libgupnp-gupnp-services.c b/net/gupnp/files/patch-libgupnp-gupnp-services.c index 4d7ba13121ae..b716449e1fe8 100644 --- a/net/gupnp/files/patch-libgupnp-gupnp-services.c +++ b/net/gupnp/files/patch-libgupnp-gupnp-services.c @@ -1,14 +1,6 @@ ---- libgupnp/gupnp-service.c.orig 2013-02-20 20:35:57.000000000 +0800 -+++ libgupnp/gupnp-service.c 2013-03-15 16:04:28.277418472 +0800 -@@ -30,6 +30,7 @@ - #include <gobject/gvaluecollector.h> - #include <gmodule.h> - #include <libsoup/soup-date.h> -+#include <libsoup/soup-date.h> - #include <string.h> - #include "gupnp-service.h" - #include "gupnp-root-device.h" -@@ -43,6 +44,8 @@ +--- libgupnp/gupnp-service.c.orig 2014-05-04 20:49:23.000000000 +0800 ++++ libgupnp/gupnp-service.c 2014-05-28 13:01:03.041207000 +0800 +@@ -45,6 +45,8 @@ #ifdef G_OS_WIN32 #include <rpc.h> @@ -17,7 +9,7 @@ #else #include <uuid/uuid.h> #endif -@@ -1100,9 +1103,19 @@ +@@ -1110,9 +1112,19 @@ #else uuid_t id; char out[39]; |