Accepting request 1203316 from GNOME:Factory

(forwarded request 1202736 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/1203316
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gupnp?expand=0&rev=84

00514fb6.patch

@@ -1,82 +0,0 @@
-From 00514fb62ebd341803fa44e26a6482a8c25dbd34 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 25 Nov 2023 17:56:02 +0100
-Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x
-
----
- libgupnp/gupnp-control-point.c        | 2 ++
- libgupnp/gupnp-service-proxy-action.c | 2 ++
- libgupnp/gupnp-service-proxy.c        | 2 ++
- libgupnp/gupnp-xml-doc.c              | 3 +++
- libgupnp/xml-util.h                   | 2 ++
- 5 files changed, 11 insertions(+)
-
-diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c
-index d4b44721..4374f726 100644
---- a/libgupnp/gupnp-control-point.c
-+++ b/libgupnp/gupnp-control-point.c
-@@ -27,6 +27,8 @@
- #include <config.h>
- #include <string.h>
- 
-+#include <libxml/parser.h>
-+
- #include "gupnp-control-point.h"
- #include "gupnp-context-private.h"
- #include "gupnp-resource-factory-private.h"
-diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c
-index b241d86c..6ea241ad 100644
---- a/libgupnp/gupnp-service-proxy-action.c
-+++ b/libgupnp/gupnp-service-proxy-action.c
-@@ -9,6 +9,8 @@
- 
- #include <config.h>
- 
-+#include <libxml/parser.h>
-+
- #include "gupnp-error.h"
- #include "gupnp-service-proxy.h"
- #include "gvalue-util.h"
-diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c
-index adba5ab0..3f1a4454 100644
---- a/libgupnp/gupnp-service-proxy.c
-+++ b/libgupnp/gupnp-service-proxy.c
-@@ -16,6 +16,8 @@
- #include <locale.h>
- #include <errno.h>
- 
-+#include <libxml/globals.h>
-+
- #include "gena-protocol.h"
- #include "gupnp-context-private.h"
- #include "gupnp-error-private.h"
-diff --git a/libgupnp/gupnp-xml-doc.c b/libgupnp/gupnp-xml-doc.c
-index 627f1a28..66f9b3dd 100644
---- a/libgupnp/gupnp-xml-doc.c
-+++ b/libgupnp/gupnp-xml-doc.c
-@@ -15,6 +15,9 @@
- #include <config.h>
- #include <string.h>
- #include <gio/gio.h>
-+
-+#include <libxml/parser.h>
-+
- #include "gupnp-xml-doc.h"
- #include "gupnp-error.h"
- 
-diff --git a/libgupnp/xml-util.h b/libgupnp/xml-util.h
-index a02eb3d4..d0dcaeba 100644
---- a/libgupnp/xml-util.h
-+++ b/libgupnp/xml-util.h
-@@ -10,6 +10,8 @@
- #define GUPNP_XML_UTIL_H
- 
- #include <libxml/tree.h>
-+#include <libxml/parser.h>
-+
- #include <stdarg.h>
- #include <glib-object.h>
- 
--- 
-GitLab
-

gupnp-1.6.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f
-size 245860

gupnp-1.6.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a61d8a5a8a7270e60ce9cfe9661cc4fa326f045a65718d2eb8ff68afdbef805
+size 205372

gupnp.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 23 18:49:59 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.6.7:
+  + Fix compatiblity with libxml2 2.12.x
+  + Improve reproducability
+  + ControlPoint: Fix re-scan
+  + ContextManager: Fix boot-id update
+  + Context: Fix crash if served URI is not an IP address
+- Drop 00514fb6.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Thu Apr 11 06:55:52 UTC 2024 - pgajdos@suse.com
 

gupnp.spec

@@ -21,7 +21,7 @@
 %define sover 1.6
 
 Name:           gupnp
-Version:        1.6.6
+Version:        1.6.7
 Release:        0
 Summary:        Implementation of the UPnP specification
 License:        LGPL-2.1-or-later
@@ -29,8 +29,6 @@ Group:          Development/Libraries/C and C++
 URL:            http://www.gupnp.org/
 Source0:        https://download.gnome.org/sources/gupnp/1.6/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM 00514fb6.patch -- Fix compatibility with libxml2 2.12.x
-Patch0:         https://gitlab.gnome.org/GNOME/gupnp/-/commit/00514fb6.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  meson >= 0.54.0