Hello community, here is the log from the commit of package dleyna-core for openSUSE:Factory checked in at 2019-06-24 21:49:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dleyna-core (Old) and /work/SRC/openSUSE:Factory/.dleyna-core.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dleyna-core" Mon Jun 24 21:49:48 2019 rev:7 rq:709908 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dleyna-core/dleyna-core.changes 2018-02-16 21:46:00.236206133 +0100 +++ /work/SRC/openSUSE:Factory/.dleyna-core.new.4615/dleyna-core.changes 2019-06-24 21:49:49.391941205 +0200 @@ -1,0 +2,7 @@ +Thu Jun 13 20:35:35 UTC 2019 - Bjørn Lie <[email protected]> + +- Add dleyna-core-port-to-gupnp1_2.patch: Port to gupnp-1.2. + Following the above patch, replace pkgconfig(gupnp-1.0) with + pkgconfig(gupnp-1.2) BuildRequires. + +------------------------------------------------------------------- New: ---- dleyna-core-port-to-gupnp1_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dleyna-core.spec ++++++ --- /var/tmp/diff_new_pack.q2kwCC/_old 2019-06-24 21:49:49.903941603 +0200 +++ /var/tmp/diff_new_pack.q2kwCC/_new 2019-06-24 21:49:49.903941603 +0200 @@ -1,7 +1,7 @@ # # spec file for package dleyna-core # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,17 +22,19 @@ Version: 0.6.0 Release: 0 Summary: Utility functions used by higher level dLeyna libraries -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/Libraries Url: http://01.org/dleyna Source: https://01.org/sites/default/files/downloads/dleyna/%{name}-%{version}.tar_3.gz +# PATCH-FIX-UPSTREAM dleyna-core-port-to-gupnp1_2.patch -- Port to gupnp-1.2 +Patch0: dleyna-core-port-to-gupnp1_2.patch BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) >= 2.28 BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gmodule-2.0) >= 2.28 -BuildRequires: pkgconfig(gupnp-1.0) >= 0.20.5 +BuildRequires: pkgconfig(gupnp-1.2) >= 1.2.0 %description dleyna-core is a library of utility functions that are used by the higher level dLeyna libraries that @@ -62,7 +64,7 @@ In brief, it provides APIs for logging, error, settings and task management and an IPC abstraction API. %prep -%setup -q +%autosetup -p1 %build autoreconf -fi ++++++ dleyna-core-port-to-gupnp1_2.patch ++++++ >From 41b2e56f67b6fc9c8c256b86957d281644b9b846 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <[email protected]> Date: Sat, 16 Mar 2019 05:39:38 +0100 Subject: [PATCH] Port to gupnp-1.2 The latest version of gupnp breaks backwards compatibility. Fortunately, there are not many calls to gupnp functions in core, so we just needed to bump the dependencies. There is one deprecated gupnp_service_proxy_cancel_action call but I am not sure how to change it without breaking Dleyna API. Let's leave it for now. --- configure.ac | 2 +- dleyna-core-1.0.pc.in | 2 +- libdleyna/core/main-loop.c | 4 ---- libdleyna/core/service-task.c | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 9a96c84..9f769e2 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ PKG_PROG_PKG_CONFIG(0.16) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.28]) -PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5]) +PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0]) # Checks for header files. AC_CHECK_HEADERS([stdlib.h string.h syslog.h]) diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in index 966a8e1..52b718e 100644 --- a/dleyna-core-1.0.pc.in +++ b/dleyna-core-1.0.pc.in @@ -8,5 +8,5 @@ Name: @PACKAGE@ Description: UPnP & DLNA core library Libs: -L${libdir} -ldleyna-core-1.0 Cflags: -I${includedir}/dleyna-1.0 -Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0 +Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2 Version: @VERSION@ diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c index 3642a5b..9716b06 100644 --- a/libdleyna/core/main-loop.c +++ b/libdleyna/core/main-loop.c @@ -128,10 +128,6 @@ int dleyna_main_loop_start(const char *server, { int retval = 1; -#if !GLIB_CHECK_VERSION(2, 35, 0) - g_type_init(); -#endif - dleyna_log_init(server, control_point->get_version()); if (!prv_context_init(server, control_point)) diff --git a/libdleyna/core/service-task.c b/libdleyna/core/service-task.c index e0ca2df..fb113c3 100644 --- a/libdleyna/core/service-task.c +++ b/libdleyna/core/service-task.c @@ -103,6 +103,7 @@ void dleyna_service_task_cancel_cb(dleyna_task_atom_t *atom, gpointer user_data) if (task->p_action) { if (task->proxy) + // TODO: switch to GCancellable gupnp_service_proxy_cancel_action(task->proxy, task->p_action); task->p_action = NULL;
