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

[Depends] Dependency updates for 0.14.0 #9468

Merged
merged 6 commits into from Jan 12, 2017

Conversation

@fanquake
Copy link
Member

commented Jan 4, 2017

This includes:
Boost 1.61.0 -> 1.63.0
ccache 3.3.1 -> 3.3.3
dbus 1.8.6 -> 1.10.14
Freetype 2.6.3 -> 2.7.1
native_ds_store c80c23706eae -> 1.1.0

QT, libevent and ZeroMQ (#9254) will be updated in separate PRs, as they will likely require further discussion.

@fanquake fanquake added this to the 0.14.0 milestone Jan 4, 2017

@fanquake fanquake requested a review from theuni Jan 4, 2017

@MarcoFalke MarcoFalke changed the title [WIP][Depends] Dependancy updates for 0.14.0 [WIP][Depends] Dependency updates for 0.14.0 Jan 4, 2017

depends/config.guess Outdated
@@ -1453,4 +1459,4 @@ exit 1
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:
# End:

This comment has been minimized.

Copy link
@paveljanik

paveljanik Jan 8, 2017

Contributor

Did they really deleted final newline? I do not believe so...

This comment has been minimized.

Copy link
@fanquake

fanquake Jan 8, 2017

Author Member

@paveljanik If you look at either file you'll see neither has a newline.

This comment has been minimized.

Copy link
@paveljanik

paveljanik Jan 10, 2017

Contributor

Upstream, both has newlines.

depends/config.sub Outdated
@@ -1812,4 +1825,4 @@ exit
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:
# End:

This comment has been minimized.

Copy link
@paveljanik

paveljanik Jan 8, 2017

Contributor

Ditto

depends/patches/native_biplist/sorted_list.patch Outdated
+++ b/biplist/__init__.py 2016-07-19 19:30:17.663521999 +0000
@@ -541,7 +541,7 @@
--- a/biplist/__init__.py
+++ b/biplist/__init__.py

This comment has been minimized.

Copy link
@paveljanik

paveljanik Jan 8, 2017

Contributor

No change in the diff, so why update it? Just to apply cleanly?

This comment has been minimized.

Copy link
@theuni

theuni Jan 10, 2017

Member

Looks like it's just offset. Is no problem.

This comment has been minimized.

Copy link
@paveljanik

paveljanik Jan 10, 2017

Contributor

There is no problem even without this hunk 8) It is there to apply cleanly. No other purpose. And as such, it is useless IMO.

@paveljanik

This comment has been minimized.

Copy link
Contributor

commented Jan 8, 2017

Concept ACK

@paveljanik

This comment has been minimized.

Copy link
Contributor

commented Jan 8, 2017

/usr/bin/python3.4 ../contrib/macdeploy/custom_dsstore.py "dist/.DS_Store" "Bitcoin-Core"
Traceback (most recent call last):
  File "../contrib/macdeploy/custom_dsstore.py", line 7, in <module>
    from ds_store import DSStore
  File "/home/travis/build/bitcoin/bitcoin/depends/x86_64-apple-darwin11/native/lib/python/dist-packages/ds_store/__init__.py", line 1, in <module>
    from .store import DSStore, DSStoreEntry
  File "/home/travis/build/bitcoin/bitcoin/depends/x86_64-apple-darwin11/native/lib/python/dist-packages/ds_store/store.py", line 9, in <module>
    import mac_alias
  File "/home/travis/build/bitcoin/bitcoin/depends/x86_64-apple-darwin11/native/lib/python/dist-packages/mac_alias/__init__.py", line 2, in <module>
    from .bookmark import *
  File "/home/travis/build/bitcoin/bitcoin/depends/x86_64-apple-darwin11/native/lib/python/dist-packages/mac_alias/bookmark.py", line 295
    print 'Unknown data type %08x' % typecode
                                 ^
SyntaxError: Missing parentheses in call to 'print'
make: *** [dist/.DS_Store] Error 1
@theuni

This comment has been minimized.

Copy link
Member

commented Jan 10, 2017

Looks like mac_alias needs new fixups for python3. I'd say just skip that bump for now, since the author doesn't seem to be in any hurry to update.

@theuni

This comment has been minimized.

Copy link
Member

commented Jan 10, 2017

utACK without the mac_alias bump.

fanquake added 5 commits Jan 4, 2017

@fanquake fanquake force-pushed the fanquake:depends-update-014 branch Jan 11, 2017

@fanquake

This comment has been minimized.

Copy link
Member Author

commented Jan 11, 2017

