Skip to content

Conversation

@fanquake
Copy link
Member

@fanquake fanquake 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 January 4, 2017 13:15
@maflcko maflcko changed the title [WIP][Depends] Dependancy updates for 0.14.0 [WIP][Depends] Dependency updates for 0.14.0 Jan 4, 2017
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Upstream, both has newlines.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto

Copy link
Contributor

@paveljanik paveljanik Jan 8, 2017

Choose a reason for hiding this comment

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

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

Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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
Copy link
Contributor

Concept ACK

@paveljanik
Copy link
Contributor

/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
Copy link
Member

theuni 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
Copy link
Member

theuni commented Jan 10, 2017

utACK without the mac_alias bump.

@fanquake
Copy link
Member Author

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

@jtimon
Copy link
Contributor

jtimon commented Jan 11, 2017

Concept ACK

ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*)
Copy link
Member

Choose a reason for hiding this comment

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

riscv32 yay :)

@laanwj
Copy link
Member

laanwj commented Jan 12, 2017

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

@maflcko maflcko 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
laanwj added a commit that referenced this pull request Jan 12, 2017
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 depends-update-014 branch January 12, 2017 12:24
codablock pushed a commit to codablock/dash that referenced this pull request Jan 21, 2018
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 pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
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 pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
…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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants