!16 Update to 1.8.38 and add libnma.yaml

From: @zhang__3125 
Reviewed-by: @licihua 
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2022-06-17 09:42:15 +00:00 committed by Gitee
commit fdbfbe299a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 13 additions and 2815 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,56 +0,0 @@
From 40b591aaa0fcbc2bf37f89909477d59a102a5fa4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 18 Mar 2022 15:56:12 -0700
Subject: [PATCH] meson: build separate UI sources for GTK3 and GTK4 libraries
We can't just do one or the other, each build of the library
needs the correct respective UI resources.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
src/meson.build | 2 +-
src/ui/meson.build | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 6e1a15e4..efe3fb03 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -103,7 +103,7 @@ libnma_dep = declare_dependency(
if enable_libnma_gtk4
libnma_gtk4 = shared_library(
'nma-gtk4',
- sources: gir_sources + ui_sources,
+ sources: gir_sources + ui_sources4,
version: libversion,
include_directories: incs,
dependencies: [ deps, gtk4_dep ],
diff --git a/src/ui/meson.build b/src/ui/meson.build
index 2f8eec99..60dbaeef 100644
--- a/src/ui/meson.build
+++ b/src/ui/meson.build
@@ -1,11 +1,13 @@
-if enable_libnma_gtk4
- ui_dir = 'gtk4'
-else
- ui_dir = 'gtk3'
-endif
-
ui_sources = gnome.compile_resources(
'nma-resources',
- join_paths(ui_dir, 'nma.gresource.xml'),
- source_dir: ui_dir
+ join_paths('gtk3', 'nma.gresource.xml'),
+ source_dir: 'gtk3'
)
+
+if enable_libnma_gtk4
+ ui_sources4 = gnome.compile_resources(
+ 'nma-resources4',
+ join_paths('gtk4', 'nma.gresource.xml'),
+ source_dir: 'gtk4'
+ )
+endif
--
2.35.1

Binary file not shown.

BIN
libnma-1.8.38.tar.xz Normal file

Binary file not shown.

View File

@ -5,23 +5,15 @@
%global mbp_version 0.20090602
%global old_libnma_version 1.8.27
%global rpm_version 1.8.34
%global real_version 1.8.34
%global release_version 2
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
Name: libnma
Summary: NetworkManager GUI library
Version: %{rpm_version}
Release: %{release_version}
Version: 1.8.38
Release: 1
License: GPLv2+ and LGPLv2+
URL: https://gitlab.gnome.org/GNOME/libnma/
Source0: https://download.gnome.org/sources/libnma/%{real_version_major}/%{name}-%{real_version}.tar.xz
Source0: https://download.gnome.org/sources/libnma/1.8/%{name}-%{version}.tar.xz
Patch1: 0001-nm-applet-no-notifications.patch
Patch2: 0001-Ship-and-compile-both-GTK3-and-GTK4-UI-files.patch
Patch3: 0001-meson-build-separate-UI-sources-for-GTK3-and-GTK4-li.patch
Requires: mobile-broadband-provider-info >= %{mbp_version}
Conflicts: libnma < %{old_libnma_version}
@ -37,7 +29,6 @@ BuildRequires: gtk4-devel >= 4.0
This package contains the library used for integrating GUI tools with
NetworkManager.
%package devel
Summary: Header files for NetworkManager GUI library
Requires: NetworkManager-libnm-devel >= %{nm_version}
@ -55,7 +46,7 @@ This package contains header and pkg-config files to be used for integrating
GUI tools with NetworkManager.
%prep
%autosetup -p1 -n "%{name}-%{real_version}"
%autosetup -p1 -n "%{name}-%{version}"
%build
%meson \
@ -94,13 +85,16 @@ GUI tools with NetworkManager.
%{_datadir}/gtk-doc
%changelog
* Mon Jun 13 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.8.38-1
- Update to 1.8.38
* Fri Jun 17 liyanan <liyanan32@h-partners.com> - 1.8.34-2
- Drop disable-static from meson command line
* Wed Apr 20 2022 dillon chen <dillon.chen@gmail.com> - 1.8.34-1
- fix UI files in GTK4
- fix UI files in GTK4
- Enable gtk4 subpackage
- Update to 1.8.34
- Update to 1.8.34
* Thu Dec 30 2021 yanan <yanan@huawei.com> - 1.8.32-1
- upgrade to libnma-1.8.32

4
libnma.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: gitlab.gnome
src_repo: libnma
tag_prefix: ^
separator: .