| 1 |
commit: 1e4db05081ee5d3e479838361b7337fbac39623e |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 25 09:01:35 2021 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 25 09:01:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4db050 |
| 7 |
|
| 8 |
net-wireless/bluez: Fix building with glibc-2.34 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/803830 |
| 11 |
Thanks-to: Sam James |
| 12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 13 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
| 14 |
|
| 15 |
net-wireless/bluez/bluez-5.60.ebuild | 3 ++ |
| 16 |
.../bluez/files/bluez-5.60-glibc-2.34.patch | 42 ++++++++++++++++++++++ |
| 17 |
2 files changed, 45 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.60.ebuild |
| 20 |
index 415cff1e5f2..394c547a517 100644 |
| 21 |
--- a/net-wireless/bluez/bluez-5.60.ebuild |
| 22 |
+++ b/net-wireless/bluez/bluez-5.60.ebuild |
| 23 |
@@ -71,6 +71,9 @@ PATCHES=( |
| 24 |
# Fedora patches |
| 25 |
# http://www.spinics.net/lists/linux-bluetooth/msg40136.html |
| 26 |
"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch |
| 27 |
+ |
| 28 |
+ # https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2 |
| 29 |
+ "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch |
| 30 |
) |
| 31 |
|
| 32 |
pkg_setup() { |
| 33 |
|
| 34 |
diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..1e846100285 |
| 37 |
--- /dev/null |
| 38 |
+++ b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch |
| 39 |
@@ -0,0 +1,42 @@ |
| 40 |
+From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001 |
| 41 |
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl> |
| 42 |
+Date: Wed, 3 Mar 2021 08:57:36 +0100 |
| 43 |
+Subject: [PATCH] media: rename local function conflicting with pause(2) |
| 44 |
+ |
| 45 |
+profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)' |
| 46 |
+ 1284 | static bool pause(void *user_data) |
| 47 |
+ | ^~~~~ |
| 48 |
+In file included from /usr/include/bits/sigstksz.h:24, |
| 49 |
+ from /usr/include/signal.h:315, |
| 50 |
+ from /usr/include/glib-2.0/glib/gbacktrace.h:36, |
| 51 |
+ from /usr/include/glib-2.0/glib.h:34, |
| 52 |
+ from profiles/audio/media.c:21: |
| 53 |
+/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)' |
| 54 |
+ 478 | extern int pause (void); |
| 55 |
+ | ^~~~~ |
| 56 |
+--- |
| 57 |
+ profiles/audio/media.c | 4 ++-- |
| 58 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 59 |
+ |
| 60 |
+diff --git a/profiles/audio/media.c b/profiles/audio/media.c |
| 61 |
+index c84bbe22dc..3d8c4b69c3 100644 |
| 62 |
+--- a/profiles/audio/media.c |
| 63 |
++++ b/profiles/audio/media.c |
| 64 |
+@@ -1281,7 +1281,7 @@ static bool stop(void *user_data) |
| 65 |
+ return media_player_send(mp, "Stop"); |
| 66 |
+ } |
| 67 |
+ |
| 68 |
+-static bool pause(void *user_data) |
| 69 |
++static bool pause_play(void *user_data) |
| 70 |
+ { |
| 71 |
+ struct media_player *mp = user_data; |
| 72 |
+ |
| 73 |
+@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = { |
| 74 |
+ .set_volume = set_volume, |
| 75 |
+ .play = play, |
| 76 |
+ .stop = stop, |
| 77 |
+- .pause = pause, |
| 78 |
++ .pause = pause_play, |
| 79 |
+ .next = next, |
| 80 |
+ .previous = previous, |
| 81 |
+ }; |
Archives