1 |
commit: 9df05022406405f6a9bae202e012de503d416757 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 18 22:46:48 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 18 22:51:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df05022 |
7 |
|
8 |
net-wireless/gnome-bluetooth: fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831430 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../gnome-bluetooth-3.34.5-meson-0.61-build.patch | 19 +++++++++++++++++++ |
14 |
.../gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild | 6 +++++- |
15 |
2 files changed, 24 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.34.5-meson-0.61-build.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.34.5-meson-0.61-build.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..2e6c912b3d5d |
20 |
--- /dev/null |
21 |
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-3.34.5-meson-0.61-build.patch |
22 |
@@ -0,0 +1,19 @@ |
23 |
+https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e |
24 |
+https://bugs.gentoo.org/831430 |
25 |
+ |
26 |
+From: Bastien Nocera <hadess@××××××.net> |
27 |
+Date: Fri, 7 Jan 2022 12:51:22 +0100 |
28 |
+Subject: [PATCH] build: Fix build for newer versions of meson |
29 |
+ |
30 |
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments. |
31 |
+--- a/sendto/meson.build |
32 |
++++ b/sendto/meson.build |
33 |
+@@ -22,7 +22,6 @@ desktop_in = configure_file( |
34 |
+ ) |
35 |
+ |
36 |
+ i18n.merge_file ( |
37 |
+- desktop, |
38 |
+ type: 'desktop', |
39 |
+ input: desktop_in, |
40 |
+ output: desktop, |
41 |
+GitLab |
42 |
|
43 |
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild |
44 |
index a1ab5dbfcbec..e6e7a267cbfa 100644 |
45 |
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild |
46 |
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild |
47 |
@@ -1,4 +1,4 @@ |
48 |
-# Copyright 1999-2021 Gentoo Authors |
49 |
+# Copyright 1999-2022 Gentoo Authors |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
EAPI=7 |
53 |
@@ -41,6 +41,10 @@ BDEPEND=" |
54 |
) |
55 |
" |
56 |
|
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}"/${P}-meson-0.61-build.patch |
59 |
+) |
60 |
+ |
61 |
python_check_deps() { |
62 |
if use test; then |
63 |
has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]" && |