From b4759a2d3d47a94f2ed4fe317276a6e3ab3a22a7 Mon Sep 17 00:00:00 2001 From: wangkerong Date: Mon, 20 Jun 2022 16:34:20 +0800 Subject: [PATCH] fix build fail on meson-0.6 --- ...fix-build-faile-on-meson-0.6-version.patch | 32 +++++++++++++++++++ network-manager-applet.spec | 9 ++++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 backport-fix-build-faile-on-meson-0.6-version.patch diff --git a/backport-fix-build-faile-on-meson-0.6-version.patch b/backport-fix-build-faile-on-meson-0.6-version.patch new file mode 100644 index 0000000..6645c10 --- /dev/null +++ b/backport-fix-build-faile-on-meson-0.6-version.patch @@ -0,0 +1,32 @@ +From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 21 Jan 2022 22:34:09 +0100 +Subject: [PATCH] meson.build: address meson 0.61 failures + +https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107 +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 33adb632..6178c0eb 100644 +--- a/meson.build ++++ b/meson.build +@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) + + foreach desktop: desktop_files + i18n.merge_file( +- desktop + '-desktop', + input: desktop + '.desktop.in', + output: desktop + '.desktop', + install: true, +@@ -275,7 +274,6 @@ endforeach + appdata = 'nm-connection-editor.appdata.xml' + + i18n.merge_file( +- 'desktop', + input: appdata + '.in', + output: appdata, + install: true, +-- +GitLab diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 13315ff..f820b72 100755 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -11,12 +11,14 @@ Name: network-manager-applet Summary: A network control and status applet for NetworkManager Version: 1.24.0 -Release: 2 +Release: 3 License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Obsoletes: NetworkManager-gnome < %{obsoletes_ver} Source: https://download.gnome.org/sources/network-manager-applet/1.24/%{name}-%{version}.tar.xz +Patch6000: backport-fix-build-faile-on-meson-0.6-version.patch + Requires: NetworkManager >= %{nm_version} libnotify >= 0.4.3 nm-connection-editor libnma BuildRequires: NetworkManager-libnm-devel >= %{nm_version} libnma-devel ModemManager-glib-devel >= 1.0 glib2-devel >= 2.32 gtk3-devel >= 3.10 @@ -52,9 +54,7 @@ environment. %build %meson \ - -Dgcr=true \ -Dselinux=true \ - -Ddisable-static=true \ -Dappindicator=yes %meson_build %install @@ -107,6 +107,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_datadir}/metainfo/nm-connection-editor.appdata.xml %changelog +* Mon Jun 20 2022 wangkerong - 1.24.0-3 +- delete unnecessary meson options and fix build faile on meson-0.6 + * Mon Feb 28 2022 xingxing - 1.24.0-2 - fix duplicate packaging -- Gitee