sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#30336: depends: update doc in Qt pwd patch

Browse Source 
f170fe04ca03fe4021cbff7c5450ce3cc7fda17f depends: update doc in Qt pwd patch (fanquake)

Pull request description:

  Now that upstream has gotten around to fixing this. We don't need any more of the patch, and it likely wont apply to our version of Qt in any case. See: 3388de698b.

ACKs for top commit:
  theuni:
    ACK f170fe04ca03fe4021cbff7c5450ce3cc7fda17f

Tree-SHA512: f6db8ccad591b1bf144ce71f873f42a115d394c432a95b6b855e3e32751e6331145e0d9676657599b25fd369af8c72c1bd34e192a7a1062c15f152421422a9ed
This commit is contained in:
merge-script 2024-07-12 09:40:32 +01:00 committed by pasta
parent 9793fb1a87
commit ebed8af1d0
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
depends/patches/qt/dont_hardcode_pwd.patch
View File

@ -1,13 +1,13 @@
commit 0e953866fc4672486e29e1ba6d83b4207e7b2f0b Do not assume FHS in scripts
Author: fanquake <fanquake@gmail.com>
Date: Tue Aug 18 15:09:06 2020 +0800
Don't hardcode pwd path On systems that do not follow the Filesystem Hierarchy Standard, such as
guix, the hardcoded `/bin/pwd` will fail to be found so that the script
will fail.
Let a man use his builtins if he wants to! Also, removes the unnecessary Use `pwd`, instead, so that the command can be found through the normal
assumption that pwd lives under /bin/pwd. path search mechanism.
See #15581. See https://github.com/qt/qtbase/commit/3388de698bfb9bbc456c08f03e83bf3e749df35c.
diff --git a/qtbase/configure b/qtbase/configure diff --git a/qtbase/configure b/qtbase/configure
index 08b49a8d..faea5b55 100755 index 08b49a8d..faea5b55 100755