From 2bdc00ba7df35a0ca1e66dc1a6258087cbc79fa5 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 10 May 2026 15:22:20 -0500 Subject: [PATCH] fix: depthcharge-tools (#12171) * fix: depthcharge tools This patch was fixed upstream Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Delete fix-importlib.patch Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --------- Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/system/depthcharge-tools/depthcharge-tools.spec | 6 +++--- anda/system/depthcharge-tools/fix-importlib.patch | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 anda/system/depthcharge-tools/fix-importlib.patch diff --git a/anda/system/depthcharge-tools/depthcharge-tools.spec b/anda/system/depthcharge-tools/depthcharge-tools.spec index 512aa2bc00..92ac9ebf22 100644 --- a/anda/system/depthcharge-tools/depthcharge-tools.spec +++ b/anda/system/depthcharge-tools/depthcharge-tools.spec @@ -7,7 +7,6 @@ URL: https://gitlab.postmarketos.org/postmarketOS/depthcharge-tools Source0: %url/-/archive/v%version/%name-v%version.tar.gz Requires: vboot-utils dtc gzip lz4 python3-setuptools uboot-tools vboot-utils xz python3-importlib-resources BuildRequires: python3-setuptools python3-rpm-macros pyproject-rpm-macros python3dist(pip) systemd-rpm-macros redhat-rpm-config python3-docutils python3-importlib-resources -Patch0: fix-importlib.patch BuildArch: noarch %description @@ -17,7 +16,7 @@ with depthcharge, the Chrome OS bootloader. %pkg_completion -Bz mkdepthcharge depthchargectl %prep -%autosetup -n %name-v%version -p1 +%autosetup -n %name-v%version %build %pyproject_wheel @@ -45,4 +44,5 @@ install -Dm644 *.1.gz %buildroot%_mandir/man1/ %_unitdir/depthchargectl-bless.service %changelog -%autochangelog +* Sun May 10 2026 Owen Zimmerman +- Remove patch diff --git a/anda/system/depthcharge-tools/fix-importlib.patch b/anda/system/depthcharge-tools/fix-importlib.patch deleted file mode 100644 index a3bf34ffda..0000000000 --- a/anda/system/depthcharge-tools/fix-importlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/depthcharge_tools/__init__.py b/depthcharge_tools/__init__.py -index fabb79d..2b7d7d5 100644 ---- a/depthcharge_tools/__init__.py -+++ b/depthcharge_tools/__init__.py -@@ -9,6 +9,7 @@ import glob - import logging - import pathlib - import importlib -+import importlib.resources - import importlib_metadata - from packaging.version import parse as parse_version - import re