Accepting request 1305528 from GNOME:Factory

Scripted push from GNOME:Next (forwarded request 1304936 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1305528
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnice?expand=0&rev=51

4b63250c.patch

@@ -1,37 +0,0 @@
-From 4b63250cc446e25b5150dd6040028624ee76f9d1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 22 May 2023 19:45:28 -0700
-Subject: [PATCH] agent/meson: Replace filename with basename
-
-This avoids emitting absolute paths into generated sourcecode, it
-improves reproducibility. See [1]
-
-[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html
----
- agent/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/agent/meson.build b/agent/meson.build
-index 2e5b272a..44fcd6bd 100644
---- a/agent/meson.build
-+++ b/agent/meson.build
-@@ -29,14 +29,14 @@ gnome = import('gnome')
- 
- agent_enum_types_c =  gnome.mkenums('agent-enum-types.c', sources : agent_headers,
- 				    fhead: '#include <config.h>\n#include <glib-object.h>\n#include "agent.h"\n#include "pseudotcp.h"\n#include "agent-enum-types.h"',
--				    fprod: '\n/* enumerations from "@filename@" */',
-+				    fprod: '\n/* enumerations from "@basename@" */',
- 				    vhead: 'GType\n@enum_name@_get_type (void)\n{\n  static GType type = 0;\n  if (!type) {\n    static const G@Type@Value values[] = {',
- 				    vprod: '      { @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
- 				    vtail: '      { 0, NULL, NULL }\n    };\n    type = g_@type@_register_static ("@EnumName@", values);\n  }\n  return type;\n}\n\n')
- 
- agent_enum_types_h = gnome.mkenums('agent-enum-types.h', sources : agent_headers,
- 				   fhead: '#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
--				   fprod: '/* enumerations from "@filename@" */\n',
-+				   fprod: '/* enumerations from "@basename@" */\n',
- 				   vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
- 					  ftail: 'G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */')
- 
--- 
-GitLab
-

_service

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://gitlab.freedesktop.org/libnice/libnice.git</param>
+    <param name="revision">ac4bb22ebbfce712729aec277259c5ea9254189a</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">v?(.*)\+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>
+

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.freedesktop.org/libnice/libnice.git</param>
+              <param name="changesrevision">ac4bb22ebbfce712729aec277259c5ea9254189a</param></service></servicedata>

libnice-0.1.22+7.obscpio

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

libnice-port-gupnp-igd-bump.patch

@@ -1,8 +1,8 @@
-Index: libnice-0.1.21/meson.build
+Index: libnice-0.1.22/meson.build
 ===================================================================
---- libnice-0.1.21.orig/meson.build
-+++ libnice-0.1.21/meson.build
-@@ -278,7 +278,7 @@ gst_dep = dependency('gstreamer-base-1.0
+--- libnice-0.1.22.orig/meson.build
++++ libnice-0.1.22/meson.build
+@@ -276,7 +276,7 @@ gst_dep = dependency('gstreamer-base-1.0
  cdata.set('HAVE_GSTREAMER', gst_dep.found(), description: 'Build GStreamer plugin')
  
  # GUPnP IGD

libnice.changes

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Thu Apr 10 08:00:15 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.1.22+7:
+  * agent: stop leaking StunResolverData
+  * test-new-trickle: Remove cancellable as a wakeup mechanism
+  * Fix TCP concurrent sending problem
+  * meson: Add glib debug, assert and check options
+  * COPYING / README: Add SPDX-License-Identifier for added clarity
+  * agent: Only accept remote candidates with non-zero priority
+  * tests: Reduce the printing a little to please libxml
+  * Change padding to be rfc8489 conform
+- Switch to git checkout via source service.
+- Drop patches fixed upstream:
+  * 37eeeb1a750bf2dd6d5769d759069e95dd1b8493.patch
+  * c47a7ea6289187857a38e0118bd8528cab9171c9.patch
+
+-------------------------------------------------------------------
+Mon Dec  9 14:55:31 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Increase test timeout on s390x. test-send-recv can be slow and
+  sometimes times out in our builds.
+
+-------------------------------------------------------------------
+Sat Nov 16 19:44:22 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add 37eeeb1a750bf2dd6d5769d759069e95dd1b8493.patch:
+  test-new-trickle: Remove cancellable as a wakeup mechanism.
+
+-------------------------------------------------------------------
+Mon Nov 11 19:49:29 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add c47a7ea6289187857a38e0118bd8528cab9171c9.patch meson: Add
+  glib debug, assert and check options.
+
+-------------------------------------------------------------------
+Fri Nov  8 13:02:01 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.1.22:
+  + API: Make nice_address_is_local() available to applications
+  + Make padding be all zeros to conform to RFC8489
+  + Fix interface listing on Android
+  + Include TURN sockets in the list from nice_agent_get_sockets()
+  + Set consent refresh timeout in line with RFC 7675
+  + Fix ifr_ifindex build with cland and OpenBSD
+- Drop 4b63250c.patch: Fixed upstream.
+- Rebase patch with quilt.
+
 -------------------------------------------------------------------
 Fri Jul  7 10:26:09 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 

libnice.obsinfo

@@ -0,0 +1,4 @@
+name: libnice
+version: 0.1.22+7
+mtime: 1735893010
+commit: ac4bb22ebbfce712729aec277259c5ea9254189a

libnice.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libnice
 #
-# 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,18 +17,16 @@
 
 
 Name:           libnice
-Version:        0.1.21
+Version:        0.1.22+7
 Release:        0
 Summary:        Interactive Connectivity Establishment implementation
 License:        LGPL-2.1-only OR MPL-1.1
 Group:          Development/Libraries/GNOME
 URL:            https://nice.freedesktop.org/
-Source:         https://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.zst
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM libnice-port-gupnp-igd-bump.patch -- Port to new gupnp-igd
 Patch1:         libnice-port-gupnp-igd-bump.patch
-# PATCH-FIX-UPSTREAM 4b63250c.patch -- agent/meson: Replace filename with basename
-Patch2:         https://gitlab.freedesktop.org/libnice/libnice/-/commit/4b63250c.patch
 
 BuildRequires:  meson
 BuildRequires:  pkgconfig
@@ -96,7 +94,11 @@ sed -e 's/^  '\''test-set-port-range'\''/#&/'  -i tests/meson.build
 %meson_install
 
 %check
+%ifarch s390x
+%meson_test -t 5
+%else
 %meson_test
+%endif
 
 %ldconfig_scriptlets -n libnice10