Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package NetworkManager-applet for
openSUSE:Factory checked in at 2022-02-04 21:49:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-applet (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-applet.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-applet"
Fri Feb 4 21:49:05 2022 rev:40 rq:951410 version:1.24.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-applet/NetworkManager-applet.changes
2021-11-06 18:17:45.500876088 +0100
+++
/work/SRC/openSUSE:Factory/.NetworkManager-applet.new.1898/NetworkManager-applet.changes
2022-02-04 21:52:15.643207650 +0100
@@ -1,0 +2,5 @@
+Tue Feb 1 12:37:30 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Add 107.patch: Fix build with meson 0.61.0 and newer.
+
+-------------------------------------------------------------------
New:
----
107.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-applet.spec ++++++
--- /var/tmp/diff_new_pack.LSPtFo/_old 2022-02-04 21:52:16.051204843 +0100
+++ /var/tmp/diff_new_pack.LSPtFo/_new 2022-02-04 21:52:16.055204817 +0100
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-applet
#
-# Copyright (c) 2021 SUSE LLC
+# 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
@@ -31,6 +31,8 @@
Patch0: nm-applet-private-connection.patch
# PATCH-FIX-UPSTREAM feature-app-indicator-desktop-file.patch [email protected]
-- nm-applet needs to be launched with --indicator and needs a startup delay
incase its started before the systray
Patch1: feature-app-indicator-desktop-file.patch
+# PATCH-FIX-UPSTREAM 107.patch -- Fix build with meson 0.61.0 and newer
+Patch2:
https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107.patch
BuildRequires: meson >= 0.43.0
BuildRequires: pkgconfig
@@ -88,6 +90,7 @@
# Needs rebase.
# %%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%meson \
++++++ 107.patch ++++++
>From b92fa5ba6d65aaa9e2d1494beaf340a33d9ba07f Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <[email protected]>
Date: Fri, 21 Jan 2022 22:34:09 +0100
Subject: [PATCH] meson.build: address meson 0.61 failures
Signed-off-by: Alexander Kanavin <[email protected]>
---
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
