gentoo resync : 28.07.2021

3 files changed, 47 insertions, 1 deletions

diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index d4023a6d1295..17c351dcf18e 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -3,10 +3,11 @@ AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531
+AUX bluez-5.60-glibc-2.34.patch 1511 BLAKE2B 59035b078414358bf3ab66f92884dcef1d3795780d3ecad2d036dbfe7ee78dab027c9eb34185013ab89f5cbe2a6a0006e4d9420217f3231e27aafd2c5b92a9ec SHA512 ea78ae3771be72b269626c0c119d8d8f8d9b0874379bfd3ada58c9087aac3c55a7ab52a08503964aa397c03791beb918362bc35d0e87e74f5feca0c30bac0e0b
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
 DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b
 EBUILD bluez-5.58-r1.ebuild 9352 BLAKE2B 5a61262e6209c7b9422ccab76eb64a16a0671d3fd3d10f8eceeb5189e5a8296a7929b54fde2ccf94e113abe63271be420c612c66be0832b861d823628b15186a SHA512 d3af406292d2c2aa1e05e4060436ef80b3c72170f03a61fbec149ef1a2254a6ad1f9ea4d620e6fae5f3504769b75f913257ff714049872f9ede92f27ca1de5ca
 EBUILD bluez-5.58.ebuild 9409 BLAKE2B 338f1b2dac68cc078a2c9564b6695abce3ba601116d24564e05f3ed54d4db002d4d94264e55dfe6ab7cd401291f70239514170675de4b8acbd5c55824fb9e341 SHA512 0538b7d1076f743bfbf543efbfaab04906d368737f74b97a50339b86312581a03eee9985c978399c36b5d85dc4291a75c71fd8820cbe8316a0a394bff648bce7
-EBUILD bluez-5.60.ebuild 9278 BLAKE2B e554e09c492539f6cc103f6251cb755081664cf2befc957a96a6df66e24fce6191298bdd4a0dab4c569e183ceada5e3ee2119df6219e5b5bcf136dba0839dcb6 SHA512 e4f8b048c7f6d4d9f7523d75367017160b75b08802972903c74ad137d8371d34aa847a7243066f6e558224f34db31ef5225eaccfac86284fe5cd444912413ea7
+EBUILD bluez-5.60.ebuild 9384 BLAKE2B e8fd696e7308f650489b7e1706ba12c122173a96e19d82183ee63937a954eb54c0f925235077e710a2ce69b9d306661d4423eb10b106e60b8255fac9b4a0b26c SHA512 33d8351b74e26de75916a79df37e8272c7d9bac14ce1f0fe32c246ca82a0b080072c86c2a58acede07b2b23cf13d2d15c6a3d6a7bcb35c01604f499da0c112f3
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.60.ebuild
index 415cff1e5f22..394c547a517f 100644
--- a/net-wireless/bluez/bluez-5.60.ebuild
+++ b/net-wireless/bluez/bluez-5.60.ebuild
@@ -71,6 +71,9 @@ PATCHES=(
 	# Fedora patches
 	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
 	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2
+	"${FILESDIR}"/${PN}-5.60-glibc-2.34.patch
 )
 
 pkg_setup() {
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
new file mode 100644
index 000000000000..1e846100285d
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
@@ -0,0 +1,42 @@
+From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 3 Mar 2021 08:57:36 +0100
+Subject: [PATCH] media: rename local function conflicting with pause(2)
+
+profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)'
+ 1284 | static bool pause(void *user_data)
+      |             ^~~~~
+In file included from /usr/include/bits/sigstksz.h:24,
+                 from /usr/include/signal.h:315,
+                 from /usr/include/glib-2.0/glib/gbacktrace.h:36,
+                 from /usr/include/glib-2.0/glib.h:34,
+                 from profiles/audio/media.c:21:
+/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)'
+  478 | extern int pause (void);
+      |            ^~~~~
+---
+ profiles/audio/media.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/profiles/audio/media.c b/profiles/audio/media.c
+index c84bbe22dc..3d8c4b69c3 100644
+--- a/profiles/audio/media.c
++++ b/profiles/audio/media.c
+@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
+ 	return media_player_send(mp, "Stop");
+ }
+ 
+-static bool pause(void *user_data)
++static bool pause_play(void *user_data)
+ {
+ 	struct media_player *mp = user_data;
+ 
+@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
+ 	.set_volume = set_volume,
+ 	.play = play,
+ 	.stop = stop,
+-	.pause = pause,
++	.pause = pause_play,
+ 	.next = next,
+ 	.previous = previous,
+ };