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

build: remove deprecated key from macOS Info.plist #17660

Merged
merged 1 commit into from
Feb 5, 2020

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Dec 3, 2019

Note that the current release binaries show correct version numbers everywhere in the GUI and macOS info dialogs (except for when you "space" click the app, shown in screenshots), and we haven't reintroduced the issue that #14701 fixed. This is just swapping a deprecated field for a newer one, as well as using the entire version string in two fields that we hadn't been previously.

Follows up discussion in #14701.

0.19.0.1
0 19 0 1

This PR.
master

@promag
Copy link
Member

promag commented Dec 4, 2019

Concept ACK.

@laanwj
Copy link
Member

laanwj commented Dec 4, 2019

Concept ACK.

I'm not entirely sure the fourth version number should be shown when it is 0. I don't think we historically do this in the application itself? Versions like A.B.C are enough in most cases and look less complex to users.

@promag
Copy link
Member

promag commented Dec 5, 2019

@laanwj that would require a new var like @CLIENT_VERSION_STRING@.

PR title could be something like "build: Refresh macos Info.plist", I mean it's changing other keys.

@laanwj
Copy link
Member

laanwj commented Dec 6, 2019

@laanwj that would require a new var like @CLIENT_VERSION_STRING@.

yes…

@jonasschnelli
Copy link
Contributor

Concept ACK but agree with @laawnj about the forth version part (should only be shown if != 0).

@RandyMcMillan
Copy link
Contributor

Technically "Developers" should be capitalized. "The Bitcoin Core Developers" is the entity that holds the copyright.

@laanwj
Copy link
Member

laanwj commented Dec 9, 2019

there is no 'entity that holds the copyright', the project has no CLA

@RandyMcMillan
Copy link
Contributor

Maybe something other than a copyright notice should be displayed then.

https://www.copyright.gov/comp3/chap2200/ch2200-notice.pdf

2204.1 Notice for Works Fixed in Copies
2207.9 Works Published in Machine-Readable Copies
2207.8 Multi-Part Works
2207.2 Contributions to Collective Works
2209.1 General and Specific Notice

Either way. This should be checked as well - it was mentioned on a previous PR.
#17462 (comment)

@laanwj
Copy link
Member

laanwj commented Dec 12, 2019

You'd have to consider copyright internationally, not just for the US. In the context of FOSS. We're ok with mimicing other projects here, as this is very much out of scope of the project, there's not really anything to be gained by going down that rabbit hole.

@RandyMcMillan
Copy link
Contributor

Thanks for the clarity.

Note that the current release binaries don't show incorrect version
numbers anywhere in the GUI, and we haven't reintroduced the issue that
bitcoin#14701 fixed. This is just swapping a deprecated field for a newer
one and removing the additional version number.
@fanquake fanquake force-pushed the remove_deprecated_cfbundle_usage branch from 86fd77f to c0bc453 Compare December 31, 2019 18:39
@fanquake
Copy link
Member Author

I've reduced this to a smaller change, which is just replacing the deprecated key for the newer one.

@maflcko
Copy link
Member

maflcko commented Jan 2, 2020

Would be nice to get a travis build once #17848 is fixed

@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 3, 2020

Gitian builds

File commit 35fff5b
(master)
commit eb197d4
(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz 1a1b79c30ee23b1e... e80eced58dc6a335...
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz 4f5477e988e15339... c5c0723fd8d16c35...
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz 907d28fc95980468... 7020cac36f99d99e...
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz e55899ead1a7ff56... 627fcfbb4bed6913...
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz 95fa4bccc8b22ac0... 539fc73aa031f9ce...
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz 340c796226da90c7... b144a3653102f638...
bitcoin-0.19.99-osx-unsigned.dmg 1c5ab941efd90df4... 7ccfb8c941d2f59f...
bitcoin-0.19.99-osx64.tar.gz e0d2d4ef7befbf1f... 4675bf5615cddd79...
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz 7fb3888850d15c57... 71a1bceb0aaed21f...
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz c6bd3037c22bbde5... 4f379efc1381bd1f...
bitcoin-0.19.99-win64-debug.zip a2369f394ffcb551... f88dea4eb4548c53...
bitcoin-0.19.99-win64-setup-unsigned.exe ffc23fa5abc3ca5f... ef9c44b823d73077...
bitcoin-0.19.99-win64.zip 2d13e80f0011ce7d... cd3bd41aa0457f93...
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz 2a4aa0a81c4d2591... e81c65ca2a90e5bf...
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz 8940a74e71b82107... 1e2f4f07e186687a...
bitcoin-0.19.99.tar.gz 7703c9c861b5b755... f921da30d556259b...
bitcoin-core-linux-0.20-res.yml 5db46f5eca4bb180... 20d3b5a4de0ac424...
bitcoin-core-osx-0.20-res.yml 9db10d1794650fb3... 3be040b3d57c1814...
bitcoin-core-win-0.20-res.yml 89078fed82c8928e... 4924fab2a26795e0...
linux-build.log a3067a2425690fd1... a234deca9f94d150...
osx-build.log a15a76ffd1535083... f280f5e45f9555b0...
win-build.log 615dbd3684fcd0b0... 703a554824055faf...
bitcoin-core-linux-0.20-res.yml.diff 93c495f6f25d2693...
bitcoin-core-osx-0.20-res.yml.diff b5c0558997c626f0...
bitcoin-core-win-0.20-res.yml.diff a20bc0dd9fb919ab...
linux-build.log.diff d535c6070f6a94d8...
osx-build.log.diff 506bad20fcd7677c...
win-build.log.diff b2c5da4e96fe2770...

@laanwj
Copy link
Member

laanwj commented Feb 5, 2020

ACK c0bc453

laanwj added a commit that referenced this pull request Feb 5, 2020
c0bc453 build: remove deprecated key from macOS Info.plist (fanquake)

Pull request description:

  Note that the current release binaries show correct version numbers everywhere in the GUI and macOS info dialogs (except for when you "space" click the app, shown in screenshots), and we haven't reintroduced the issue that #14701 fixed. This is just swapping a deprecated field for a newer one, as well as using the entire version string in two fields that we hadn't been previously.

  Follows up discussion in #14701.

  0.19.0.1
  ![0 19 0 1](https://user-images.githubusercontent.com/863730/70089170-a0576e80-15e5-11ea-975c-a6902a1ed95a.png)

  This PR.
  ![master](https://user-images.githubusercontent.com/863730/70089178-a3525f00-15e5-11ea-9d63-7db67de014a5.png)

ACKs for top commit:
  laanwj:
    ACK c0bc453

Tree-SHA512: 6191056d0cb6072b8a2170c8441ebfe500cf00cd41014bf5ee68fbf60b5bb5642e2fad9541f1c5abfaafdae6db3102c3add6169cefce3fc4a63d8b913ea35865
@laanwj laanwj merged commit c0bc453 into bitcoin:master Feb 5, 2020
@fanquake fanquake deleted the remove_deprecated_cfbundle_usage branch February 6, 2020 01:49
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 9, 2020
c0bc453 build: remove deprecated key from macOS Info.plist (fanquake)

Pull request description:

  Note that the current release binaries show correct version numbers everywhere in the GUI and macOS info dialogs (except for when you "space" click the app, shown in screenshots), and we haven't reintroduced the issue that bitcoin#14701 fixed. This is just swapping a deprecated field for a newer one, as well as using the entire version string in two fields that we hadn't been previously.

  Follows up discussion in bitcoin#14701.

  0.19.0.1
  ![0 19 0 1](https://user-images.githubusercontent.com/863730/70089170-a0576e80-15e5-11ea-975c-a6902a1ed95a.png)

  This PR.
  ![master](https://user-images.githubusercontent.com/863730/70089178-a3525f00-15e5-11ea-9d63-7db67de014a5.png)

ACKs for top commit:
  laanwj:
    ACK c0bc453

Tree-SHA512: 6191056d0cb6072b8a2170c8441ebfe500cf00cd41014bf5ee68fbf60b5bb5642e2fad9541f1c5abfaafdae6db3102c3add6169cefce3fc4a63d8b913ea35865
MarkLTZ added a commit to litecoinz-core/litecoinz that referenced this pull request Apr 19, 2020
sidhujag pushed a commit to syscoin-core/syscoin that referenced this pull request Nov 10, 2020
c0bc453 build: remove deprecated key from macOS Info.plist (fanquake)

Pull request description:

  Note that the current release binaries show correct version numbers everywhere in the GUI and macOS info dialogs (except for when you "space" click the app, shown in screenshots), and we haven't reintroduced the issue that bitcoin#14701 fixed. This is just swapping a deprecated field for a newer one, as well as using the entire version string in two fields that we hadn't been previously.

  Follows up discussion in bitcoin#14701.

  0.19.0.1
  ![0 19 0 1](https://user-images.githubusercontent.com/863730/70089170-a0576e80-15e5-11ea-975c-a6902a1ed95a.png)

  This PR.
  ![master](https://user-images.githubusercontent.com/863730/70089178-a3525f00-15e5-11ea-9d63-7db67de014a5.png)

ACKs for top commit:
  laanwj:
    ACK c0bc453

Tree-SHA512: 6191056d0cb6072b8a2170c8441ebfe500cf00cd41014bf5ee68fbf60b5bb5642e2fad9541f1c5abfaafdae6db3102c3add6169cefce3fc4a63d8b913ea35865
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants