diff options
author | Matt Turner <mattst88@gentoo.org> | 2021-05-30 16:51:56 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2021-05-30 18:58:16 -0700 |
commit | e08b73e850aa8ac2c486d3f848eca3c54dc24516 (patch) | |
tree | ff5dba339faf00b09641a1267dcecc7b5145f986 /net-libs/dleyna-core/files | |
parent | net-libs/dleyna-connector-dbus: Drop old versions (diff) | |
download | gentoo-e08b73e850aa8ac2c486d3f848eca3c54dc24516.tar.gz gentoo-e08b73e850aa8ac2c486d3f848eca3c54dc24516.tar.bz2 gentoo-e08b73e850aa8ac2c486d3f848eca3c54dc24516.zip |
net-libs/dleyna-core: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'net-libs/dleyna-core/files')
-rw-r--r-- | net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch deleted file mode 100644 index 71eef9f37b37..000000000000 --- a/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 41b2e56f67b6fc9c8c256b86957d281644b9b846 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -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; --- -2.20.1 - |