Accepting request 1003193 from GNOME:Factory
GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already) (forwarded request 1002667 from dimstar) OBS-URL: https://build.opensuse.org/request/show/1003193 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gupnp-igd?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7bd5f20dc9
113
79a1e4cf8c256132978a1d8ab718c8ad132386de.patch
Normal file
113
79a1e4cf8c256132978a1d8ab718c8ad132386de.patch
Normal file
@ -0,0 +1,113 @@
|
||||
From 79a1e4cf8c256132978a1d8ab718c8ad132386de Mon Sep 17 00:00:00 2001
|
||||
From: Jens Georg <mail@jensge.org>
|
||||
Date: Tue, 3 May 2022 22:39:16 +0200
|
||||
Subject: [PATCH] Port to GUPnP 1.6 API
|
||||
|
||||
And thus to libsoup3. The code changes are even compatible with GUPnP
|
||||
1.4.3 so the gupnp version could be a configure option
|
||||
---
|
||||
NEWS | 2 +-
|
||||
README | 4 ++--
|
||||
libgupnp-igd/meson.build | 2 +-
|
||||
meson.build | 6 +++---
|
||||
subprojects/.gitignore | 4 ++--
|
||||
subprojects/{gupnp-1.2.wrap => gupnp-1.6.wrap} | 2 +-
|
||||
tests/gtest/gupnp-simple-igd.c | 6 +++---
|
||||
7 files changed, 13 insertions(+), 13 deletions(-)
|
||||
rename subprojects/{gupnp-1.2.wrap => gupnp-1.6.wrap} (76%)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 5979f6d..eabb318 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,5 +1,5 @@
|
||||
*******************
|
||||
-* GUPnP IGD 1.20 *
|
||||
+* GUPnP IGD 1.2.0 *
|
||||
*******************
|
||||
|
||||
- Switch to GUPnP 1.2.0 API
|
||||
diff --git a/README b/README
|
||||
index 4b74b6f..09884d2 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -1,9 +1,9 @@
|
||||
This is a library to handle UPnP IGD port mapping.
|
||||
|
||||
-It was written by Olivier Crête <olivier.crete@collabora.co.uk>.
|
||||
+It was written by Olivier Crête <olivier.crete@collabora.com>.
|
||||
|
||||
It is supposed to have a very simple API. Read the gtk-doc.
|
||||
|
||||
The only dependencies are:
|
||||
- - GUPnP 1.2
|
||||
+ - GUPnP 1.6
|
||||
- GLib 2.38
|
||||
diff --git a/libgupnp-igd/meson.build b/libgupnp-igd/meson.build
|
||||
index c37ef3d..6dcd394 100644
|
||||
--- a/libgupnp-igd/meson.build
|
||||
+++ b/libgupnp-igd/meson.build
|
||||
@@ -38,7 +38,7 @@ pkg.generate(
|
||||
subdirs : 'gupnp-igd-1.0',
|
||||
filebase : 'gupnp-igd-1.0',
|
||||
description: 'GUPnP Simple IGD library',
|
||||
- requires_private : 'gupnp-1.2'
|
||||
+ requires_private : 'gupnp-1.6'
|
||||
)
|
||||
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index df2fb24..8377d01 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1,4 +1,4 @@
|
||||
-project('gupnp-igd', 'c', version: '1.2.0')
|
||||
+project('gupnp-igd', 'c', version: '1.5.0')
|
||||
|
||||
gnome = import('gnome')
|
||||
pkg = import('pkgconfig')
|
||||
@@ -7,8 +7,8 @@ glib_req = '>= 2.38'
|
||||
dependencies = [
|
||||
dependency('glib-2.0', version: glib_req, required: true),
|
||||
dependency('gobject-2.0', version: glib_req, required: true),
|
||||
- dependency('gupnp-1.2', version : '>= 1.2.0'),
|
||||
- dependency('gssdp-1.2', version : '>= 1.2.0'),
|
||||
+ dependency('gupnp-1.6', version : '>= 1.5.0'),
|
||||
+ dependency('gssdp-1.6', version : '>= 1.5.0'),
|
||||
dependency('gthread-2.0', required: true)
|
||||
]
|
||||
|
||||
diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
|
||||
index 593c46e..ec770ca 100644
|
||||
--- a/tests/gtest/gupnp-simple-igd.c
|
||||
+++ b/tests/gtest/gupnp-simple-igd.c
|
||||
@@ -88,7 +88,7 @@ get_external_ip_address_cb (GUPnPService *service,
|
||||
else
|
||||
g_assert_not_reached ();
|
||||
|
||||
- gupnp_service_action_return (action);
|
||||
+ gupnp_service_action_return_success (action);
|
||||
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@ add_port_mapping_cb (GUPnPService *service,
|
||||
if (return_conflict && external_port == INTERNAL_PORT)
|
||||
gupnp_service_action_return_error (action, 718, "ConflictInMappingEntry");
|
||||
else
|
||||
- gupnp_service_action_return (action);
|
||||
+ gupnp_service_action_return_success (action);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@@ -172,7 +172,7 @@ delete_port_mapping_cb (GUPnPService *service,
|
||||
g_assert (external_port != INTERNAL_PORT);
|
||||
g_assert (proto && !strcmp (proto, "UDP"));
|
||||
|
||||
- gupnp_service_action_return (action);
|
||||
+ gupnp_service_action_return_success (action);
|
||||
|
||||
g_free (remote_host);
|
||||
g_free (proto);
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 27 21:54:20 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Add 79a1e4cf8c256132978a1d8ab718c8ad132386de.patch: Port to GUPnP
|
||||
1.6 API. Following this, replace pkgconfig(gssdp-1.2) and
|
||||
pkgconfig(gupnp-1.2) with pkgconfig(gssdp-1.6) and
|
||||
pkgconfig(gupnp-1.6) BuildRequires.
|
||||
- Use ldconfig_scriptlets macro for post(un) handling.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 16 18:41:16 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gupnp-igd
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,6 +25,8 @@ Group: Development/Libraries/C and C++
|
||||
URL: https://wiki.gnome.org/Projects/GUPnP
|
||||
Source: http://download.gnome.org/sources/gupnp-igd/1.2/%{name}-%{version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM 79a1e4cf8c256132978a1d8ab718c8ad132386de.patch -- Port to GUPnP 1.6 API
|
||||
Patch0: 79a1e4cf8c256132978a1d8ab718c8ad132386de.patch
|
||||
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: meson
|
||||
@ -32,10 +34,10 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.26
|
||||
BuildRequires: pkgconfig(gobject-2.0) >= 2.26
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gssdp-1.2)
|
||||
BuildRequires: pkgconfig(gssdp-1.6)
|
||||
BuildRequires: pkgconfig(gthread-2.0)
|
||||
BuildRequires: pkgconfig(gtk-doc)
|
||||
BuildRequires: pkgconfig(gupnp-1.2)
|
||||
BuildRequires: pkgconfig(gupnp-1.6)
|
||||
|
||||
%description
|
||||
GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
|
||||
@ -86,8 +88,7 @@ to have a very simple API.
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%post -n libgupnp-igd-1_0-4 -p /sbin/ldconfig
|
||||
%postun -n libgupnp-igd-1_0-4 -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets -n libgupnp-igd-1_0-4
|
||||
|
||||
%files -n libgupnp-igd-1_0-4
|
||||
%license COPYING
|
||||
|
||||
Loading…
Reference in New Issue
Block a user