svn commit: r355589 - in head/net/gupnp: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Wed May 28 05:10:08 UTC 2014
Author: sunpoet
Date: Wed May 28 05:10:06 2014
New Revision: 355589
URL: http://svnweb.freebsd.org/changeset/ports/355589
QAT: https://qat.redports.org/buildarchive/r355589/
Log:
- Update patch to avoid "error: redefinition of typedef"
- Bump PORTREVISION for package change
Modified:
head/net/gupnp/Makefile
head/net/gupnp/files/patch-libgupnp-gupnp-acl.h
head/net/gupnp/files/patch-libgupnp-gupnp-device.h
head/net/gupnp/files/patch-libgupnp-gupnp-service.h
head/net/gupnp/files/patch-libgupnp-gupnp-services.c
Modified: head/net/gupnp/Makefile
==============================================================================
--- head/net/gupnp/Makefile Wed May 28 04:42:16 2014 (r355588)
+++ head/net/gupnp/Makefile Wed May 28 05:10:06 2014 (r355589)
@@ -3,6 +3,7 @@
PORTNAME= gupnp
PORTVERSION= 0.20.11
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GNOME
Modified: head/net/gupnp/files/patch-libgupnp-gupnp-acl.h
==============================================================================
--- head/net/gupnp/files/patch-libgupnp-gupnp-acl.h Wed May 28 04:42:16 2014 (r355588)
+++ head/net/gupnp/files/patch-libgupnp-gupnp-acl.h Wed May 28 05:10:06 2014 (r355589)
@@ -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
Modified: head/net/gupnp/files/patch-libgupnp-gupnp-device.h
==============================================================================
--- head/net/gupnp/files/patch-libgupnp-gupnp-device.h Wed May 28 04:42:16 2014 (r355588)
+++ head/net/gupnp/files/patch-libgupnp-gupnp-device.h Wed May 28 05:10:06 2014 (r355589)
@@ -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;
Modified: head/net/gupnp/files/patch-libgupnp-gupnp-service.h
==============================================================================
--- head/net/gupnp/files/patch-libgupnp-gupnp-service.h Wed May 28 04:42:16 2014 (r355588)
+++ head/net/gupnp/files/patch-libgupnp-gupnp-service.h Wed May 28 05:10:06 2014 (r355589)
@@ -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;
Modified: head/net/gupnp/files/patch-libgupnp-gupnp-services.c
==============================================================================
--- head/net/gupnp/files/patch-libgupnp-gupnp-services.c Wed May 28 04:42:16 2014 (r355588)
+++ head/net/gupnp/files/patch-libgupnp-gupnp-services.c Wed May 28 05:10:06 2014 (r355589)
@@ -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];
More information about the svn-ports-all
mailing list