Skip to content

Commit

Permalink
Merge pull request #244 from AnacondaRecipes/PKG-6441
Browse files Browse the repository at this point in the history
handle libarchive 3.7.5
  • Loading branch information
cbouss authored Dec 10, 2024
2 parents 4fb0154 + 433ec10 commit f48e9f0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,13 @@ def patch_record_in_place(fn, record, subdir):
(version == "3.4.0" and build_number < 1)):
replace_dep(depends, "poppler", "poppler <=22.12.0")

# libarchive 3.7.5 abi breaking change - https://github.com/libarchive/libarchive/pull/1976
if (name == "libmamba" and VersionOrder(version) >= VersionOrder("1.5.8") and
VersionOrder(version) <= VersionOrder("1.5.11")):
replace_dep(depends, "libarchive >=3.7.4,<3.8.0a0", "libarchive >=3.7.4,<3.7.5.0a0")
if name == "tesseract" and version == "5.2.0":
replace_dep(depends, "libarchive >=3.7.4,<3.8.0a0", "libarchive >=3.7.4,<3.7.5.0a0")

###########################
# compilers and run times #
###########################
Expand Down
7 changes: 7 additions & 0 deletions r.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ def rename_dependency(fn, record, old_name, new_name):
pass
record['depends'].append('r-base 3.1.2')
instructions["packages"][fn]["depends"] = record['depends']
elif record_name == "r-archive" and record['version'] == "1.1.9":
# libarchive 3.7.5 abi breaking change - https://github.com/libarchive/libarchive/pull/1976
try:
record['depends'].remove('libarchive >=3.7.4,<3.8.0a0')
except ValueError:
pass
record['depends'].append('libarchive >=3.7.4,<3.7.5.0a0')

# Every artifact's metadata requires 'subdir'.
if "subdir" not in record:
Expand Down

0 comments on commit f48e9f0

Please sign in to comment.