| 1 |
commit: 41d5d8b41005c9df85761ab0dc1ea9498cd5ecdf |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 22 18:28:46 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 22 18:28:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d5d8b4 |
| 7 |
|
| 8 |
gnome-extra/nm-applet: fix build with meson-0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831829 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
gnome-extra/nm-applet/files/meson-0.61.patch | 36 ++++++++++++++++++++++++ |
| 14 |
gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild | 6 +++- |
| 15 |
gnome-extra/nm-applet/nm-applet-1.24.0.ebuild | 6 +++- |
| 16 |
3 files changed, 46 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gnome-extra/nm-applet/files/meson-0.61.patch b/gnome-extra/nm-applet/files/meson-0.61.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..e2366c0f64e1 |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-extra/nm-applet/files/meson-0.61.patch |
| 23 |
@@ -0,0 +1,36 @@ |
| 24 |
+https://bugs.gentoo.org/831829 |
| 25 |
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107 |
| 26 |
+ |
| 27 |
+From b92fa5ba6d65aaa9e2d1494beaf340a33d9ba07f Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Alexander Kanavin <alex@××××××××××.de> |
| 29 |
+Date: Fri, 21 Jan 2022 22:34:09 +0100 |
| 30 |
+Subject: [PATCH] meson.build: address meson 0.61 failures |
| 31 |
+ |
| 32 |
+Signed-off-by: Alexander Kanavin <alex@××××××××××.de> |
| 33 |
+--- |
| 34 |
+ meson.build | 2 -- |
| 35 |
+ 1 file changed, 2 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/meson.build b/meson.build |
| 38 |
+index 33adb632..6178c0eb 100644 |
| 39 |
+--- a/meson.build |
| 40 |
++++ b/meson.build |
| 41 |
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) |
| 42 |
+ |
| 43 |
+ foreach desktop: desktop_files |
| 44 |
+ i18n.merge_file( |
| 45 |
+- desktop + '-desktop', |
| 46 |
+ input: desktop + '.desktop.in', |
| 47 |
+ output: desktop + '.desktop', |
| 48 |
+ install: true, |
| 49 |
+@@ -275,7 +274,6 @@ endforeach |
| 50 |
+ appdata = 'nm-connection-editor.appdata.xml' |
| 51 |
+ |
| 52 |
+ i18n.merge_file( |
| 53 |
+- 'desktop', |
| 54 |
+ input: appdata + '.in', |
| 55 |
+ output: appdata, |
| 56 |
+ install: true, |
| 57 |
+-- |
| 58 |
+GitLab |
| 59 |
+ |
| 60 |
|
| 61 |
diff --git a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild |
| 62 |
index 57ab47600412..6498d20d7f96 100644 |
| 63 |
--- a/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild |
| 64 |
+++ b/gnome-extra/nm-applet/nm-applet-1.22.0-r1.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2021 Gentoo Authors |
| 67 |
+# Copyright 1999-2022 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
@@ -39,6 +39,10 @@ BDEPEND=" |
| 72 |
virtual/pkgconfig |
| 73 |
" |
| 74 |
|
| 75 |
+PATCHES=( |
| 76 |
+ "${FILESDIR}/meson-0.61.patch" |
| 77 |
+) |
| 78 |
+ |
| 79 |
src_configure() { |
| 80 |
local emesonargs=( |
| 81 |
-Dappindicator=$(usex appindicator ubuntu no) |
| 82 |
|
| 83 |
diff --git a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild |
| 84 |
index 769fc0bab392..0d966ed53377 100644 |
| 85 |
--- a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild |
| 86 |
+++ b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild |
| 87 |
@@ -1,4 +1,4 @@ |
| 88 |
-# Copyright 1999-2021 Gentoo Authors |
| 89 |
+# Copyright 1999-2022 Gentoo Authors |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
EAPI=7 |
| 93 |
@@ -39,6 +39,10 @@ BDEPEND=" |
| 94 |
virtual/pkgconfig |
| 95 |
" |
| 96 |
|
| 97 |
+PATCHES=( |
| 98 |
+ "${FILESDIR}/meson-0.61.patch" |
| 99 |
+) |
| 100 |
+ |
| 101 |
src_configure() { |
| 102 |
local emesonargs=( |
| 103 |
-Dappindicator=$(usex appindicator ubuntu no) |
Archives