From 26b4c8f71f91d22e081b27814782686edde0c90a Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Fri, 1 Jan 2021 10:11:34 +0000 Subject: Revert r559792 to unbreak INDEX and bulk -a It seems a lot of reverse dependencies were missed With hat: portmgr --- .../files/patch-device_usb_usb__service__impl.cc | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 devel/electron4/files/patch-device_usb_usb__service__impl.cc (limited to 'devel/electron4/files/patch-device_usb_usb__service__impl.cc') diff --git a/devel/electron4/files/patch-device_usb_usb__service__impl.cc b/devel/electron4/files/patch-device_usb_usb__service__impl.cc new file mode 100644 index 000000000000..0b50e818ff23 --- /dev/null +++ b/devel/electron4/files/patch-device_usb_usb__service__impl.cc @@ -0,0 +1,45 @@ +--- device/usb/usb_service_impl.cc.orig 2019-03-15 06:37:23 UTC ++++ device/usb/usb_service_impl.cc +@@ -239,8 +239,10 @@ UsbServiceImpl::UsbServiceImpl() + } + + UsbServiceImpl::~UsbServiceImpl() { ++#if !defined(OS_FREEBSD) + if (hotplug_enabled_) + libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); ++#endif // !defined(OS_FREEBSD) + } + + void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { +@@ -295,6 +297,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrcontext(), + static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | +@@ -307,6 +310,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrOnDisconnect(); + } + ++#if !defined(OS_FREEBSD) + // static + int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, + libusb_device* device_raw, +@@ -537,6 +542,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb + + return 0; + } ++#endif // !defined(OS_FREEBSD) + + void UsbServiceImpl::OnPlatformDeviceAdded( + ScopedLibusbDeviceRef platform_device) { -- cgit v1.2.3