fix bitcoin-qt app categorization on apple silicon #418
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@hebasto This key is not documented properly, but a google search and the info.plist of installed applications will show that it is used in production quite ubiquitously. Using a key that is not properly documented can have negative consequences, especially down the line. I'm open to other approaches! Here's a qt bug that mentions this key: QTBUG-75917 Here we have a qt bug that mentions that QTCreator leaves out the "important" |
|
cc @fanquake: can I get your opinion on this? |
Using |
|
I've checked out multiple non-Apple sources, including stackoverflow.com and other projects on GitHub. And I agree that Why not making this PR independent of bitcoin/bitcoin#22546? |
On master, the deployed bitcoin-qt application is categorized as an IOS application. This is obviously incorrect, and the built executable is not an IOS executable. To fix this, we set the CFBundleSupportedPlatforms key in our info.plist
jarolrod
force-pushed
the
applesilicon-categorization
branch
from
a03a1a6 to
3765c48
Compare
hebasto
approved these changes
Sep 13, 2021
There was a problem hiding this comment.
ACK 3765c48
Guix build:
$ env HOSTS='x86_64-apple-darwin18' ./contrib/guix/guix-build
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
f59636390f1b6c1e51d1c3f1ec5896bfe5ffa65c97f690675e1a1ced9cb6b59e guix-build-3765c486ef57/output/dist-archive/bitcoin-3765c486ef57.tar.gz
2476e872eefe3d2733689fb841630f647356f84ca3231ad8b5042f06ec01c8ef guix-build-3765c486ef57/output/x86_64-apple-darwin18/SHA256SUMS.part
eda7eb51866354e5ca2566596fc55fe9ee7b423b3b2ab7af869908751bccfffa guix-build-3765c486ef57/output/x86_64-apple-darwin18/bitcoin-3765c486ef57-osx-unsigned.dmg
63c4e2c58cb94026dd564e8fae17e5d7a6a4ff7ffa2bc4501239f86cdbc3b849 guix-build-3765c486ef57/output/x86_64-apple-darwin18/bitcoin-3765c486ef57-osx-unsigned.tar.gz
cfda44bb5e56b2bca46024b545cd28b5cc6053a826f9f667da9c732aaf4d8afb guix-build-3765c486ef57/output/x86_64-apple-darwin18/bitcoin-3765c486ef57-osx64.tar.gz
|
GUIX hashes, mine match @hebasto |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Sep 15, 2021
…e silicon 3765c48 qt: fix bitcoin-qt app categorization on apple silicon (Jarol Rodriguez) Pull request description: `System Information` contains many insights into various aspects of your macOS system; the 'Applications' tab contains info on apps. Starting with macOS 11, the 'kind' column under the 'Applications' tab started displaying the CPU architecture of the application. The options are; apple silicon, intel, universal. Previously, the `kind` column indicated where the application originated. The change was made to conveniently determine if the app installed was built to run natively on the new M1 CPU or an intel app that will run under rosetta. Of course, there are several other tools to confirm this; the 'kind' column provides a user-friendly way. We expect that Bitcoin Core compiled, built, and deployed on an intel CPU will be classified as `Intel`. Similarly, we expect that if this is done on an M1 mac, the resulting app is classified as `Apple Silicon`. In reality, Bitcoin-qt built and deployed on an M1 mac will be classified as `IOS`. This behavior is incorrect and should be fixed. We fix this by setting the `CFBundleSupportedPlatforms` in our info.plist to the value of `MacOSX`. In doing this, we are telling macOS, "We do not support IOS; stop it!". Tested and confirmed that this is a no-op on macOS < 11. | On [bitcoin#22546](bitcoin#22546) Branch | [bitcoin#22546](bitcoin#22546) + PR Branch | | ------------------------------------------------------------------- | ----------- | |  |  | **To Test:** For testing, our base branch will be [bitcoin#22546](bitcoin#22546). Please perform the following steps on the base branch and then the base branch with the commit from this PR cherry-picked onto it: - Have an M1 mac - Compile and deploy bitcoin - Open up the deployed *.dmg, installed the bundled app - Eject the bitcoin dmg that should currently be mounted - Navigate to System Information -> Applications - Click on the top-left Apple icon - Click about this mac - Click on the 'Storage' tab - Click on the 'Manage...' button - On the left, click on 'Applications' - Sort by Name - Look for the Bitcoin Core application - Base Branch: The kind column should state that this application is of type `IOS` - PR Branch: The kind column should state that this application is of type `Apple Silicon` Note: Intel users on at least macOS 11 can help test by confirming that the application still shows up as kind=`Intel` ACKs for top commit: hebasto: ACK 3765c48 Tree-SHA512: 666672025e81e59fe1803859a7f9a4fd3b93a3aba05a163ce223c36081dd579b866d071455608011a19d9ba0c3e9f564cca0c4cb941452f2b51f4ef0dfead1fa
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
System Informationcontains many insights into various aspects of your macOS system; the 'Applications' tab contains info on apps. Starting with macOS 11, the 'kind' column under the 'Applications' tab started displaying the CPU architecture of the application. The options are; apple silicon, intel, universal. Previously, thekindcolumn indicated where the application originated. The change was made to conveniently determine if the app installed was built to run natively on the new M1 CPU or an intel app that will run under rosetta. Of course, there are several other tools to confirm this; the 'kind' column provides a user-friendly way.We expect that Bitcoin Core compiled, built, and deployed on an intel CPU will be classified as
Intel. Similarly, we expect that if this is done on an M1 mac, the resulting app is classified asApple Silicon. In reality, Bitcoin-qt built and deployed on an M1 mac will be classified asIOS. This behavior is incorrect and should be fixed.We fix this by setting the
CFBundleSupportedPlatformsin our info.plist to the value ofMacOSX. In doing this, we are telling macOS, "We do not support IOS; stop it!".Tested and confirmed that this is a no-op on macOS < 11.
To Test:
For testing, our base branch will be #22546. Please perform the following steps on the base branch and then the base branch with the commit from this PR cherry-picked onto it:
IOSApple SiliconNote: Intel users on at least macOS 11 can help test by confirming that the application still shows up as kind=
Intel