Accepting request 1238100 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1238100 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gupnp-av?expand=0&rev=47
2025-01-16 17:31:18 +00:00 · 2025-01-16 17:31:18 +00:00 · 1597c7756d
commit 1597c7756d
parent fae0dd27fe 3de6b38032
9 changed files with 46 additions and 102 deletions
--- a/1e10a41f.patch
+++ b/1e10a41f.patch
@ -1,24 +0,0 @@
-From 1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 25 Nov 2023 17:58:49 +0100
-Subject: [PATCH] xml: Fix compatibility with libxml2 2.12.x
-
---
- libgupnp-av/xml-util.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libgupnp-av/xml-util.h b/libgupnp-av/xml-util.h
-index e0e49f7..0bbe0f8 100644
--- a/libgupnp-av/xml-util.h
-+++ b/libgupnp-av/xml-util.h
-@@ -16,6 +16,7 @@
- 
- #include <glib.h>
- #include <libxml/tree.h>
-+#include <libxml/parser.h>
- #include <stdarg.h>
- #include <glib-object.h>
- 
-- 
-GitLab
-
--- a/767388bc.patch
+++ b/767388bc.patch
@ -1,29 +0,0 @@
-From 767388bc16e08d4e1e1f419555165cc1816be931 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 5 Jun 2022 14:33:23 +0200
-Subject: [PATCH] build: Fix Requires: line of pkg-config file
-
---
- meson.build | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 4c072c3..f4b629f 100644
--- a/meson.build
-+++ b/meson.build
-@@ -87,6 +87,12 @@ subdir('data')
- pkg = import('pkgconfig')
- pkg.generate(
-     gupnp_av_lib,
-+    requires : [
-+      'glib-2.0',
-+      'gobject-2.0',
-+      'gio-2.0',
-+      'libxml-2.0'
-+    ],
-     subdirs : 'gupnp-av-1.0',
-     description : 'GObject-based AV specific UPnP library'
- )
-- 
-GitLab
-
--- a/18
+++ b/18
@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://gitlab.gnome.org/GNOME/gupnp-av.git</param>
+    <param name="revision">gupnp-av-0.14.3</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">gupnp-av-?(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
+<!--    <param name="changesgenerate">enable</param> -->
+  </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">zst</param>
+  </service>
+  <service name="set_version" mode="manual" />
+</services>
--- a/gupnp-av-0.14.1.tar.xz
+++ b/gupnp-av-0.14.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f
-size 93484
--- a/gupnp-av-0.14.3.obscpio
+++ b/gupnp-av-0.14.3.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b860c6d5c46599eb3705119f0d00e8a8191bdaeafb77d45b21210a4c0f499465
+size 809996
--- a/gupnp-av-libxml2.11-support.patch
+++ b/gupnp-av-libxml2.11-support.patch
@ -1,34 +0,0 @@
-From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001
-From: David Anes <david.anes@suse.com>
-Date: Thu, 4 May 2023 11:54:02 +0200
-Subject: use xmlReadMemory instead of xmlRecoverMemory, as it's been
- deprecated in libxml2 2.11.0
-
-Since version 2.11.0, some private symbols have been removed.
---
-Index: gupnp-av-0.14.1/libgupnp-av/gupnp-didl-lite-parser.c
-===================================================================
--- gupnp-av-0.14.1.orig/libgupnp-av/gupnp-didl-lite-parser.c
-+++ gupnp-av-0.14.1/libgupnp-av/gupnp-didl-lite-parser.c
-@@ -230,7 +230,7 @@ gupnp_didl_lite_parser_parse_didl_recurs
-         GUPnPAVXMLDoc *xml_doc = NULL;
-         gboolean       result;
- 
-        doc = xmlRecoverMemory (didl, strlen (didl));
-+        doc = xmlReadMemory (didl, strlen (didl), NULL, NULL, XML_PARSE_RECOVER);
-         if (doc == NULL) {
-                 g_set_error (error,
-                              G_MARKUP_ERROR,
-Index: gupnp-av-0.14.1/libgupnp-av/gupnp-feature-list-parser.c
-===================================================================
--- gupnp-av-0.14.1.orig/libgupnp-av/gupnp-feature-list-parser.c
-+++ gupnp-av-0.14.1/libgupnp-av/gupnp-feature-list-parser.c
-@@ -114,7 +114,7 @@ gupnp_feature_list_parser_parse_text
-         xmlNode      *element;
-         GList        *feature_list = NULL;
- 
-        doc = xmlRecoverMemory (text, strlen (text));
-+        doc = xmlReadMemory (text, strlen (text), NULL, NULL, XML_PARSE_RECOVER);
-         if (doc == NULL) {
-                 g_set_error (error,
-                              G_MARKUP_ERROR,
--- a/gupnp-av.changes
+++ b/gupnp-av.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan 14 14:18:56 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.14.3:
+  + xml: Fix compatibility with libxml2 2.12.x
+  + Add missing array annotation
+  + build: Fix Requires: line of pkg-config file
+  + Loosen restriction on dc:date verification
+- Drop patches fixed upstream:
+  + 1e10a41f.patch
+  + 767388bc.patch
+  + gupnp-av-libxml2.11-support.patch
+- Switch to source service for tarball/sources.
+
 -------------------------------------------------------------------
 Thu Dec 14 12:53:31 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/gupnp-av.obsinfo
+++ b/gupnp-av.obsinfo
@ -0,0 +1,4 @@
+name: gupnp-av
+version: 0.14.3
+mtime: 1736863167
+commit: de581894b2e6d3557339d68bbf1b848b4bf0fd3a
--- a/gupnp-av.spec
+++ b/gupnp-av.spec
@ -1,7 +1,7 @@
 #
 # spec file for package gupnp-av
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,19 +17,13 @@


 Name:           gupnp-av
-Version:        0.14.1
+Version:        0.14.3
 Release:        0
 Summary:        Library to ease the handling and implementation of UPnP A/V profiles
 License:        LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 URL:            http://www.gupnp.org/
-Source:         https://download.gnome.org/sources/gupnp-av/0.14/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM gupnp-av-libxml2.11-support.patch david.anes@suse.com -- use xmlReadMemory instead of xmlRecoverMemory
-Patch0:         gupnp-av-libxml2.11-support.patch
-# PATCH-FIX-UPSTREAM 767388bc.patch -- build: Fix Requires: line of pkg-config file
-Patch1:         https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/767388bc.patch
-# PATCH-FIX-UPSTREAM 1e10a41f.patch -- Fix compatibility with libxml2 2.12.x
-Patch2:         https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/1e10a41f.patch
+Source:         %{name}-%{version}.tar.zst

 BuildRequires:  meson
 BuildRequires:  pkgconfig
@ -77,17 +71,18 @@ implementation of UPnP A/V profiles.
 %autosetup -p1

 %build
-%meson
+%meson \
+	%{nil}
 %meson_build

 %install
 %meson_install

+%ldconfig_scriptlets -n libgupnp-av-1_0-3
+
 %check
 %meson_test

-%ldconfig_scriptlets -n libgupnp-av-1_0-3
-
 %files
 %{_datadir}/gupnp-av/