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

Upgrade mac_alias to 2.0.7 #12417

Merged
merged 2 commits into from Feb 15, 2018

Conversation

Projects
None yet
7 participants
@droark
Copy link
Contributor

droark commented Feb 12, 2018

The patch Bitcoin Core has been maintaining for mac_alias was pulled by the mac_alias maintainer in commit 4f31cb084c1c6a8626128b0b00842020b6db9037. Delete the patch and remove the patch from the depends system.

Note that this PR won't be complete until a new version of mac_alias containing the patch has been released, and the depends system is updated to reflect the new version.

@droark

This comment has been minimized.

Copy link
Contributor Author

droark commented Feb 12, 2018

@MarcoFalke MarcoFalke added this to the Future milestone Feb 12, 2018

@thijstriemstra

This comment has been minimized.

Copy link

thijstriemstra commented Feb 13, 2018

2.0.7 has been released.

droark added some commits Feb 12, 2018

Delete mac_alias patch
The patch Bitcoin Core has been maintaining for mac_alias was pulled by the mac_alias maintainer in commit 4f31cb084c1c6a8626128b0b00842020b6db9037. Delete the patch and remove the patch from the depends system.

Note that this PR won't be complete until a new version of mac_alias containing the path has been released, and the depends system is updated to reflect the new version.

@droark droark force-pushed the droark:master_del_mac_alias branch to fc1bfcf Feb 14, 2018

@droark droark changed the title [WIP] Delete mac_alias patch Delete mac_alias patch Feb 14, 2018

@droark

This comment has been minimized.

Copy link
Contributor Author

droark commented Feb 14, 2018

Added a commit upgrading mac_alias to 2.0.7 and did make deploy on my Macbook Pro. The resultant DMG file allowed me to place Core in /Applications. Core runs fine. Background image of the DMG looks fine. A couple of the icons are in weird spots but this is apparently normal. Besides, as mentioned, the core functionality is present.

@jonasschnelli

This comment has been minimized.

Copy link
Member

jonasschnelli commented Feb 14, 2018

Tested ACK via Gitian Build:
https://bitcoin.jonasschnelli.ch/build/499

@laanwj laanwj changed the title Delete mac_alias patch Upgrade mac_alias to 2.0.7 Feb 14, 2018

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Feb 14, 2018

Looks good to me, @theuni might want to sign off on this because it's a depends change.

@fanquake

This comment has been minimized.

Copy link
Member

fanquake commented Feb 14, 2018

utACK fc1bfcf

@droark Could you post a screenshot of the out of place icons for reference?

@theuni

theuni approved these changes Feb 14, 2018

Copy link
Member

theuni left a comment

utACK fc1bfcf. Thanks!

@droark

This comment has been minimized.

Copy link
Contributor Author

droark commented Feb 14, 2018

Thanks, everyone!

@fanquake - Here you go.

image

@theuni

This comment has been minimized.

Copy link
Member

theuni commented Feb 14, 2018

@droark You just have hidden files showing. That's normal.

@droark

This comment has been minimized.

Copy link
Contributor Author

droark commented Feb 14, 2018

@theuni - Oh no, I understand the hidden folders. :) I just seemed to recall some issue/PR from awhile back where something similar was discussed, and how the macOS builds put the icons in odd places. I thought it had been resolved? I can't remember where I saw all this, though, and I could be wrong. Better safe than sorry!

EDIT: Again, just to be clear, I was able to install the build without any problems, and I ran it for awhile on my Mac. This is purely a cosmetic issue, AFAIK. I wouldn't have even brought it up were it not for this being a depends upgrade.

@thijstriemstra

This comment has been minimized.

Copy link

thijstriemstra commented Feb 14, 2018

@droark what version of macOS are you using?

@droark

This comment has been minimized.

Copy link
Contributor Author

droark commented Feb 14, 2018

@thijstriemstra - 10.13.3.

@fanquake fanquake removed this from the Future milestone Feb 15, 2018

@fanquake
Copy link
Member

fanquake left a comment

utACK fc1bfcf

@laanwj laanwj merged commit fc1bfcf into bitcoin:master Feb 15, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 15, 2018

Merge #12417: Upgrade mac_alias to 2.0.7
fc1bfcf Update mac_alias to 2.0.7 (Douglas Roark)
deee216 Delete mac_alias patch (Douglas Roark)

Pull request description:

  The patch Bitcoin Core has been maintaining for mac_alias was pulled by the mac_alias maintainer in commit 4f31cb084c1c6a8626128b0b00842020b6db9037. Delete the patch and remove the patch from the depends system.

  Note that this PR won't be complete until a new version of mac_alias containing the patch has been released, and the depends system is updated to reflect the new version.

Tree-SHA512: e13f1b45c0a56e95645b1aff77036c8a24c29c3f18ea0d386fba8d6d0f5fd07c434afc09dcd644d46ca096d6a7a0d5097f1eca3be5b5a5475eb3d54407044fd9

@droark droark referenced this pull request Feb 23, 2018

Merged

Remove Python2 support #11881

@droark droark deleted the droark:master_del_mac_alias branch Jun 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment