build: remove redundant sed patching #16879
Merged
Conversation
This file contains hidden or 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
Patching in kCGMouseButtonLeft should not be required. Looks like this hasn't been needed since qt 5.5 or so: https://codereview.qt-project.org/c/qt/qtbase/+/115138
The lines that this sed command was modifying were removed some time ago. Relevant upstream change: https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/xcb/qxcbxsettings.cpp?id=538b9f504c0de11c473a40aed66df9900ac1c6c4
Member
|
Concept ACK |
Contributor
|
Concept ACK Thanks for removing all this old cruft in the build system. |
Contributor
|
ACK 93995c2 Tested by running a Guix build. |
Contributor
|
Gitian builds for commit 796b713 (master):
Gitian builds for commit dd3c7e95503d0bb28e78d0cc0dd659c0838fc93c (master and this pull):
|
fanquake
added a commit
that referenced
this pull request
Sep 18, 2019
93995c2 build: remove unnecessary qt xcb patching (fanquake) 4d45577 build: remove unnecessary macOS qt patching (fanquake) Pull request description: While looking at #16838 I found at least two cases of `sed` patching in depends that now seems to be redundant. There's possibly a [third case](#16837 (comment)), but I haven't looked into that enough yet. Patching `0` -> `kCGMouseButtonLeft` should not be required, as [`kCGMouseButtonLeft`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/cocoa/qcocoacursor.mm?h=5.9#n82) has been used in the `cocoa/qcocoacursor.mm` source for a while. The include we were modifying in [`src/plugins/platforms/xcb/qxcbxsettings.cpp`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9#n47) was removed in [this commit](https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9&id=78731b434e0e99ad108601249108e12d8a49c350). ACKs for top commit: dongcarl: ACK 93995c2 Tree-SHA512: 5e0cbf317b798ce2e142a42b7fabf1d9e8e00d12f59589e98d790195ba27db60858f933b035c6e9cd0deadd8c3406f1ff4a4ed2af4a19e9b5b43aa97d04b9ecb
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Sep 23, 2019
93995c2 build: remove unnecessary qt xcb patching (fanquake) 4d45577 build: remove unnecessary macOS qt patching (fanquake) Pull request description: While looking at bitcoin#16838 I found at least two cases of `sed` patching in depends that now seems to be redundant. There's possibly a [third case](bitcoin#16837 (comment)), but I haven't looked into that enough yet. Patching `0` -> `kCGMouseButtonLeft` should not be required, as [`kCGMouseButtonLeft`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/cocoa/qcocoacursor.mm?h=5.9#n82) has been used in the `cocoa/qcocoacursor.mm` source for a while. The include we were modifying in [`src/plugins/platforms/xcb/qxcbxsettings.cpp`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9#n47) was removed in [this commit](https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9&id=78731b434e0e99ad108601249108e12d8a49c350). ACKs for top commit: dongcarl: ACK 93995c2 Tree-SHA512: 5e0cbf317b798ce2e142a42b7fabf1d9e8e00d12f59589e98d790195ba27db60858f933b035c6e9cd0deadd8c3406f1ff4a4ed2af4a19e9b5b43aa97d04b9ecb
deadalnix
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Apr 3, 2020
Summary: ``` While looking at #16838 I found at least two cases of sed patching in depends that now seems to be redundant. There's possibly a third case, but I haven't looked into that enough yet. Patching 0 -> kCGMouseButtonLeft should not be required, as kCGMouseButtonLeft has been used in the cocoa/qcocoacursor.mm source for a while. The include we were modifying in src/plugins/platforms/xcb/qxcbxsettings.cpp was removed in this commit. ``` Backport of core [[bitcoin/bitcoin#16879 | PR16879]]. Test Plan: Run the Linux and OSX Gitian builds. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5650
ftrader
pushed a commit
to bitcoin-cash-node/bitcoin-cash-node
that referenced
this pull request
Aug 17, 2020
Summary: ``` While looking at #16838 I found at least two cases of sed patching in depends that now seems to be redundant. There's possibly a third case, but I haven't looked into that enough yet. Patching 0 -> kCGMouseButtonLeft should not be required, as kCGMouseButtonLeft has been used in the cocoa/qcocoacursor.mm source for a while. The include we were modifying in src/plugins/platforms/xcb/qxcbxsettings.cpp was removed in this commit. ``` Backport of core [[bitcoin/bitcoin#16879 | PR16879]]. Test Plan: Run the Linux and OSX Gitian builds. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5650
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jul 1, 2021
93995c2 build: remove unnecessary qt xcb patching (fanquake) 4d45577 build: remove unnecessary macOS qt patching (fanquake) Pull request description: While looking at bitcoin#16838 I found at least two cases of `sed` patching in depends that now seems to be redundant. There's possibly a [third case](bitcoin#16837 (comment)), but I haven't looked into that enough yet. Patching `0` -> `kCGMouseButtonLeft` should not be required, as [`kCGMouseButtonLeft`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/cocoa/qcocoacursor.mm?h=5.9#n82) has been used in the `cocoa/qcocoacursor.mm` source for a while. The include we were modifying in [`src/plugins/platforms/xcb/qxcbxsettings.cpp`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9#n47) was removed in [this commit](https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9&id=78731b434e0e99ad108601249108e12d8a49c350). ACKs for top commit: dongcarl: ACK 93995c2 Tree-SHA512: 5e0cbf317b798ce2e142a42b7fabf1d9e8e00d12f59589e98d790195ba27db60858f933b035c6e9cd0deadd8c3406f1ff4a4ed2af4a19e9b5b43aa97d04b9ecb
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jul 13, 2021
93995c2 build: remove unnecessary qt xcb patching (fanquake) 4d45577 build: remove unnecessary macOS qt patching (fanquake) Pull request description: While looking at bitcoin#16838 I found at least two cases of `sed` patching in depends that now seems to be redundant. There's possibly a [third case](bitcoin#16837 (comment)), but I haven't looked into that enough yet. Patching `0` -> `kCGMouseButtonLeft` should not be required, as [`kCGMouseButtonLeft`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/cocoa/qcocoacursor.mm?h=5.9#n82) has been used in the `cocoa/qcocoacursor.mm` source for a while. The include we were modifying in [`src/plugins/platforms/xcb/qxcbxsettings.cpp`](https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9#n47) was removed in [this commit](https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/xcb/qxcbxsettings.cpp?h=5.9&id=78731b434e0e99ad108601249108e12d8a49c350). ACKs for top commit: dongcarl: ACK 93995c2 Tree-SHA512: 5e0cbf317b798ce2e142a42b7fabf1d9e8e00d12f59589e98d790195ba27db60858f933b035c6e9cd0deadd8c3406f1ff4a4ed2af4a19e9b5b43aa97d04b9ecb
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
While looking at #16838 I found at least two cases of
sedpatching in depends that now seems to be redundant. There's possibly a third case, but I haven't looked into that enough yet.Patching
0->kCGMouseButtonLeftshould not be required, askCGMouseButtonLefthas been used in thecocoa/qcocoacursor.mmsource for a while.The include we were modifying in
src/plugins/platforms/xcb/qxcbxsettings.cppwas removed in this commit.