Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump karalabe/usb dependency to latest release #1482

Merged
merged 1 commit into from Aug 24, 2022

Conversation

mdehoog
Copy link
Contributor

@mdehoog mdehoog commented Aug 21, 2022

Currently quorum doesn't compile on Mac OSX 12.5, due to the following error:

# github.com/karalabe/usb
In file included from ../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libs.go:50:
../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libusb/libusb/os/darwin_usb.c:253:39: warning: 'kIOMasterPortDefault' is deprecated: first deprecated in macOS 12.0 [-Wdeprecated-declarations]
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers/IOKitLib.h:123:19: note: 'kIOMasterPortDefault' has been explicitly marked deprecated here
In file included from ../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libs.go:50:
../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libusb/libusb/os/darwin_usb.c:390:26: warning: 'kIOMasterPortDefault' is deprecated: first deprecated in macOS 12.0 [-Wdeprecated-declarations]
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers/IOKitLib.h:123:19: note: 'kIOMasterPortDefault' has been explicitly marked deprecated here
In file included from ../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libs.go:50:
../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libusb/libusb/os/darwin_usb.c:441:60: warning: 'kIOMasterPortDefault' is deprecated: first deprecated in macOS 12.0 [-Wdeprecated-declarations]
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers/IOKitLib.h:123:19: note: 'kIOMasterPortDefault' has been explicitly marked deprecated here
In file included from ../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/libs.go:51:
../../go/pkg/mod/github.com/karalabe/usb@v0.0.0-20190919080040-51dc0efba356/hidapi/mac/hid.c:693:34: warning: 'kIOMasterPortDefault' is deprecated: first deprecated in macOS 12.0 [-Wdeprecated-declarations]
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers/IOKitLib.h:123:19: note: 'kIOMasterPortDefault' has been explicitly marked deprecated here

This was fixed in karalabe/usb#26, and released in v0.0.2.

@CLAassistant
Copy link

CLAassistant commented Aug 21, 2022

CLA assistant check
All committers have signed the CLA.

@antonydenyer
Copy link
Contributor

Thanks @mdehoog is there any chance you could cherry-pick the commit from geth upstream? It makes merging upstream changes easier.

@mdehoog
Copy link
Contributor Author

mdehoog commented Aug 22, 2022

Hey @antonydenyer, thanks for the suggestion. The relevant commit is ethereum/go-ethereum@fb3a652.

Cherry picking is not possible with the current version of geth in this repo, as there has been quite a few go.mod/go.sum changes in between these commits and therefore the cherry pick has conflicts.

Also happy to wait for quorum to upgrade to geth v1.10.16 to receive this change.

@antonydenyer
Copy link
Contributor

antonydenyer commented Aug 22, 2022

Okay fair enough v1.10.16 might be a while! We can merge this in after #1469 has been released.

(changing to draft until #1469)

@antonydenyer antonydenyer marked this pull request as draft August 22, 2022 15:06
@mdehoog
Copy link
Contributor Author

mdehoog commented Aug 24, 2022

rebased on master after #1469 was merged

@antonydenyer antonydenyer marked this pull request as ready for review August 24, 2022 14:13
@antonydenyer antonydenyer merged commit 7b46a8b into Consensys:master Aug 24, 2022
@mdehoog mdehoog deleted the michael/bump-usb branch August 24, 2022 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants