CVS commit: pkgsrc/devel/kdiff3

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue May 30 00:12:25 UTC 2023

Modified Files:
        pkgsrc/devel/kdiff3: Makefile distinfo

Log Message:
kdiff3: update to 1.10.4

Version 1.10.4 - 2023
=====================
*Fixed no UI shown for failed auto-merge.

Version 1.10.3 - 2023
===========================
*Fix 469817 no text if word wrap is on.

Version 1.10.2 - 2023
===========================
*Prevent false error due to faulty check when m_pOptions->m_bDiff3AlignBC = true
*468492 fix crash when word wrap enabled
*Rework KDiff3App::completeInit to avoid crash on exit in auto mode


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/kdiff3/distinfo

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

Modified files:

Index: pkgsrc/devel/kdiff3/Makefile
diff -u pkgsrc/devel/kdiff3/Makefile:1.95 pkgsrc/devel/kdiff3/Makefile:1.96
--- pkgsrc/devel/kdiff3/Makefile:1.95   Mon May 22 21:00:20 2023
+++ pkgsrc/devel/kdiff3/Makefile        Tue May 30 00:12:25 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2023/05/22 21:00:20 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2023/05/30 00:12:25 gutteridge Exp $
 
-DISTNAME=      kdiff3-1.10.1
-PKGREVISION=   3
+DISTNAME=      kdiff3-1.10.4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.20 pkgsrc/devel/kdiff3/distinfo:1.21
--- pkgsrc/devel/kdiff3/distinfo:1.20   Sun Apr  9 00:17:53 2023
+++ pkgsrc/devel/kdiff3/distinfo        Tue May 30 00:12:25 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2023/04/09 00:17:53 gutteridge Exp $
+$NetBSD: distinfo,v 1.21 2023/05/30 00:12:25 gutteridge Exp $
 
-BLAKE2s (kdiff3-1.10.1.tar.xz) = 68d2deb35cc394482c087b6a9eff78a2c7e5d5562b8ecfa519a7d1acadb19773
-SHA512 (kdiff3-1.10.1.tar.xz) = d1a92bb86c6ba77bda9a33c5ab6da7456775bf5281e4ce0dc391c5671de71b3e34669e9fdcce1af8090c91b4f84cf954b6ae73497924aaf7ca181eff5e594b15
-Size (kdiff3-1.10.1.tar.xz) = 1111276 bytes
+BLAKE2s (kdiff3-1.10.4.tar.xz) = bed54053916917fe666fe21a69d49930d41321a5a32cc012cc043b78a576bd4f
+SHA512 (kdiff3-1.10.4.tar.xz) = 42bbe2d3896c7d4718b4c98b09dc1c6e13fc960ffdedf593d59d9250db2c2a30b23d6951855fd0039b675291bf04232d13af5697441e6a9afa6ea5e6450aed9c
+Size (kdiff3-1.10.4.tar.xz) = 1112620 bytes