From owner-svn-ports-all@FreeBSD.ORG Mon May 19 18:38:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA10891E; Mon, 19 May 2014 18:38:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8ABBC28E7; Mon, 19 May 2014 18:38:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JIcWLg041739; Mon, 19 May 2014 18:38:32 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JIcUO1041725; Mon, 19 May 2014 18:38:30 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201405191838.s4JIcUO1041725@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 19 May 2014 18:38:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354573 - in head/net/gupnp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 18:38:32 -0000 Author: sunpoet Date: Mon May 19 18:38:30 2014 New Revision: 354573 URL: http://svnweb.freebsd.org/changeset/ports/354573 QAT: https://qat.redports.org/buildarchive/r354573/ Log: - Update to 0.20.11 Changes: http://git.gnome.org/browse/gupnp/tree/NEWS Added: head/net/gupnp/files/patch-libgupnp-gupnp-acl.h (contents, props changed) head/net/gupnp/files/patch-libgupnp-gupnp-control-point.c - copied unchanged from r354424, head/net/gupnp/files/patch-libgupnp_gupnp-control-point.c head/net/gupnp/files/patch-libgupnp-gupnp-device.h (contents, props changed) head/net/gupnp/files/patch-libgupnp-gupnp-service.h (contents, props changed) head/net/gupnp/files/patch-libgupnp-gupnp-services.c - copied unchanged from r353037, head/net/gupnp/files/patch-libgupnp_gupnp-services.c Deleted: head/net/gupnp/files/patch-libgupnp_gupnp-control-point.c head/net/gupnp/files/patch-libgupnp_gupnp-services.c Modified: head/net/gupnp/Makefile head/net/gupnp/distinfo head/net/gupnp/pkg-plist Modified: head/net/gupnp/Makefile ============================================================================== --- head/net/gupnp/Makefile Mon May 19 18:38:21 2014 (r354572) +++ head/net/gupnp/Makefile Mon May 19 18:38:30 2014 (r354573) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gupnp -PORTVERSION= 0.20.10 +PORTVERSION= 0.20.11 CATEGORIES= net MASTER_SITES= GNOME @@ -22,10 +22,17 @@ GNU_CONFIGURE= yes MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes +USE_CSTD= c11 USE_PYTHON_RUN= yes -USES= gmake pathfix pkgconfig shebangfix tar:xz +USES= compiler:c11 gmake libtool pathfix pkgconfig shebangfix tar:xz SHEBANG_FILES= tools/gupnp-binding-tool python_CMD= ${PYTHON_CMD} -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == "clang" +CPPFLAGS+= -Wno-return-type +.endif + +.include Modified: head/net/gupnp/distinfo ============================================================================== --- head/net/gupnp/distinfo Mon May 19 18:38:21 2014 (r354572) +++ head/net/gupnp/distinfo Mon May 19 18:38:30 2014 (r354573) @@ -1,2 +1,2 @@ -SHA256 (gupnp-0.20.10.tar.xz) = 5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4 -SIZE (gupnp-0.20.10.tar.xz) = 382264 +SHA256 (gupnp-0.20.11.tar.xz) = 648ad091c7bae1c2b45ae9b9c0052f8c72903ce740d6e5be945c493dec85c160 +SIZE (gupnp-0.20.11.tar.xz) = 392148 Added: head/net/gupnp/files/patch-libgupnp-gupnp-acl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp/files/patch-libgupnp-gupnp-acl.h Mon May 19 18:38:30 2014 (r354573) @@ -0,0 +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 @@ + typedef struct _GUPnPAclInterface GUPnPAclInterface; + + /* Forward declarations to avoid recursive includes */ ++#if !defined(GUPnPDevice) + typedef struct _GUPnPDevice GUPnPDevice; ++#endif ++#if !defined(GUPnPService) + typedef struct _GUPnPService GUPnPService; ++#endif + + struct _GUPnPAclInterface { + GTypeInterface parent; Copied: head/net/gupnp/files/patch-libgupnp-gupnp-control-point.c (from r354424, head/net/gupnp/files/patch-libgupnp_gupnp-control-point.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp/files/patch-libgupnp-gupnp-control-point.c Mon May 19 18:38:30 2014 (r354573, copy of r354424, head/net/gupnp/files/patch-libgupnp_gupnp-control-point.c) @@ -0,0 +1,11 @@ +--- libgupnp/gupnp-control-point.c.orig 2012-11-29 07:13:43.000000000 +0800 ++++ libgupnp/gupnp-control-point.c 2013-03-15 16:00:16.921426942 +0800 +@@ -692,7 +692,7 @@ + /* Count elements */ + count = g_strv_length (bits); + +- if (count == 1) { ++ if (count == 1 || (count == 2 && strlen(bits[1]) == 0)) { + /* uuid:device-UUID */ + + *udn = bits[0]; Added: head/net/gupnp/files/patch-libgupnp-gupnp-device.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp/files/patch-libgupnp-gupnp-device.h Mon May 19 18:38:30 2014 (r354573) @@ -0,0 +1,12 @@ +--- 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 @@ + GUPnPDeviceClass)) + + typedef struct _GUPnPDevicePrivate GUPnPDevicePrivate; ++#if !defined(GUPnPDevice) + typedef struct _GUPnPDevice GUPnPDevice; ++#endif + typedef struct _GUPnPDeviceClass GUPnPDeviceClass; + + /** Added: head/net/gupnp/files/patch-libgupnp-gupnp-service.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp/files/patch-libgupnp-gupnp-service.h Mon May 19 18:38:30 2014 (r354573) @@ -0,0 +1,12 @@ +--- 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 @@ + #define GUPNP_TYPE_SERVICE_ACTION (gupnp_service_action_get_type ()) + + typedef struct _GUPnPServicePrivate GUPnPServicePrivate; ++#if !defined(GUPnPService) + typedef struct _GUPnPService GUPnPService; ++#endif + typedef struct _GUPnPServiceClass GUPnPServiceClass; + + /** Copied: head/net/gupnp/files/patch-libgupnp-gupnp-services.c (from r353037, head/net/gupnp/files/patch-libgupnp_gupnp-services.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp/files/patch-libgupnp-gupnp-services.c Mon May 19 18:38:30 2014 (r354573, copy of r353037, head/net/gupnp/files/patch-libgupnp_gupnp-services.c) @@ -0,0 +1,39 @@ +--- 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 + #include + #include ++#include + #include + #include "gupnp-service.h" + #include "gupnp-root-device.h" +@@ -43,6 +44,8 @@ + + #ifdef G_OS_WIN32 + #include ++#elsif defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #else + #include + #endif +@@ -1100,9 +1103,19 @@ + #else + uuid_t id; + char out[39]; ++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) ++ char *myout; ++#endif + ++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) ++ uuid_create(&id, 0); ++ uuid_to_string(&id, &myout, 0); ++ strncpy(out, myout, sizeof(out)); ++ free(myout); ++#else + uuid_generate (id); + uuid_unparse (id, out); ++#endif + + return g_strdup_printf ("uuid:%s", out); + #endif Modified: head/net/gupnp/pkg-plist ============================================================================== --- head/net/gupnp/pkg-plist Mon May 19 18:38:21 2014 (r354572) +++ head/net/gupnp/pkg-plist Mon May 19 18:38:30 2014 (r354573) @@ -1,4 +1,5 @@ bin/gupnp-binding-tool +include/gupnp-1.0/libgupnp/gupnp-acl.h include/gupnp-1.0/libgupnp/gupnp-context-manager.h include/gupnp-1.0/libgupnp/gupnp-context.h include/gupnp-1.0/libgupnp/gupnp-control-point.h @@ -18,9 +19,9 @@ include/gupnp-1.0/libgupnp/gupnp-xml-doc include/gupnp-1.0/libgupnp/gupnp.h lib/girepository-1.0/GUPnP-1.0.typelib lib/libgupnp-1.0.a -lib/libgupnp-1.0.la lib/libgupnp-1.0.so lib/libgupnp-1.0.so.4 +lib/libgupnp-1.0.so.4.0.0 libdata/pkgconfig/gupnp-1.0.pc share/gir-1.0/GUPnP-1.0.gir share/gtk-doc/html/gupnp/GUPnPContext.html @@ -54,8 +55,10 @@ share/gtk-doc/html/gupnp/home.png share/gtk-doc/html/gupnp/index.html share/gtk-doc/html/gupnp/index.sgml share/gtk-doc/html/gupnp/ix01.html +share/gtk-doc/html/gupnp/left-insensitive.png share/gtk-doc/html/gupnp/left.png share/gtk-doc/html/gupnp/overview.html +share/gtk-doc/html/gupnp/right-insensitive.png share/gtk-doc/html/gupnp/right.png share/gtk-doc/html/gupnp/schemas-device.html share/gtk-doc/html/gupnp/schemas-service.html @@ -63,6 +66,7 @@ share/gtk-doc/html/gupnp/schemas.html share/gtk-doc/html/gupnp/server-tutorial.html share/gtk-doc/html/gupnp/style.css share/gtk-doc/html/gupnp/tutorial.html +share/gtk-doc/html/gupnp/up-insensitive.png share/gtk-doc/html/gupnp/up.png @dirrmtry share/gtk-doc/html/gupnp @dirrmtry share/gtk-doc/html