!14 Fix python script shebang

From: @xing_xing1992 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2023-01-20 09:58:16 +00:00 committed by Gitee
commit f07b2f1a37
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 59 additions and 1 deletions

View File

@ -3,12 +3,13 @@
Name: gupnp
Version: 1.4.3
Release: 1
Release: 2
Summary: UPnP devices & control points creation framework
License: LGPLv2+
URL: https://www.gupnp.org/
Source0: https://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz
Patch0: gupnp-1.4.2-revert-man-page.patch
Patch1: linux-cm-Fix-IFA_FLAGS-detection.patch
BuildRequires: gssdp-devel >= %{gssdp_version} gtk-doc gobject-introspection-devel docbook-style-xsl
BuildRequires: libsoup-devel libxml2-devel libuuid-devel vala meson
@ -79,6 +80,9 @@ This package contains help file and developer documentation for gupnp.
%{_mandir}/man1/gupnp-binding-tool-*
%changelog
* Thu Jan 18 2023 xingxing <xingxing@xfusion.com> - 1.4.3-2
- Fix python script shebang
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.4.3-1
- Update to 1.4.3

View File

@ -0,0 +1,54 @@
From adefe6a3394844f787424d65e5d8aa07d1167c9f Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Tue, 25 Oct 2022 23:47:01 +0200
Subject: [PATCH] linux-cm: Fix IFA_FLAGS detection
---
libgupnp/gupnp-linux-context-manager.c | 6 ++++--
meson.build | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/libgupnp/gupnp-linux-context-manager.c b/libgupnp/gupnp-linux-context-manager.c
index 04a464a..fcc0c5a 100644
--- a/libgupnp/gupnp-linux-context-manager.c
+++ b/libgupnp/gupnp-linux-context-manager.c
@@ -126,8 +126,10 @@ dump_rta_attr (sa_family_t family, struct rtattr *rt_attr)
case IFA_BROADCAST: label = "IFA_BROADCAST"; break;
case IFA_ANYCAST: label = "IFA_ANYCAST"; break;
case IFA_CACHEINFO: label = "IFA_CACHEINFO"; break;
- case IFA_MULTICAST: label = "IFA_MULTICAST"; break;
-#if defined(IFA_FLAGS)
+ case IFA_MULTICAST:
+ label = "IFA_MULTICAST";
+ break;
+#if defined(HAVE_IFA_FLAGS)
case IFA_FLAGS: label = "IFA_FLAGS"; break;
#endif
default: label = "Unknown"; break;
diff --git a/meson.build b/meson.build
index 024ef81..a5837a6 100644
--- a/meson.build
+++ b/meson.build
@@ -10,11 +10,19 @@ bindir = join_paths(prefix, get_option('bindir'))
netlink_available = cc.has_header('linux/rtnetlink.h')
ifaddrs_available = cc.has_header('ifaddrs.h')
+ifa_flags_exists = cc.compiles('''#include <linux/if_addr.h>
+int main(int argc, char *argv[])
+{
+ if (IFA_FLAGS) {};
+ return 0;
+}''', name: 'IFA_FLAGS is defined')
+
conf = configuration_data()
conf.set_quoted('VERSION', meson.project_version())
conf.set('HAVE_NETLINK', netlink_available)
conf.set('HAVE_IFADDRS_H', ifaddrs_available)
conf.set('HAVE_LINUX_WIRELESS_H', cc.has_header('linux/wireless.h'))
+conf.set('HAVE_IFA_FLAGS', ifa_flags_exists)
glib_version = '2.66'
add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c')
--
2.39.0.windows.2