gentoo auto-resync : 09:11:2024 - 03:03:12

5 files changed, 89 insertions, 8 deletions

diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 3f25e707eb66..932b7bf70411 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,10 +1,13 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch 698 BLAKE2B 41f16a7227518616160aecd016f462f2e636166ddc546aa4fe099e3c6146648b2e0985b97b97eeb3941ebb8666a9ba83803dc773e3d752adc1177c50e7073390 SHA512 144cfa6b1608c59cd49f23871d3fb63fd4b4d08bd0a5fe51ce775218d8d46ef22bd11e2ae3b571d42b7571bbbfe1d5b5e7e49864f1e147242ecddb1c3976b611
+AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch 611 BLAKE2B a89b870f9b7669a6bd8d8efa56f0d88e0d4d738a21c8109645eda31bd7383a02634ed24e613d647999917cba057099cf1f106320d6752964dcb0b846f368edc8 SHA512 0b73595a050d7d59d299eabd36944cd81cbe22beb3d70146c3ec0155c2ec3163c719c09a30b44784e8c311306ee376375e6a29bee4e55748aa4f599b874ffa34
 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-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.77.tar.xz 2432176 BLAKE2B 9c1a8c78ad11a79080af12333338a6b75189ac51f8c49545de9eede8544fea531a7d8f50676f6e26c84289828fe8327bbc3e5b50ad4d9c08822cf0353a82ecaf SHA512 cf0faba4ddbfe6cc3c2d86cbd809483ed82327cbd7e4970ef53cf19053de7b355a505cab88844aebe7a6aa1947ec7a366250d3cbf48cf309db413d287289ff99
 DIST bluez-5.78.tar.xz 2441672 BLAKE2B 7fe65e926b2a692fcf96bb9c694c42ad8c0bd2d19bf534427128bfbd1eb4d9e3e63f2bdc4659ee8654967a0ac7866a561bc4bd4656d19e0dcb7cc5ce976eb6b2 SHA512 0c591a42742c167ff51e088d898b751f11cb4808ec2f17d9a85bc247a32d4fe18fa17503d188ffad6d9393ad590574518055abe5beeb788aca07d5ba957e4e4d
-EBUILD bluez-5.77.ebuild 8589 BLAKE2B 5fe0431297fd7a7ff8439d8097346917c9af21a59b0b133c8be168e15dd0eb74aed6979b7db2ee7b25aa4cd0734f38428d4cd6a2f76213c2391b5d7eed15d3f3 SHA512 209d2fdac38bbee4b055987b591edae4d5f85ba3835b82914ccecde17a1ffb1f1321f1159acc36b39cf341c3c450b716a388c56744ec750c08e1e818cb17a0a1
+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
 MISC metadata.xml 1150 BLAKE2B 830a8e0c89fcc18af92e063ceb3632c97eed9f7424ac5214dd4c853b142d03bba6d629b86fc41ecc28a450a9b7989a21faaae1b95654cb8f16ce2ceb3a97e025 SHA512 44e4489f48634d1b1ff300ccba0f7caa74b76ac7325d38d395ee53763906743f7b622b028a01d32e963952a23da560c16b8cd6771a9001ba90845b59293a6101
diff --git a/net-wireless/bluez/bluez-5.77.ebuild b/net-wireless/bluez/bluez-5.79.ebuild
index 096d50f4d62f..fbcd5d01a0d6 100644
--- a/net-wireless/bluez/bluez-5.77.ebuild
+++ b/net-wireless/bluez/bluez-5.79.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..13} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1
 
@@ -12,8 +12,8 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental man +mesh midi +obex +readline selinux systemd test test-programs +udev"
 
 # Since this release all remaining extra-tools need readline support, but this could
 # change in the future, hence, this REQUIRED_USE constraint could be dropped
@@ -33,8 +33,8 @@ TEST_DEPS="${PYTHON_DEPS}
 	')
 "
 BDEPEND="
-	dev-python/docutils
 	virtual/pkgconfig
+	man? ( dev-python/docutils )
 	test? ( ${TEST_DEPS} )
 "
 DEPEND="
