diff options
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/Manifest.gz | bin | 13907 -> 13904 bytes | |||
-rw-r--r-- | net-wireless/bluez/Manifest | 3 | ||||
-rw-r--r-- | net-wireless/bluez/bluez-5.79.ebuild | 3 | ||||
-rw-r--r-- | net-wireless/bluez/files/bluez-5.79-c23.patch | 123 |
4 files changed, 128 insertions, 1 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz Binary files differindex 1ef162f5a38e..13f45d96922e 100644 --- a/net-wireless/Manifest.gz +++ b/net-wireless/Manifest.gz diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 932b7bf70411..425b970cda79 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -3,11 +3,12 @@ AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch 611 BLAK AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96 AUX bluez-5.78-musl-1.2.5.patch 8604 BLAKE2B 03d961af3e05de95a7c14aa8bbbb70baebd521a433ff7cbcede2532d2db10792718f4d0df024a39cbb23a53a2a1b1a42b23dac2a9ec1069d6c0292bce34ccd03 SHA512 29fe6de760478943622700217a0648738cd5b42e354fcf6866ada2cbe24de5212ff0489c3f349ca25ea7538f4efbbebeb453f7d789c41e10b982ee968638e1c8 +AUX bluez-5.79-c23.patch 4209 BLAKE2B 6455b3f9dabd9338500f2a043542ca97b7a0a9ea9a226d57f26e7974ed6d3edef533ece3e0e147b649f995c122cc256e55a064792f1816edc49f5b6d381a08e6 SHA512 3a470b0ab5e085d3f40cef092a641135685b997252b565dbd2852b47e6fd20cebbf79d6b04ac773c46f255886f5c62520feb0454887a290c8c7e0ba852b6f4f3 AUX bluez-5.79-musl-gdbus.patch 695 BLAKE2B c9c3dc790e9bbc5cddd6295aefb7d33f648dac64d1af41612cde440f5f1110c6a5a8a004fe2e3d6bcb82a9b55d528ca0e3186df8ae22c47021fc3c8931859811 SHA512 5dbbae8193987abaf8db982435aeac9ba6f69e5491d5c553985fce13d5b548929c0a363341a45708ea7e6d7dc656d6d9c3f4669ab860ea038df43c29f2b70796 AUX bluez-disable-test-vcp.patch 704 BLAKE2B f60e0dde73c024b9347c026906642c040bc17c5af7818a9328e1c86151ef47f91e903945199119390d8cd072cda62a85b4ee525a6289226032eb1baf5db94e7a SHA512 e7a07f26d92caaf11a457a8504219973da0aa80f2c97b36af2135aa36f7f4b52978f632c9c5123d66d71b4b65a780710dea802ca0dcaabc5c051f7b7d21763cf AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6 DIST bluez-5.78.tar.xz 2441672 BLAKE2B 7fe65e926b2a692fcf96bb9c694c42ad8c0bd2d19bf534427128bfbd1eb4d9e3e63f2bdc4659ee8654967a0ac7866a561bc4bd4656d19e0dcb7cc5ce976eb6b2 SHA512 0c591a42742c167ff51e088d898b751f11cb4808ec2f17d9a85bc247a32d4fe18fa17503d188ffad6d9393ad590574518055abe5beeb788aca07d5ba957e4e4d DIST bluez-5.79.tar.xz 2457612 BLAKE2B e908bc000b45832845a09ea7e906d39e107e4934fef4efc9a78b278b7f8ae914ed3a573ef53512de7076a3b1ca8115634fb502cb8d1d0c8516febe05f9e059f8 SHA512 74d47b1eb9b9904798f5c8093674743a14a509d22c33003cf253a1ab0c11a564e6a10a808e087e3fb7f3589d3cba1868ec9bf2923703cdc36a293c95af1d0d76 EBUILD bluez-5.78.ebuild 8693 BLAKE2B a5173d38c85234b3b3c78c203302b2bd367d732463f85a074cb641ddd1c65aceb6922584cfcac3b6ba0d844d6341fe61129b9b941675c4dbc78b88aba8a591a9 SHA512 b830ea9b58822c14543c3221c2d0c58212c78e34576560b8d3db12d6aa92749c53c509f2bdb579f72defc7c01f3c9d98869d138f1a9e743296daeea4ee0a51df -EBUILD bluez-5.79.ebuild 8878 BLAKE2B 9e4b64c650c1935b91795ce1bcee41f4f97c5f92346efbe4a5ad1edcb6a1c9778fd6da16263b8f11ccad386e23db2399abc1b27d97b541d483c7aaee09f0a124 SHA512 6a576cb2045eefda39616a9be38c9cb3fc2049dfdf0ee4bd8c9990bd3d63c42691c8f443bf9153e7f1e6e1367a957690df78a7a534cdf17dffaf082ba969d1bd +EBUILD bluez-5.79.ebuild 8924 BLAKE2B d04f7060b09c01a3e008aa9bd3e4c5e34f3ded2fe7eaa3ae2d194ba016094427187efff6ed7445ab2e81a1d80a69cd38f8767daef84897c9132a980d1f240a70 SHA512 73ffff2c44f0917ed4139a68bfb5a9fc2d16edd6b955539dd4508f171c3ff8337c29419a8219c32c7b319b6d007caa5e805b0690a96376a1ba2d729b413fa257 MISC metadata.xml 1150 BLAKE2B 830a8e0c89fcc18af92e063ceb3632c97eed9f7424ac5214dd4c853b142d03bba6d629b86fc41ecc28a450a9b7989a21faaae1b95654cb8f16ce2ceb3a97e025 SHA512 44e4489f48634d1b1ff300ccba0f7caa74b76ac7325d38d395ee53763906743f7b622b028a01d32e963952a23da560c16b8cd6771a9001ba90845b59293a6101 diff --git a/net-wireless/bluez/bluez-5.79.ebuild b/net-wireless/bluez/bluez-5.79.ebuild index fbcd5d01a0d6..c5921065eaf1 100644 --- a/net-wireless/bluez/bluez-5.79.ebuild +++ b/net-wireless/bluez/bluez-5.79.ebuild @@ -73,6 +73,9 @@ PATCHES=( # https://bugs.gentoo.org/928365 # https://github.com/bluez/bluez/issues/726 "${FILESDIR}"/${PN}-disable-test-vcp.patch + + # bug #944059 + "${FILESDIR}"/${P}-c23.patch ) pkg_setup() { diff --git a/net-wireless/bluez/files/bluez-5.79-c23.patch b/net-wireless/bluez/files/bluez-5.79-c23.patch new file mode 100644 index 000000000000..af790901b3b7 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.79-c23.patch @@ -0,0 +1,123 @@ +https://bugs.gentoo.org/943809 +https://github.com/bluez/bluez/commit/da5b5b0ecb1ead38676768ef78d46449d404bdc0 +https://github.com/bluez/bluez/commit/4d60826865c760cc4e5718b6414746a394768110 +https://github.com/bluez/bluez/commit/6f3111eb680df9c13502aacd65554846a9e13a3f + +From da5b5b0ecb1ead38676768ef78d46449d404bdc0 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Wed, 20 Nov 2024 13:02:56 +0000 +Subject: [PATCH] shared/ad: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `bluez` fails the build as: + + src/shared/ad.c:1090:24: error: incompatible types when returning type '_Bool' but 'const char *' was expected + 1090 | return false; + | ^~~~~ +--- + src/shared/ad.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/ad.c b/src/shared/ad.c +index d08ce7af9b..dac381bbe6 100644 +--- a/src/shared/ad.c ++++ b/src/shared/ad.c +@@ -1087,7 +1087,7 @@ bool bt_ad_add_name(struct bt_ad *ad, const char *name) + const char *bt_ad_get_name(struct bt_ad *ad) + { + if (!ad) +- return false; ++ return NULL; + + return ad->name; + } + +From 4d60826865c760cc4e5718b6414746a394768110 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Wed, 20 Nov 2024 13:03:29 +0000 +Subject: [PATCH] shared/shell: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `bluez` fails the build as: + + src/shared/shell.c:365:24: error: incompatible types when returning type '_Bool' but 'struct input *' was expected + 365 | return false; + | ^~~~~ +--- + src/shared/shell.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/shell.c b/src/shared/shell.c +index a8fa87696..aa6c16c8c 100644 +--- a/src/shared/shell.c ++++ b/src/shared/shell.c +@@ -362,7 +362,7 @@ static struct input *input_new(int fd) + + io = io_new(fd); + if (!io) +- return false; ++ return NULL; + + input = new0(struct input, 1); + input->io = io; +From 6f3111eb680df9c13502aacd65554846a9e13a3f Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Wed, 20 Nov 2024 13:03:55 +0000 +Subject: [PATCH] shared/gatt-helpers: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `bluez` fails the build as: + + src/shared/gatt-helpers.c:1136:24: error: incompatible types when returning type '_Bool' but 'struct bt_gatt_request *' was expected + 1136 | return false; + | ^~~~~ + src/shared/gatt-helpers.c:1250:24: error: incompatible types when returning type '_Bool' but 'struct bt_gatt_request *' was expected + 1250 | return false; + | ^~~~~ + src/shared/gatt-helpers.c:1478:24: error: incompatible types when returning type '_Bool' but 'struct bt_gatt_request *' was expected + 1478 | return false; + | ^~~~~ +--- + src/shared/gatt-helpers.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/shared/gatt-helpers.c b/src/shared/gatt-helpers.c +index 50fcb269be..f1fa6300a1 100644 +--- a/src/shared/gatt-helpers.c ++++ b/src/shared/gatt-helpers.c +@@ -1133,7 +1133,7 @@ struct bt_gatt_request *bt_gatt_discover_included_services(struct bt_att *att, + uint8_t pdu[6]; + + if (!att) +- return false; ++ return NULL; + + op = new0(struct bt_gatt_request, 1); + op->att = att; +@@ -1247,7 +1247,7 @@ struct bt_gatt_request *bt_gatt_discover_characteristics(struct bt_att *att, + uint8_t pdu[6]; + + if (!att) +- return false; ++ return NULL; + + op = new0(struct bt_gatt_request, 1); + op->att = att; +@@ -1475,7 +1475,7 @@ struct bt_gatt_request *bt_gatt_discover_descriptors(struct bt_att *att, + uint8_t pdu[4]; + + if (!att) +- return false; ++ return NULL; + + op = new0(struct bt_gatt_request, 1); + op->att = att; |