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

Avoid applying of a patch with fuzz 1 #56

Merged
merged 1 commit into from
Oct 12, 2021

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Oct 10, 2021

On 48a13bf:

$ make -j 9 -C depends qt_preprocessed
make: Entering directory '/home/hebasto/GitHub/gui-qml/depends'
Extracting qt...
/home/hebasto/GitHub/gui-qml/depends/sources/qtbase-everywhere-src-5.12.11.tar.xz: OK
/home/hebasto/GitHub/gui-qml/depends/sources/qtdeclarative-everywhere-src-5.12.11.tar.xz: OK
/home/hebasto/GitHub/gui-qml/depends/sources/qtgraphicaleffects-everywhere-src-5.12.11.tar.xz: OK
/home/hebasto/GitHub/gui-qml/depends/sources/qtquickcontrols-everywhere-src-5.12.11.tar.xz: OK
/home/hebasto/GitHub/gui-qml/depends/sources/qtquickcontrols2-everywhere-src-5.12.11.tar.xz: OK
/home/hebasto/GitHub/gui-qml/depends/sources/qttranslations-everywhere-src-5.12.11.tar.xz: OK
/home/hebasto/GitHub/gui-qml/depends/sources/qttools-everywhere-src-5.12.11.tar.xz: OK
Preprocessing qt...
patching file qtbase/configure
patching file qtbase/mkspecs/features/qt_module.prf
patching file qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
patching file qtbase/src/plugins/plugins.pro
patching file qtbase/mkspecs/android-clang/qmake.conf
patching file qtbase/mkspecs/common/android-base-head.conf
patching file qtbase/mkspecs/common/android-base-tail.conf
patching file qtbase/src/plugins/platforms/android/androidjnimain.cpp
patching file qtbase/mkspecs/common/android-base-head.conf
patching file qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
patching file qtbase/mkspecs/features/mac/default_post.prf
patching file qtbase/mkspecs/common/mac.conf
patching file qtbase/mkspecs/features/qmake_use.prf
patching file qtbase/mkspecs/features/qt_configure.prf
patching file qtbase/src/tools/moc/main.cpp
patching file qtbase/src/corelib/global/qendian.h
patching file qtbase/src/corelib/tools/qbytearraymatcher.h
patching file qtbase/src/tools/moc/generator.cpp
patching file qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
patching file qtdeclarative/src/qml/jsruntime/qv4propertykey_p.h
Hunk #1 succeeded at 52 with fuzz 1.
patching file qtdeclarative/qtdeclarative.pro
patching file qtdeclarative/src/3rdparty/masm/masm.pri
patching file qtdeclarative/src/qml/configure.json
patching file qtdeclarative/src/qml/configure.pri
patching file qtdeclarative/src/qml/qml.pro
patching file qtbase/src/corelib/global/archdetect.cpp
patching file qtbase/src/corelib/global/qprocessordetection.h
patching file qtdeclarative/src/qml/qml.pro
make: Leaving directory '/home/hebasto/GitHub/gui-qml/depends'

The ARM CI task just fails:

Hunk 1 FAILED 52/52.
 
 #include <private/qv4global_p.h>
 
+#include <limits>
+
 QT_BEGIN_NAMESPACE
 
 class QString

This PR fixes this issue.
Also a typo fixed.

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 95b80c0.

@hebasto hebasto merged commit 2f2ddfe into bitcoin-core:main Oct 12, 2021
jarolrod pushed a commit to jarolrod/gui-qml that referenced this pull request Oct 27, 2021
a44caf65fe Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues
135254331e Import fixes for sanitizer reported issues
d5fb86940e refactor: use c++11 range based for loop in checkObject
ff9c379304 refactor: Use nullptr (c++11) instead of NULL
08a99754d5 build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support
66d3713ce7 Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus
808d487292 ci: travis -> cirrus
c390ac375f Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration
4a5b0a1c65 build: Move source entries out to sources.mk
6c7d94b33c build: cleanup wonky gen usage
a222637c6d Merge bitcoin-core#23: Merge changes from jgarzik/univalue@1ae6a23
f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD
1ae6a231a0 Merge pull request bitcoin-core#57 from MarcoFalke/test_fix
92bdd11f0b univalue_write: remove unneeded sstream.h include
ffb621c130 Merge pull request bitcoin-core#56 from drodil/remove_sstream_header
f33acf9fe8 Merge commit '7890db9~' into HEAD
66e0adec4d Remove unnecessary sstream header from univalue.h
88967f6586 Version 1.0.4
1dc113dbef Merge pull request bitcoin-core#50 from luke-jr/pushKV_bool
72392fb227 [tests] test pushKV for boolean values
c23132bcf4 Pushing boolean value to univalue correctly
81faab26a1 Merge pull request bitcoin-core#48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS
b17634ef24 Update URLs to MIT license.
88ab64f6b5 Merge pull request bitcoin-core#46 from jasonbcox/master
35ed96da31 Merge pull request bitcoin-core#44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit
420c226290 Merge pull request bitcoin-core#45 from MarcoFalke/Mf1710-univalue-revert-test

git-subtree-dir: src/univalue
git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3
@hebasto hebasto deleted the 211010-patch branch October 30, 2021 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants