CVS commit: pkgsrc/devel/meld

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Dec 10 08:22:10 UTC 2024

Modified Files:
        pkgsrc/devel/meld: Makefile distinfo
Added Files:
        pkgsrc/devel/meld/patches: patch-meld_melddoc.py

Log Message:
meld: support Python 3.13 using upstream patch

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/meld/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/meld/patches/patch-meld_melddoc.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.145 pkgsrc/devel/meld/Makefile:1.146
--- pkgsrc/devel/meld/Makefile:1.145    Sun Nov 17 07:15:46 2024
+++ pkgsrc/devel/meld/Makefile  Tue Dec 10 08:22:10 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.145 2024/11/17 07:15:46 wiz Exp $
+# $NetBSD: Makefile,v 1.146 2024/12/10 08:22:10 wiz Exp $
 
 DISTNAME=              meld-3.22.2
-PKGREVISION=           8
+PKGREVISION=           9
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/devel/meld/distinfo
diff -u pkgsrc/devel/meld/distinfo:1.71 pkgsrc/devel/meld/distinfo:1.72
--- pkgsrc/devel/meld/distinfo:1.71     Fri Apr  5 11:06:41 2024
+++ pkgsrc/devel/meld/distinfo  Tue Dec 10 08:22:10 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.71 2024/04/05 11:06:41 wiz Exp $
+$NetBSD: distinfo,v 1.72 2024/12/10 08:22:10 wiz Exp $
 
 BLAKE2s (meld-3.22.2.tar.xz) = 1a8286945b1b97b23fc856bf170982dc48ec767261e5e307408e8693d62bdb4c
 SHA512 (meld-3.22.2.tar.xz) = fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284
 Size (meld-3.22.2.tar.xz) = 676376 bytes
+SHA1 (patch-meld_melddoc.py) = 9a9e1bc3943b9699013f9b51ed630109d0ea95e6

Added files:

Index: pkgsrc/devel/meld/patches/patch-meld_melddoc.py
diff -u /dev/null pkgsrc/devel/meld/patches/patch-meld_melddoc.py:1.1
--- /dev/null   Tue Dec 10 08:22:10 2024
+++ pkgsrc/devel/meld/patches/patch-meld_melddoc.py     Tue Dec 10 08:22:10 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-meld_melddoc.py,v 1.1 2024/12/10 08:22:10 wiz Exp $
+
+Support Python 3.13.
+https://gitlab.gnome.org/GNOME/meld/-/commit/aa817dce6bb0667fc6ef38163c213803dc8b37b3
+
+--- meld/melddoc.py.orig       2024-12-10 08:20:25.370049796 +0000
++++ 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
+         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)
+ 
+