From b8facd7bafab7fa9c639eb4112817be8a8ac3852 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 4 Apr 2019 23:55:10 -0300 Subject: [PATCH] gupnp-tools: update to 0.10.0. --- srcpkgs/gupnp-tools/patches/fix-ftbfs.patch | 29 +++++ .../port-to-new-gssdp-and-gupnp-api.patch | 123 ------------------ srcpkgs/gupnp-tools/template | 6 +- 3 files changed, 32 insertions(+), 126 deletions(-) create mode 100644 srcpkgs/gupnp-tools/patches/fix-ftbfs.patch delete mode 100644 srcpkgs/gupnp-tools/patches/port-to-new-gssdp-and-gupnp-api.patch diff --git a/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch b/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch new file mode 100644 index 0000000000..0a1b1bbc29 --- /dev/null +++ b/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch @@ -0,0 +1,29 @@ +From ecebb21e9d64081ca436aebcdb32ba0960ac8a60 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 4 Apr 2019 20:28:07 +0200 +Subject: [PATCH] build: Properly export common resources + +Fixes #3 +--- + src/common/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/common/meson.build b/src/common/meson.build +index 68b1ca5..75b82db 100644 +--- src/common/meson.build ++++ src/common/meson.build +@@ -1,7 +1,9 @@ + util_resource = gnome.compile_resources('common-resource', + join_paths(resource_data, 'org.gupnp.Tools.Common.gresource.xml'), ++ c_name : 'gupnp_tools_common', ++ export : true, + source_dir : resource_data, +- extra_args : ['--manual-register', '--c-name', 'gupnp_tools_common'] ++ extra_args : ['--manual-register'] + ) + + libutil = static_library('util', ['icons.c', 'icons.h', 'pretty-print.c', 'pretty-print.h'] + util_resource, +-- +2.18.1 + + diff --git a/srcpkgs/gupnp-tools/patches/port-to-new-gssdp-and-gupnp-api.patch b/srcpkgs/gupnp-tools/patches/port-to-new-gssdp-and-gupnp-api.patch deleted file mode 100644 index c42e3e7a6f..0000000000 --- a/srcpkgs/gupnp-tools/patches/port-to-new-gssdp-and-gupnp-api.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 41feb3168d3870e0d017c248f20cbe85bc5acde7 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 16 Oct 2016 21:54:15 +0200 -Subject: [PATCH] all: Port to new GUPnP API - -Signed-off-by: Jens Georg ---- - meson.build | 4 ++-- - src/discover/gssdp-discover.c | 2 +- - src/network-light/upnp.c | 18 ++++++++++++++---- - src/universal-cp/action-dialog.c | 4 ++-- - src/upload/main.c | 2 +- - 5 files changed, 20 insertions(+), 10 deletions(-) - -diff --git a/meson.build b/meson.build -index 5e6dd23..67c61f2 100644 ---- meson.build -+++ meson.build -@@ -7,8 +7,8 @@ if host_machine.system() == 'windows' - win = import('windows') - endif - --gssdp = dependency('gssdp-1.0', version: '>= 0.13.3') --gupnp = dependency('gupnp-1.0', version: '>= 0.20.14') -+gssdp = dependency('gssdp-1.2', version: '>= 1.1') -+gupnp = dependency('gupnp-1.2', version: '>= 1.1') - soup = dependency('libsoup-2.4', version: '>= 2.42') - gupnp_av = dependency('gupnp-av-1.0', version: '>= 0.5.5', required: false) - gtk = dependency('gtk+-3.0', version: '>= 3.10') -diff --git a/src/discover/gssdp-discover.c b/src/discover/gssdp-discover.c -index e2b4656..9eef525 100644 ---- src/discover/gssdp-discover.c -+++ src/discover/gssdp-discover.c -@@ -102,7 +102,7 @@ int main (int argc, char *argv[]) { - - g_option_context_free (context); - -- discover.client = gssdp_client_new (NULL, interface, &error); -+ discover.client = gssdp_client_new (interface, &error); - if (error != NULL) { - g_warning ("Failed to create GSSDP client: %s", error->message); - g_error_free (error); -diff --git a/src/network-light/upnp.c b/src/network-light/upnp.c -index b87e985..ddbd23a 100644 ---- src/network-light/upnp.c -+++ src/network-light/upnp.c -@@ -386,7 +386,8 @@ static void init_friendly_name (gchar *name) - { - xmlNode *fdn_node; - -- fdn_node = xml_util_get_element ((xmlNode *) doc->doc, -+ fdn_node = xml_util_get_element ((xmlNode *) -+ gupnp_xml_doc_get_doc (doc), - "root", - "device", - "friendlyName", -@@ -409,7 +410,8 @@ static void init_uuid (void) - - uuid = gupnp_get_uuid (); - -- uuid_node = xml_util_get_element ((xmlNode *) doc->doc, -+ uuid_node = xml_util_get_element ((xmlNode *) doc, -+ gupnp_xml_doc_get_doc (doc), - "root", - "device", - "UDN", -@@ -589,7 +591,15 @@ init_server (GUPnPContext *context) - gupnp_resource_factory_get_default (), - doc, - desc_location, -- DATA_DIR); -+ DATA_DIR, -+ &error); -+ if (error != NULL) { -+ g_warning ("Failed to create root device: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } - - switch_power = gupnp_device_info_get_service (GUPNP_DEVICE_INFO (dev), - SWITCH_SERVICE); -@@ -663,7 +673,7 @@ prepare_desc (gchar *name) - uuid); - g_assert (desc_location != NULL); - -- if (xmlSaveFile (desc_location, doc->doc) < 0) { -+ if (xmlSaveFile (desc_location, (xmlDoc *) gupnp_xml_doc_get_doc (doc)) < 0) { - g_print ("Error saving description file to %s.\n", - desc_location); - -diff --git a/src/universal-cp/action-dialog.c b/src/universal-cp/action-dialog.c -index 6380fec..64908d9 100644 ---- src/universal-cp/action-dialog.c -+++ src/universal-cp/action-dialog.c -@@ -679,8 +679,8 @@ on_action_complete (GUPnPServiceProxy *proxy, - - gupnp_service_proxy_end_action_hash (proxy, - action, -- &error, -- out_args); -+ out_args, -+ &error); - if (error) { - GtkWidget *error_dialog; - -diff --git a/src/upload/main.c b/src/upload/main.c -index c97e31a..0b60f5a 100644 ---- src/upload/main.c -+++ src/upload/main.c -@@ -176,7 +176,7 @@ main (gint argc, - } - - error = NULL; -- upnp_context = gupnp_context_new (NULL, interface, 0, &error); -+ upnp_context = gupnp_context_new (interface, 0, &error); - if (error) { - g_printerr ("Error creating the GUPnP context: %s\n", - error->message); --- -2.18.1 - diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template index 67729f5c32..867b818b3c 100644 --- a/srcpkgs/gupnp-tools/template +++ b/srcpkgs/gupnp-tools/template @@ -1,7 +1,7 @@ # Template file for 'gupnp-tools' pkgname=gupnp-tools -version=0.8.15 -revision=2 +version=0.10.0 +revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gobject-introspection" makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel @@ -11,5 +11,5 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://gupnp.org/" distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz" -checksum=336ef4a09b9fc83444a1594c8215e2bed55fbea5b6d1bf6b54c63104b4c497ab +checksum=41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d nocross="gobject-introspection from gtksourceview4"