@@ -66,6 +66,13 @@ PATCHES=(
 	# https://bugs.gentoo.org/539844
 	# https://github.com/bluez/bluez/issues/268
 	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# https://github.com/bluez/bluez/commit/9d69dba21f1e46b34cdd8ae27fec11d0803907ee
+	"${FILESDIR}"/${P}-musl-gdbus.patch
+
+	# https://bugs.gentoo.org/928365
+	# https://github.com/bluez/bluez/issues/726
+	"${FILESDIR}"/${PN}-disable-test-vcp.patch
 )
 
 pkg_setup() {
@@ -101,7 +108,7 @@ src_prepare() {
 	default
 
 	# https://github.com/bluez/bluez/issues/806
-	eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch
+	eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
 
 	eautoreconf
 
@@ -137,7 +144,6 @@ multilib_src_configure() {
 		--enable-threads \
 		--enable-library \
 		--enable-tools \
-		--enable-manpages \
 		--enable-monitor \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
@@ -146,6 +152,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups) \
 		$(multilib_native_use_enable deprecated) \
 		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable man manpages) \
 		$(multilib_native_use_enable mesh) \
 		$(multilib_native_use_enable mesh external-ell) \
 		$(multilib_native_use_enable midi) \
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
new file mode 100644
index 000000000000..80c9046626e4
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -4,15 +4,14 @@
+ if SYSTEMD
+ systemduserunit_DATA += obexd/src/obex.service
+ 
+-dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+-dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-
+ obexd-add-service-symlink:
+ 	$(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
+ 
+ obexd-remove-service-symlink:
+ 	rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
+ else
++dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
++dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+ obexd-add-service-symlink:
+ obexd-remove-service-symlink:
+ endif
diff --git a/net-wireless/bluez/files/bluez-5.79-musl-gdbus.patch b/net-wireless/bluez/files/bluez-5.79-musl-gdbus.patch
new file mode 100644
index 000000000000..c2b9474f45a0
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.79-musl-gdbus.patch
@@ -0,0 +1,27 @@
+From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= <gudni.m.g@gmail.com>
+Date: Sat, 2 Nov 2024 16:10:18 +0000
+Subject: [PATCH] gdbus: define MAX_INPUT for musl
+
+This is the same solution as was done in src/shared/util.c
+---
+ gdbus/object.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gdbus/object.c b/gdbus/object.c
+index 84f116bf1..7b0476f1a 100644
+--- a/gdbus/object.c
++++ b/gdbus/object.c
+@@ -20,6 +20,12 @@
+ #include <dbus/dbus.h>
+ 
+ #include "gdbus.h"
++
++/* define MAX_INPUT for musl */
++#ifndef MAX_INPUT
++#define MAX_INPUT _POSIX_MAX_INPUT
++#endif
++
+ #include "src/shared/util.h"
+ 
+ #define info(fmt...)
diff --git a/net-wireless/bluez/files/bluez-disable-test-vcp.patch b/net-wireless/bluez/files/bluez-disable-test-vcp.patch
new file mode 100644
index 000000000000..ffbdbddea17a
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-disable-test-vcp.patch
@@ -0,0 +1,24 @@
+From 1d5a2ec8eb96e9186aeb2826927057ddc7a9d0a6 Mon Sep 17 00:00:00 2001
+From: macmpi <16296055+macmpi@users.noreply.github.com>
+Date: Wed, 17 Jan 2024 09:34:28 +0100
+Subject: [PATCH] disable test_aics_unit_testcases
+
+fails on x86-64
+https://github.com/bluez/bluez/issues/726
+---
+ unit/test-vcp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unit/test-vcp.c b/unit/test-vcp.c
+index 6a61ea2c44..3886177758 100644
+--- a/unit/test-vcp.c
++++ b/unit/test-vcp.c
+@@ -2754,7 +2754,7 @@ int main(int argc, char *argv[])
+ 	tester_init(&argc, &argv);
+ 
+ 	test_vocs_unit_testcases();
+-	test_aics_unit_testcases();
++//	test_aics_unit_testcases(); test fails on x86-64
+ 
+ 	return tester_run();
+ }