From acc7d1556a76e8c75a457d2117cfc377474ec43e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 01:04:13 +0000 Subject: [PATCH] build: sync with upstream 2024-12-24 https://github.com/void-linux/void-packages/commit/bfacf139 --- common/scripts/parse-py-metadata.py | 5 +++++ common/shlibs | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/scripts/parse-py-metadata.py b/common/scripts/parse-py-metadata.py index 150d476..72de64e 100644 --- a/common/scripts/parse-py-metadata.py +++ b/common/scripts/parse-py-metadata.py @@ -32,6 +32,9 @@ if TYPE_CHECKING: from packaging.requirements import Requirement from packaging.utils import canonicalize_name +# packages to always ignore +global_ignore = ["tzdata"] + def msg_err(msg: str, *, nocolor: bool = False, strict: bool = False): if nocolor: @@ -149,6 +152,8 @@ def parse_depends(args): pkgname = vpkgs[k] if pkgname in rdeps: print(f" PYTHON: {k} <-> {pkgname}", flush=True) + elif pkgname in global_ignore: + print(f" PYTHON: {k} <-> {pkgname} (ignored)", flush=True) else: msg_err(f" PYTHON: {k} <-> {pkgname} NOT IN depends PLEASE FIX!", nocolor=args.nocolor, strict=args.strict) diff --git a/common/shlibs b/common/shlibs index c732517..4c9648f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3721,7 +3721,7 @@ libfrr.so.0 libfrr-6.0_1 libkaccounts.so.2 kaccounts-integration-20.04.3_1 libkaccounts6.so.2 kf6-kaccounts-integration-24.02.0_1 libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1 -liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1 +liborocos-kdl.so.1.5 orocos-kdl-1.5.1_1 libibumad.so.3 rdma-core-22.1_1 libibverbs.so.1 rdma-core-22.1_1 librdmacm.so.1 rdma-core-22.1_1 @@ -3732,11 +3732,11 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 libyang.so.1 libyang-1.0r5_1 libhtp.so.2 libhtp-0.5.30_1 -libgedit-48.so gedit-48.0_1 +libgedit-48.1.so gedit-48.1_1 libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1 -libgedit-gtksourceview-300.so.2 libgedit-gtksourceview-299.3.0_1 +libgedit-gtksourceview-300.so.3 libgedit-gtksourceview-299.4.0_1 libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1 -libgedit-tepl-6.so.1 libgedit-tepl-6.11.0_1 +libgedit-tepl-6.so.2 libgedit-tepl-6.12.0_1 libchewing.so.3 libchewing-0.5.1_1 libdwarves.so.1 pahole-1.12_1 libdwarves_emit.so.1 pahole-1.12_1