CVS commit: pkgsrc/devel/meld

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 16 06:30:38 UTC 2026

Modified Files:
        pkgsrc/devel/meld: Makefile distinfo
Added Files:
        pkgsrc/devel/meld/patches: patch-meld_matchers_helpers.py
Removed Files:
        pkgsrc/devel/meld/patches: patch-meld_vc___vc.py

Log Message:
meld: another try at closing one (of a couple) file descriptor leaks

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/devel/meld/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/meld/patches/patch-meld_matchers_helpers.py
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/meld/patches/patch-meld_vc___vc.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.154 pkgsrc/devel/meld/Makefile:1.155
--- pkgsrc/devel/meld/Makefile:1.154    Sat Apr 11 11:39:51 2026
+++ pkgsrc/devel/meld/Makefile  Thu Apr 16 06:30:38 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2026/04/11 11:39:51 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2026/04/16 06:30:38 wiz Exp $
 
 DISTNAME=              meld-3.22.2
-PKGREVISION=           17
+PKGREVISION=           18
 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.73 pkgsrc/devel/meld/distinfo:1.74
--- pkgsrc/devel/meld/distinfo:1.73     Sat Apr 11 11:39:51 2026
+++ pkgsrc/devel/meld/distinfo  Thu Apr 16 06:30:38 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.73 2026/04/11 11:39:51 wiz Exp $
+$NetBSD: distinfo,v 1.74 2026/04/16 06:30:38 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_matchers_helpers.py) = cde7c8db46b08e0e804898d1ce177d53e4c41fa8
 SHA1 (patch-meld_melddoc.py) = 9a9e1bc3943b9699013f9b51ed630109d0ea95e6
-SHA1 (patch-meld_vc___vc.py) = 1861c9dec96c6756f4dd0dfa1b2f3bb57bdf0455

Added files:

Index: pkgsrc/devel/meld/patches/patch-meld_matchers_helpers.py
diff -u /dev/null pkgsrc/devel/meld/patches/patch-meld_matchers_helpers.py:1.1
--- /dev/null   Thu Apr 16 06:30:38 2026
+++ pkgsrc/devel/meld/patches/patch-meld_matchers_helpers.py    Thu Apr 16 06:30:38 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-meld_matchers_helpers.py,v 1.1 2026/04/16 06:30:38 wiz Exp $
+
+Another try at closing a file descriptor leak.
+
+--- meld/matchers/helpers.py.orig      2026-04-12 07:49:00.516252865 +0000
++++ meld/matchers/helpers.py
+@@ -76,6 +76,11 @@ class CachedSequenceMatcher:
+                 self.thread.terminate()
+         self.cache = {}
+         self.queued_matches = {}
++        for q in (self.tasks, self.results):
++            try:
++                q.close()
++            except:
++                pass
+ 
+     def match(self, text1, textn, cb):
+         texts = (text1, textn)