mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
3d6cc69131
7087440894a9daa7de806c5aa42d83ad60759c65 depends: native_ds_store 1.3.0 (fanquake)
Pull request description:
`ds_store` [now takes advantage](36fb607940) of Pythons ability to decode binary [plists](https://docs.python.org/3/library/plistlib.html) (since 3.4), so we can drop its biplist dependency.
The call to `biplist.Data()` in `custom_dsstore.py` doesn't seem to do anything, and from what I can tell can just be removed. i.e:
```diff
diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py
index dc1c1882d..e475bc6c3 100755
--- a/contrib/macdeploy/custom_dsstore.py
+++ b/contrib/macdeploy/custom_dsstore.py
@@ -47,6 +47,7 @@ alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg'
alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg'
alias.volume.disk_image_alias.target.posix_path = 'Users/bitcoinuser/Documents/bitcoin/bitcoin/' + package_name_ns + '.temp.dmg'
alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff'
+assert(biplist.Data(alias.to_bytes()) == alias.to_bytes())
icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
ds['.']['icvp'] = icvp
```
ACKs for top commit:
laanwj:
ACK 7087440894a9daa7de806c5aa42d83ad60759c65
Tree-SHA512: 8ba3cf561937efe4a3daae8b0cb4de3bf9e425b3a9244161b09d94ee2b1bd4c3e21315fa70e495b19a052aabdc1731b3b6f346b63272d72d2762ced83237d02f
35 lines
751 B
Makefile
35 lines
751 B
Makefile
packages:=boost libevent gmp bls-dash backtrace cmake immer
|
|
|
|
protobuf_native_packages = native_protobuf
|
|
protobuf_packages = protobuf
|
|
|
|
openssl_packages = openssl
|
|
|
|
qt_packages = qrencode zlib
|
|
|
|
qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig
|
|
|
|
qt_android_packages=qt
|
|
qt_darwin_packages=qt
|
|
qt_mingw32_packages=qt
|
|
|
|
wallet_packages=bdb
|
|
|
|
zmq_packages=zeromq
|
|
|
|
upnp_packages=miniupnpc
|
|
natpmp_packages=libnatpmp
|
|
|
|
darwin_native_packages = native_ds_store native_mac_alias
|
|
|
|
$(host_arch)_$(host_os)_native_packages += native_b2
|
|
|
|
ifneq ($(build_os),darwin)
|
|
darwin_native_packages += native_cctools native_libtapi native_libdmg-hfsplus
|
|
|
|
ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
|
|
darwin_native_packages+= native_clang
|
|
endif
|
|
|
|
endif
|