Skip to content

Commit

Permalink
Merge bitcoin#11460: [depends] mac_alias 2.0.6, ds_store 1.1.2
Browse files Browse the repository at this point in the history
f617d1b [depends] native_ds_store 1.1.2 (fanquake)
46b752a [depends] native_mac_alias 2.0.6 (fanquake)

Pull request description:

  mac_alias and ds_store have moved from Bitbucket to GitHub.
  See https://github.com/al45tair/mac_alias and 
https://github.com/al45tair/ds_store.

  mac_alias has been updated to be compatible with Python 3? ~~~so we 
should be able to drop our patch.~~~ I've dropped some of the patch for 
now.

  Quickly tested on macOS, because depends building is broken with 
latest the Xcode see bitcoin#11461.
  Related bitcoin#8134.

Tree-SHA512: 
d0017883f86b29bc4ab03bade5aaad9959e4343cd66596805fae48a1804e4bd150c77652f08e3e6cfafb3193f7c0183686f1f60c83f3a4204d40f76041c13ed2
  • Loading branch information
jonasschnelli authored and CryptoCentric committed Jul 2, 2021
1 parent 9c7248d commit c4e6478
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 23 deletions.
2 changes: 1 addition & 1 deletion depends/packages/native_mac_alias.mk
Expand Up @@ -7,7 +7,7 @@ $(package)_install_libdir=$(build_prefix)/lib/python/dist-packages
$(package)_patches=python3.patch

define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/python3.patch
patch -p1 < $($(package)_patch_dir)/python3.patch
endef

define $(package)_build_cmds
Expand Down
28 changes: 6 additions & 22 deletions depends/patches/native_mac_alias/python3.patch
@@ -1,7 +1,7 @@
diff -dur a/mac_alias/alias.py b/mac_alias/alias.py
--- a/mac_alias/alias.py 2015-10-19 12:12:48.000000000 +0200
+++ b/mac_alias/alias.py 2016-04-03 12:13:12.037159417 +0200
@@ -243,10 +243,10 @@
--- a/mac_alias/alias.py
+++ b/mac_alias/alias.py
@@ -258,10 +258,10 @@
alias = Alias()
alias.appinfo = appinfo

Expand All @@ -14,7 +14,7 @@ diff -dur a/mac_alias/alias.py b/mac_alias/alias.py
folder_cnid, cnid,
crdate, creator_code, type_code)
alias.target.levels_from = levels_from
@@ -261,9 +261,9 @@
@@ -276,9 +276,9 @@
b.read(1)

if tag == TAG_CARBON_FOLDER_NAME:
Expand All @@ -26,7 +26,7 @@ diff -dur a/mac_alias/alias.py b/mac_alias/alias.py
value)
elif tag == TAG_CARBON_PATH:
alias.target.carbon_path = value
@@ -298,9 +298,9 @@
@@ -313,9 +313,9 @@
alias.target.creation_date \
= mac_epoch + datetime.timedelta(seconds=seconds)
elif tag == TAG_POSIX_PATH:
Expand All @@ -38,23 +38,7 @@ diff -dur a/mac_alias/alias.py b/mac_alias/alias.py
elif tag == TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE:
alias.volume.disk_image_alias = Alias.from_bytes(value)
elif tag == TAG_USER_HOME_LENGTH_PREFIX:
@@ -422,13 +422,13 @@
# (so doing so is ridiculous, and nothing could rely on it).
b.write(struct.pack(b'>h28pI2shI64pII4s4shhI2s10s',
self.target.kind,
- carbon_volname, voldate,
+ carbon_volname, int(voldate),
self.volume.fs_type,
self.volume.disk_type,
self.target.folder_cnid,
carbon_filename,
self.target.cnid,
- crdate,
+ int(crdate),
self.target.creator_code,
self.target.type_code,
self.target.levels_from,
@@ -449,12 +449,12 @@
@@ -467,12 +467,12 @@

b.write(struct.pack(b'>hhQhhQ',
TAG_HIGH_RES_VOLUME_CREATION_DATE,
Expand Down

0 comments on commit c4e6478

Please sign in to comment.