From b0ea806f3de55ac408ecfa9ceda595a9740885e5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 23 Dec 2024 13:40:12 -0500 Subject: [PATCH] meld: fix for python3.13 --- srcpkgs/meld/patches/python3.13.patch | 36 +++++++++++++++++++++++++++ srcpkgs/meld/template | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/meld/patches/python3.13.patch diff --git a/srcpkgs/meld/patches/python3.13.patch b/srcpkgs/meld/patches/python3.13.patch new file mode 100644 index 00000000000..a28eebc4488 --- /dev/null +++ b/srcpkgs/meld/patches/python3.13.patch @@ -0,0 +1,36 @@ +From aa817dce6bb0667fc6ef38163c213803dc8b37b3 Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" +Date: Fri, 29 Sep 2023 04:23:22 -0400 +Subject: [PATCH] Don't use deprecated pipes module + +Only `pipes.quote()` was being used in Meld, and that symbol in +pipes is just an import of `shlex.quote()` anyway. Switch to calling +`shlex.quote()` directly, since pipes will be removed in Python 3.13. +--- + meld/melddoc.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meld/melddoc.py b/meld/melddoc.py +index 8dd1a3376..27192f436 100644 +--- a/meld/melddoc.py ++++ b/meld/melddoc.py +@@ -17,7 +17,6 @@ + import enum + import logging + import os +-import pipes + import shlex + import string + import subprocess +@@ -45,7 +44,7 @@ def make_custom_editor_command(path: str, line: int = 0) -> Sequence[str]: + log.error("Unsupported fields found") + return [custom_command, path] + else: +- cmd = custom_command.format(file=pipes.quote(path), line=line) ++ cmd = custom_command.format(file=shlex.quote(path), line=line) + return shlex.split(cmd) + + +-- +GitLab + diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index f6407cc385a..f74af94c48d 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -1,7 +1,7 @@ # Template file for 'meld' pkgname=meld version=3.22.2 -revision=2 +revision=3 build_style=meson hostmakedepends="pkg-config gettext python3-distro itstool gtk-update-icon-cache libxml2-python3 glib-devel"