diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron35/files/patch-device_bluetooth_bluetooth__adapter.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-device_bluetooth_bluetooth__adapter.cc')
| -rw-r--r-- | devel/electron35/files/patch-device_bluetooth_bluetooth__adapter.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/devel/electron35/files/patch-device_bluetooth_bluetooth__adapter.cc b/devel/electron35/files/patch-device_bluetooth_bluetooth__adapter.cc deleted file mode 100644 index a429ccd154fb..000000000000 --- a/devel/electron35/files/patch-device_bluetooth_bluetooth__adapter.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- device/bluetooth/bluetooth_adapter.cc.orig 2024-04-15 20:33:58 UTC -+++ device/bluetooth/bluetooth_adapter.cc -@@ -32,7 +32,7 @@ BluetoothAdapter::ServiceOptions::~ServiceOptions() = - BluetoothAdapter::ServiceOptions::ServiceOptions() = default; - BluetoothAdapter::ServiceOptions::~ServiceOptions() = default; - --#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && \ -+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) && \ - !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) - // static - scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() { |