From 8ba46438358425d9c161409daf215e02501bce31 Mon Sep 17 00:00:00 2001 From: Brian Wing Date: Thu, 7 Nov 2024 13:48:24 -0500 Subject: [PATCH 1/3] Added fix for poppler 24.09.0 --- main.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main.py b/main.py index 363c4f8..eabf5c4 100644 --- a/main.py +++ b/main.py @@ -1434,6 +1434,16 @@ def patch_record_in_place(fn, record, subdir): if not any(_.startswith("async-timeout") for _ in depends): depends.append("async-timeout") + # poppler 24.09.0 incompatibility + if name == "graphviz" and VersionOrder(version) < VersionOrder("2.50.0") or (version == "2.50.0" and build_number < 2): + replace_dep(depends, "poppler", "poppler <24.09.0") + if name in ["libgdal", "libgdal-arrow-parquet"] and VersionOrder(version) < VersionOrder("3.6.2") or (version == "3.6.2" and build_number < 7): + replace_dep(depends, "poppler", "poppler <24.09.0") + if name == "python-poppler" and VersionOrder(version) < VersionOrder("0.4.1") or (version == "0.4.1" and build_number < 1): + replace_dep(depends, "poppler", "poppler <24.09.0") + if name == "r-pdftools" and VersionOrder(version) < VersionOrder("3.4.0") or (version == "3.4.0" and build_number < 1): + replace_dep(depends, "poppler", "poppler <24.09.0") + ########################### # compilers and run times # ########################### From 21e524a00ccc2db2bcf314c8a752223b40ac0fdc Mon Sep 17 00:00:00 2001 From: Brian Wing Date: Thu, 7 Nov 2024 14:03:59 -0500 Subject: [PATCH 2/3] Cutoff lines at 120 chars --- main.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index eabf5c4..15e0141 100644 --- a/main.py +++ b/main.py @@ -1435,13 +1435,17 @@ def patch_record_in_place(fn, record, subdir): depends.append("async-timeout") # poppler 24.09.0 incompatibility - if name == "graphviz" and VersionOrder(version) < VersionOrder("2.50.0") or (version == "2.50.0" and build_number < 2): + if (name == "graphviz" and VersionOrder(version) < VersionOrder("2.50.0") or + (version == "2.50.0" and build_number < 2)): replace_dep(depends, "poppler", "poppler <24.09.0") - if name in ["libgdal", "libgdal-arrow-parquet"] and VersionOrder(version) < VersionOrder("3.6.2") or (version == "3.6.2" and build_number < 7): + if (name in ["libgdal", "libgdal-arrow-parquet"] and VersionOrder(version) < VersionOrder("3.6.2") or + (version == "3.6.2" and build_number < 7)): replace_dep(depends, "poppler", "poppler <24.09.0") - if name == "python-poppler" and VersionOrder(version) < VersionOrder("0.4.1") or (version == "0.4.1" and build_number < 1): + if (name == "python-poppler" and VersionOrder(version) < VersionOrder("0.4.1") or + (version == "0.4.1" and build_number < 1)): replace_dep(depends, "poppler", "poppler <24.09.0") - if name == "r-pdftools" and VersionOrder(version) < VersionOrder("3.4.0") or (version == "3.4.0" and build_number < 1): + if (name == "r-pdftools" and VersionOrder(version) < VersionOrder("3.4.0") or + (version == "3.4.0" and build_number < 1)): replace_dep(depends, "poppler", "poppler <24.09.0") ########################### From 87385481c10bfafd52d873d559a5444a44b89350 Mon Sep 17 00:00:00 2001 From: Brian Wing Date: Fri, 8 Nov 2024 15:06:20 -0500 Subject: [PATCH 3/3] Set dep to largest acceptable Co-authored-by: Charles Bousseau <16641587+cbouss@users.noreply.github.com> --- main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 15e0141..2edbca3 100644 --- a/main.py +++ b/main.py @@ -1437,16 +1437,16 @@ def patch_record_in_place(fn, record, subdir): # poppler 24.09.0 incompatibility if (name == "graphviz" and VersionOrder(version) < VersionOrder("2.50.0") or (version == "2.50.0" and build_number < 2)): - replace_dep(depends, "poppler", "poppler <24.09.0") + replace_dep(depends, "poppler", "poppler <=22.12.0") if (name in ["libgdal", "libgdal-arrow-parquet"] and VersionOrder(version) < VersionOrder("3.6.2") or (version == "3.6.2" and build_number < 7)): - replace_dep(depends, "poppler", "poppler <24.09.0") + replace_dep(depends, "poppler", "poppler <=22.12.0") if (name == "python-poppler" and VersionOrder(version) < VersionOrder("0.4.1") or (version == "0.4.1" and build_number < 1)): - replace_dep(depends, "poppler", "poppler <24.09.0") + replace_dep(depends, "poppler", "poppler <=22.12.0") if (name == "r-pdftools" and VersionOrder(version) < VersionOrder("3.4.0") or (version == "3.4.0" and build_number < 1)): - replace_dep(depends, "poppler", "poppler <24.09.0") + replace_dep(depends, "poppler", "poppler <=22.12.0") ########################### # compilers and run times #