Dropped the mac_alias commit, and fixed the config.guess/sub newline issue.

@fanquake fanquake force-pushed the fanquake:depends-update-014 branch to 7f1fa99 Jan 11, 2017

@jtimon

This comment has been minimized.

Copy link
Member

commented Jan 11, 2017

Concept ACK

@@ -1032,6 +1035,9 @@ EOF
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*)

This comment has been minimized.

Copy link
@laanwj

laanwj Jan 12, 2017

Member

riscv32 yay :)

@laanwj

This comment has been minimized.

Copy link
Member

commented Jan 12, 2017

utACK 7f1fa99. I think the WIP tag can go?

@MarcoFalke MarcoFalke changed the title [WIP][Depends] Dependency updates for 0.14.0 [Depends] Dependency updates for 0.14.0 Jan 12, 2017

@laanwj laanwj merged commit 7f1fa99 into bitcoin:master Jan 12, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Jan 12, 2017
Merge #9468: [Depends] Dependency updates for 0.14.0
7f1fa99 [depends] native_ds_store 1.1.0 (fanquake)
c6347ae [depends] dbus 1.10.14 (fanquake)
a4c6da0 [depends] ccache 3.3.3 (fanquake)
6019d21 [depends] FreeType 2.7.1 (fanquake)
4ed6faf [depends] Boost 1.63.0 (fanquake)
8ac1830 [depends] Latest config.guess and config.sub (fanquake)

@fanquake fanquake deleted the fanquake:depends-update-014 branch Jan 12, 2017

codablock added a commit to codablock/dash that referenced this pull request Jan 21, 2018
Merge bitcoin#9468: [Depends] Dependency updates for 0.14.0
7f1fa99 [depends] native_ds_store 1.1.0 (fanquake)
c6347ae [depends] dbus 1.10.14 (fanquake)
a4c6da0 [depends] ccache 3.3.3 (fanquake)
6019d21 [depends] FreeType 2.7.1 (fanquake)
4ed6faf [depends] Boost 1.63.0 (fanquake)
8ac1830 [depends] Latest config.guess and config.sub (fanquake)
CryptoCentric added a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
Merge bitcoin#9468: [Depends] Dependency updates for 0.14.0
7f1fa99 [depends] native_ds_store 1.1.0 (fanquake)
c6347ae [depends] dbus 1.10.14 (fanquake)
a4c6da0 [depends] ccache 3.3.3 (fanquake)
6019d21 [depends] FreeType 2.7.1 (fanquake)
4ed6faf [depends] Boost 1.63.0 (fanquake)
8ac1830 [depends] Latest config.guess and config.sub (fanquake)
CryptoCentric added a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
Update devnet to activate BIP34/BIP65/BIP66 immediately @codablock co…
…dablock committed on Jan 20, 2018 Use version 2 blocks for miner_tests … @codablock codablock committed on Jan 20, 2018   Merge bitcoin#7871: Manual block file pruning.  …  @laanwj @codablock laanwj authored and codablock committed on Jan 11, 2017   Merge bitcoin#9507: Fix use-after-free in CTxMemPool::removeConflicts()  …  @sipa @codablock sipa authored and codablock committed on Jan 11, 2017   Merge bitcoin#9297: Various RPC help outputs updated  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9416: travis: make distdir before make  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9520: Deprecate non-txindex getrawtransaction and bette…  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9518: Return height of last block pruned by pruneblockc…  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9472: Disentangle progress estimation from checkpoints …  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#8883: Add all standard TXO types to bitcoin-tx  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9261: Add unstored orphans with rejected parents to rec…  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9468: [Depends] Dependency updates for 0.14.0  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9222: Add 'subtractFeeFromAmount' option to 'fundrawtra…  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9490: Replace FindLatestBefore used by importmuti with …  …  @sipa @codablock sipa authored and codablock committed on Jan 13, 2017   Merge bitcoin#9469: [depends] Qt 5.7.1  …  @laanwj @codablock laanwj authored and codablock committed on Jan 15, 2017   Merge bitcoin#9380: Separate different uses of minimum fees  …  @laanwj @codablock laanwj authored and codablock committed on Jan 16, 2017   Remove SegWit related code in dash-tx  @codablock codablock committed on Sep 21, 2017   Merge bitcoin#9561: Wake message handling thread when we receive a ne…  …  @sipa @codablock sipa authored and codablock committed on Jan 17, 2017   Merge bitcoin#9508: Remove unused Python imports  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 18, 2017   Merge bitcoin#9512: Fix various things -fsanitize complains about
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.