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

[Qt] Bump to Qt5.6.1 #8210

Merged
merged 5 commits into from Jun 20, 2016

Conversation

Projects
None yet
6 participants
@jonasschnelli
Member

jonasschnelli commented Jun 16, 2016

Based on (#8053) credits to @fanquake.
Includes osx toolchain bump from @theuni (#8184).

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 16, 2016

Member

If you compile OSX binaries over depends, you now need the MacOSX10.11.tar.gz SDK.

Member

jonasschnelli commented Jun 16, 2016

If you compile OSX binaries over depends, you now need the MacOSX10.11.tar.gz SDK.

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Jun 16, 2016

Member

What advantages does 5.6.1 have over 5.5.0?

Member

sipa commented Jun 16, 2016

What advantages does 5.6.1 have over 5.5.0?

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 16, 2016

Member

The release notes for Qt5.6 are here: https://blog.qt.io/blog/2016/03/16/qt-5-6-released/

The reason why I'd like to see this go in before 0.13 is the missing HiDPI support for linux and windows in 5.5
(#6472).

I know, most devs don't care about HiDPI, but almost every laptops and screens sold today support HiDPI.

Member

jonasschnelli commented Jun 16, 2016

The release notes for Qt5.6 are here: https://blog.qt.io/blog/2016/03/16/qt-5-6-released/

The reason why I'd like to see this go in before 0.13 is the missing HiDPI support for linux and windows in 5.5
(#6472).

I know, most devs don't care about HiDPI, but almost every laptops and screens sold today support HiDPI.

fanquake and others added some commits May 14, 2016

depends: bump OSX toolchain
clang: 3.7.1
cctools: 877.8
ld64: 253.9
@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 17, 2016

Member

As I remember there are quite a few upstream issues solved in 5.6.1, from HiDPI to crashes and window manager integration.
We definitely need to upgrade Qt before 0.13.

Member

laanwj commented Jun 17, 2016

As I remember there are quite a few upstream issues solved in 5.6.1, from HiDPI to crashes and window manager integration.
We definitely need to upgrade Qt before 0.13.

@laanwj laanwj added this to the 0.13.0 milestone Jun 17, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 17, 2016

Member

Why does this need the OSX toolchain bump?

Member

laanwj commented Jun 17, 2016

Why does this need the OSX toolchain bump?

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 17, 2016

Member

I ran into Qt compile issues (c++11 atomic issues) with MaxOSX10.9 clang compiler. Haven't tracked it down and I think a toolchain bump to 10.11 is necessary for #7770 anyways and does not affect the minimum required platform,

Member

jonasschnelli commented Jun 17, 2016

I ran into Qt compile issues (c++11 atomic issues) with MaxOSX10.9 clang compiler. Haven't tracked it down and I think a toolchain bump to 10.11 is necessary for #7770 anyways and does not affect the minimum required platform,

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 17, 2016

Member

Ah sorry yes I missed the atomic thing. Makes sense.

Member

laanwj commented Jun 17, 2016

Ah sorry yes I missed the atomic thing. Makes sense.

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 17, 2016

Member

There are some issues which I could not already solve

Linux

Somehow it links against libdbus-1.so now and will be rejected by symbol-check.py:

qt/bitcoin-qt: NEEDED library libdbus-1.so.3 is not allowed

https://bitcoin.jonasschnelli.ch/pulls/8210/build-linux.log

MinGW

It doesn't find -lqwindows anymore:

checking for static Qt plugins: -lqwindows... no
configure: WARNING: Could not resolve: -lqwindows; bitcoin-qt frontend will not be built

https://bitcoin.jonasschnelli.ch/pulls/8210/build-win.log

OSX

Works!

Member

jonasschnelli commented Jun 17, 2016

There are some issues which I could not already solve

Linux

Somehow it links against libdbus-1.so now and will be rejected by symbol-check.py:

qt/bitcoin-qt: NEEDED library libdbus-1.so.3 is not allowed

https://bitcoin.jonasschnelli.ch/pulls/8210/build-linux.log

MinGW

It doesn't find -lqwindows anymore:

checking for static Qt plugins: -lqwindows... no
configure: WARNING: Could not resolve: -lqwindows; bitcoin-qt frontend will not be built

https://bitcoin.jonasschnelli.ch/pulls/8210/build-win.log

OSX

Works!

@fanquake

This comment has been minimized.

Show comment
Hide comment
@fanquake

fanquake Jun 17, 2016

Member

One TODO you could add here is dropping dbus from the qt build.
Thanks for picking this up and putting it on top of the toolchain bump. Ill test this, and if it's merged for 0.13, I can rebase #8053 and turn it into testing a QT5.7 update, and the potential enhancements surrounding that.

Member

fanquake commented Jun 17, 2016

One TODO you could add here is dropping dbus from the qt build.
Thanks for picking this up and putting it on top of the toolchain bump. Ill test this, and if it's merged for 0.13, I can rebase #8053 and turn it into testing a QT5.7 update, and the potential enhancements surrounding that.

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 17, 2016

Member

Compiles now on all three gitian platform: https://bitcoin.jonasschnelli.ch/pulls/8210/

The remaining question:
dynamic link against libdbus-1
https://github.com/bitcoin/bitcoin/pull/8210/files#diff-a225cfb1575f5550c4ba2b912127a730R71

Member

jonasschnelli commented Jun 17, 2016

Compiles now on all three gitian platform: https://bitcoin.jonasschnelli.ch/pulls/8210/

The remaining question:
dynamic link against libdbus-1
https://github.com/bitcoin/bitcoin/pull/8210/files#diff-a225cfb1575f5550c4ba2b912127a730R71

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 17, 2016

Member

Travis fails because of a missing file (MacOSX10.11.sdk.tar.gz) on bitcoincore.org. Must be placed there by @theuni.

Member

jonasschnelli commented Jun 17, 2016

Travis fails because of a missing file (MacOSX10.11.sdk.tar.gz) on bitcoincore.org. Must be placed there by @theuni.

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 18, 2016

Member

Travis fails because of a missing file (MacOSX10.11.sdk.tar.gz) on bitcoincore.org. Must be placed there by @theuni.

Can we temporarily use a different host?

I wouldn't mind using mine, until we find a permenant solution: https://download.visucore.com/bitcoin/MacOSX10.11.sdk.tar.gz

Member

laanwj commented Jun 18, 2016

Travis fails because of a missing file (MacOSX10.11.sdk.tar.gz) on bitcoincore.org. Must be placed there by @theuni.

Can we temporarily use a different host?

I wouldn't mind using mine, until we find a permenant solution: https://download.visucore.com/bitcoin/MacOSX10.11.sdk.tar.gz

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jun 18, 2016

Member
Member

theuni commented Jun 18, 2016

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jun 18, 2016

Member
Member

theuni commented Jun 18, 2016

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jun 18, 2016

Member
Member

theuni commented Jun 18, 2016

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Jun 18, 2016

Member
Member

jonasschnelli commented Jun 18, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 18, 2016

Member

Woohoo, green!

Going to test this.

  • Gitian build was succesful for all platforms
  • Checked the bitcoin-qt executable for Linux - at first glance everything seems to work as it should, no glitches (on Ubuntu 16.04)
  • Checked the bitcoin-qt.exe for Windows in wine - everything seems ok (on Ubuntu 16.04)

bitcoin-qt dependencies:

 0x0000000000000001 (NEEDED)             Shared library: [libX11-xcb.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libX11.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libxcb.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfontconfig.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfreetype.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.0]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libanl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [librt.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libm.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libgcc_s.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [ld-linux-x86-64.so.2]

All looks good to me. Will check determinism.

  • Built -linux a few times (with and without caching), SHA256 hashes were the same
a8c0e04e79a80688ee457ba9fb592bfa3ac450f91298c205f467ed045f47d605  bitcoin-0.12.99-aarch64-linux-gnu-debug.tar.gz
3b4a0cda93b96d0fbd5826547294852d75ad30145d3cf32d7766b742dfcecb69  bitcoin-0.12.99-aarch64-linux-gnu.tar.gz
6106ccae1078b2408b024716e75fa2b6223d2ad2a596ab6279547268f5207c6e  bitcoin-0.12.99-arm-linux-gnueabihf-debug.tar.gz
6441caa0321f61956a18b866b36c405d9d50caa32b4d7f0b47a23fac9c45f809  bitcoin-0.12.99-arm-linux-gnueabihf.tar.gz
c55acea4c15951f8661a0b964b4aefc9328769eda5b5be0b94f70a8a8ef3d743  bitcoin-0.12.99-i686-pc-linux-gnu-debug.tar.gz
d1baabbf672ee88e42cf0e824faae57f5a3e822ed35e777d75dff89792713c1c  bitcoin-0.12.99-i686-pc-linux-gnu.tar.gz
7b85677612e3ab49b968241494f0dd427c5c3c14414de2df540632718888f63a  bitcoin-0.12.99-x86_64-linux-gnu-debug.tar.gz
a6c705f20528b59367ffbf0a0c8a71cb79ec2bce16927f06bc8a689a65c10160  bitcoin-0.12.99-x86_64-linux-gnu.tar.gz
2edc23a93db42965128e47d795b4e2399e43e1c52c96a6eab6efb0f5b90fa8c6  src/bitcoin-0.12.99.tar.gz
  • Build -win a few times (with and without caching), SHA256 hashes were the same
6567082d336e8574fd7c3d8803e38dafd96621040feab9c6c6493caddb31d825  bitcoin-0.12.99-win-unsigned.tar.gz
0288f0c3903a69b3fdddff430a4c9db9e24c94d58b2cab9dca83bba14aceb142  bitcoin-0.12.99-win32-debug.zip
523e7ac77abdb748663e3872cc29dc5268a43951c05025e48f09144690dff683  bitcoin-0.12.99-win32-setup-unsigned.exe
837cdd402fed3cecedd482c6b076c982d9081c980843d99d6360c1454146fa41  bitcoin-0.12.99-win32.zip
a031b966c0ca991152510646b84d1ce71b43fff1a550a246f4d163e42c4c32e1  bitcoin-0.12.99-win64-debug.zip
75664851d83c17f8c24cce2c742eb9f2d3343e2dcdd480dfb6a4eea114c6cc69  bitcoin-0.12.99-win64-setup-unsigned.exe
3e01672dc96e6a119151cf2e630afddf0779a9ca141c390be9c8dd64ad218fd9  bitcoin-0.12.99-win64.zip
2edc23a93db42965128e47d795b4e2399e43e1c52c96a6eab6efb0f5b90fa8c6  src/bitcoin-0.12.99.tar.gz
  • Build -osx a few times (with and without caching), SHA256 hashes were the same
ca7ba025d4d5c8d17a64e825903280281bc2fcb89da0536e0be2c786561088fb  bitcoin-0.12.99-osx64.tar.gz
2edc23a93db42965128e47d795b4e2399e43e1c52c96a6eab6efb0f5b90fa8c6  src/bitcoin-0.12.99.tar.gz

These were different every run:

98408b1779122527b8d6bcd541178b439379630865644602527de16d7535e41d  bitcoin-0.12.99-osx-unsigned.dmg
8a7a83e2172d0ea5767dfd54af7d180cc2072601f45406bc6012456bb935c6bb  bitcoin-0.12.99-osx-unsigned.tar.gz

I'm fairly sure that this was already the case though. These are two intermediate files and only the -signed end product will be deterministic.

Member

laanwj commented Jun 18, 2016

Woohoo, green!

Going to test this.

  • Gitian build was succesful for all platforms
  • Checked the bitcoin-qt executable for Linux - at first glance everything seems to work as it should, no glitches (on Ubuntu 16.04)
  • Checked the bitcoin-qt.exe for Windows in wine - everything seems ok (on Ubuntu 16.04)

bitcoin-qt dependencies:

 0x0000000000000001 (NEEDED)             Shared library: [libX11-xcb.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libX11.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libxcb.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfontconfig.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libfreetype.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.0]
 0x0000000000000001 (NEEDED)             Shared library: [libdl.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libanl.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [librt.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libm.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [libgcc_s.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
 0x0000000000000001 (NEEDED)             Shared library: [ld-linux-x86-64.so.2]

All looks good to me. Will check determinism.

  • Built -linux a few times (with and without caching), SHA256 hashes were the same
a8c0e04e79a80688ee457ba9fb592bfa3ac450f91298c205f467ed045f47d605  bitcoin-0.12.99-aarch64-linux-gnu-debug.tar.gz
3b4a0cda93b96d0fbd5826547294852d75ad30145d3cf32d7766b742dfcecb69  bitcoin-0.12.99-aarch64-linux-gnu.tar.gz
6106ccae1078b2408b024716e75fa2b6223d2ad2a596ab6279547268f5207c6e  bitcoin-0.12.99-arm-linux-gnueabihf-debug.tar.gz
6441caa0321f61956a18b866b36c405d9d50caa32b4d7f0b47a23fac9c45f809  bitcoin-0.12.99-arm-linux-gnueabihf.tar.gz
c55acea4c15951f8661a0b964b4aefc9328769eda5b5be0b94f70a8a8ef3d743  bitcoin-0.12.99-i686-pc-linux-gnu-debug.tar.gz
d1baabbf672ee88e42cf0e824faae57f5a3e822ed35e777d75dff89792713c1c  bitcoin-0.12.99-i686-pc-linux-gnu.tar.gz
7b85677612e3ab49b968241494f0dd427c5c3c14414de2df540632718888f63a  bitcoin-0.12.99-x86_64-linux-gnu-debug.tar.gz
a6c705f20528b59367ffbf0a0c8a71cb79ec2bce16927f06bc8a689a65c10160  bitcoin-0.12.99-x86_64-linux-gnu.tar.gz
2edc23a93db42965128e47d795b4e2399e43e1c52c96a6eab6efb0f5b90fa8c6  src/bitcoin-0.12.99.tar.gz
  • Build -win a few times (with and without caching), SHA256 hashes were the same
6567082d336e8574fd7c3d8803e38dafd96621040feab9c6c6493caddb31d825  bitcoin-0.12.99-win-unsigned.tar.gz
0288f0c3903a69b3fdddff430a4c9db9e24c94d58b2cab9dca83bba14aceb142  bitcoin-0.12.99-win32-debug.zip
523e7ac77abdb748663e3872cc29dc5268a43951c05025e48f09144690dff683  bitcoin-0.12.99-win32-setup-unsigned.exe
837cdd402fed3cecedd482c6b076c982d9081c980843d99d6360c1454146fa41  bitcoin-0.12.99-win32.zip
a031b966c0ca991152510646b84d1ce71b43fff1a550a246f4d163e42c4c32e1  bitcoin-0.12.99-win64-debug.zip
75664851d83c17f8c24cce2c742eb9f2d3343e2dcdd480dfb6a4eea114c6cc69  bitcoin-0.12.99-win64-setup-unsigned.exe
3e01672dc96e6a119151cf2e630afddf0779a9ca141c390be9c8dd64ad218fd9  bitcoin-0.12.99-win64.zip
2edc23a93db42965128e47d795b4e2399e43e1c52c96a6eab6efb0f5b90fa8c6  src/bitcoin-0.12.99.tar.gz
  • Build -osx a few times (with and without caching), SHA256 hashes were the same
ca7ba025d4d5c8d17a64e825903280281bc2fcb89da0536e0be2c786561088fb  bitcoin-0.12.99-osx64.tar.gz
2edc23a93db42965128e47d795b4e2399e43e1c52c96a6eab6efb0f5b90fa8c6  src/bitcoin-0.12.99.tar.gz

These were different every run:

98408b1779122527b8d6bcd541178b439379630865644602527de16d7535e41d  bitcoin-0.12.99-osx-unsigned.dmg
8a7a83e2172d0ea5767dfd54af7d180cc2072601f45406bc6012456bb935c6bb  bitcoin-0.12.99-osx-unsigned.tar.gz

I'm fairly sure that this was already the case though. These are two intermediate files and only the -signed end product will be deterministic.

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 20, 2016

Member

Did anyone test the OSX executables?

If so, and there were no issues, I think this is ready for merge.

Member

laanwj commented Jun 20, 2016

Did anyone test the OSX executables?

If so, and there were no issues, I think this is ready for merge.

@laanwj laanwj merged commit 2759597 into bitcoin:master Jun 20, 2016

1 check passed

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

laanwj added a commit that referenced this pull request Jun 20, 2016

Merge #8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)

@laanwj laanwj referenced this pull request Jun 20, 2016

Closed

WIP: OSX toolchain bump #8184

0 of 3 tasks complete
@@ -342,6 +342,10 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
elif test x$TARGET_OS = xdarwin; then
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
fi
else
if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then

This comment has been minimized.

@theuni

theuni Jun 23, 2016

Member

This seems to be using pkg-config in the if(!pkgconfig) case?

@theuni

theuni Jun 23, 2016

Member

This seems to be using pkg-config in the if(!pkgconfig) case?

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jun 23, 2016

Member

I'm not sure that I understand the pkg-config changes here. We don't use pkg-config for win because I don't believe it's reliable there. From what I can tell, this seems to confirm that suspicion.

I think this probably introduced a few bugs, but I won't be able to work on this for ~1.5 more weeks. I've made a note to verify these changes before release.

Other than the windows stuff, this looks good. Thanks @jonasschnelli and @fanquake for working on it.

Member

theuni commented Jun 23, 2016

I'm not sure that I understand the pkg-config changes here. We don't use pkg-config for win because I don't believe it's reliable there. From what I can tell, this seems to confirm that suspicion.

I think this probably introduced a few bugs, but I won't be able to work on this for ~1.5 more weeks. I've made a note to verify these changes before release.

Other than the windows stuff, this looks good. Thanks @jonasschnelli and @fanquake for working on it.

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 23, 2016

Member

I think this probably introduced a few bugs

If anything the windows gitian executables seem to be working fine.

Member

laanwj commented Jun 23, 2016

I think this probably introduced a few bugs

If anything the windows gitian executables seem to be working fine.

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Jul 8, 2016

Member

I think this probably introduced a few bugs

@theuni Did you find any bugs?

Member

MarcoFalke commented Jul 8, 2016

I think this probably introduced a few bugs

@theuni Did you find any bugs?

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jul 8, 2016

Member

@MarcoFalke The pkg-config issue was fixed with 0c928cb. I just tested to see if the xcb issue was reintroduced, and it wasn't. So it looks like we're all good here.

Member

theuni commented Jul 8, 2016

@MarcoFalke The pkg-config issue was fixed with 0c928cb. I just tested to see if the xcb issue was reintroduced, and it wasn't. So it looks like we're all good here.

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Jul 10, 2016

Member

Good to hear. Thanks for having a look.

Member

MarcoFalke commented Jul 10, 2016

Good to hear. Thanks for having a look.

codablock added a commit to codablock/dash that referenced this pull request Sep 16, 2017

Merge bitcoin#8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge bitcoin#8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)

@schinzelh schinzelh referenced this pull request Oct 20, 2017

Closed

[WIP] Update build system to Bitcoin 0.13.2 #1692

22 of 24 tasks complete

@str4d str4d referenced this pull request Oct 29, 2017

Merged

Darwin build fixes #2697

zkbot added a commit to zcash/zcash that referenced this pull request Nov 29, 2017

Auto merge of #2697 - str4d:darwin-build, r=<try>
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114

zkbot added a commit to zcash/zcash that referenced this pull request Nov 30, 2017

Auto merge of #2697 - str4d:darwin-build, r=<try>
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114

zkbot added a commit to zcash/zcash that referenced this pull request Nov 30, 2017

Auto merge of #2697 - str4d:darwin-build, r=str4d
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114

zkbot added a commit to zcash/zcash that referenced this pull request Nov 30, 2017

Auto merge of #2697 - str4d:darwin-build, r=str4d
Darwin build fixes

Includes fixes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7136
  - Only the third commit (to avoid a merge conflict)
- bitcoin/bitcoin#7302
  - Excluding the first commit, which is unnecessary (we use Boost 1.62)
- bitcoin/bitcoin#7487
- bitcoin/bitcoin#7606
- bitcoin/bitcoin#7711
- bitcoin/bitcoin#7165
- bitcoin/bitcoin#8002
- bitcoin/bitcoin#8210
  - Only the second commit
- bitcoin/bitcoin#9114

codablock added a commit to codablock/dash that referenced this pull request Dec 27, 2017

Merge bitcoin#8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)

codablock added a commit to codablock/dash that referenced this pull request Dec 28, 2017

Merge bitcoin#8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment