From 6a5f93442ba8917a598e02fe8b9a500fcf531374 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 11 Jan 2025 16:33:44 +0100
Subject: [PATCH] meld: update to 3.22.3.

---
 srcpkgs/meld/patches/python3.13.patch | 36 ---------------------------
 srcpkgs/meld/template                 |  6 ++---
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/meld/patches/python3.13.patch

diff --git a/srcpkgs/meld/patches/python3.13.patch b/srcpkgs/meld/patches/python3.13.patch
deleted file mode 100644
index a28eebc4488..00000000000
--- a/srcpkgs/meld/patches/python3.13.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From aa817dce6bb0667fc6ef38163c213803dc8b37b3 Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-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 f74af94c48d..b2396a3c4c5 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,7 +1,7 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.22.2
-revision=3
+version=3.22.3
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext python3-distro itstool
  gtk-update-icon-cache libxml2-python3 glib-devel"
@@ -13,4 +13,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=46a0a713fbcd1b153b377a1e0757c8ce255c9822467658eacfbd89b1e92316ef
+checksum=37f7f29eb1ff0fec4d8b088d5483c556de1089f6d018fe6d481993caf2499d84