Skip to content

Commit

Permalink
Merge 47b6ad8 into merged_master (Bitcoin PR #20333)
Browse files Browse the repository at this point in the history
apoelstra committed May 6, 2021
2 parents 304d53b + 47b6ad8 commit 0a5ce15
Showing 4 changed files with 4 additions and 21 deletions.
3 changes: 1 addition & 2 deletions contrib/macdeploy/custom_dsstore.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
# Copyright (c) 2013-2018 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
import biplist
from ds_store import DSStore
from mac_alias import Alias
import sys
@@ -47,7 +46,7 @@
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'
icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
icvp['backgroundImageAlias'] = alias.to_bytes()
ds['.']['icvp'] = icvp

ds['.']['vSrn'] = ('long', 1)
15 changes: 0 additions & 15 deletions depends/packages/native_biplist.mk

This file was deleted.

5 changes: 2 additions & 3 deletions depends/packages/native_ds_store.mk
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package=native_ds_store
$(package)_version=1.1.2
$(package)_version=1.3.0
$(package)_download_path=https://github.com/al45tair/ds_store/archive/
$(package)_file_name=v$($(package)_version).tar.gz
$(package)_sha256_hash=3b3ecb7bf0a5157f5b6010bc3af7c141fb0ad3527084e63336220d22744bc20c
$(package)_sha256_hash=76b3280cd4e19e5179defa23fb594a9dd32643b0c80d774bd3108361d94fb46d
$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages
$(package)_dependencies=native_biplist

define $(package)_build_cmds
python3 setup.py build
2 changes: 1 addition & 1 deletion depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ upnp_packages=miniupnpc
multiprocess_packages = libmultiprocess capnp
multiprocess_native_packages = native_libmultiprocess native_capnp

darwin_native_packages = native_biplist native_ds_store native_mac_alias
darwin_native_packages = native_ds_store native_mac_alias

ifneq ($(build_os),darwin)
darwin_native_packages += native_cctools native_cdrkit native_libdmg-hfsplus

0 comments on commit 0a5ce15

Please sign in to comment.