CVS commit: pkgsrc/devel/kdiff3

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Nov  3 22:00:42 UTC 2021

Modified Files:
        pkgsrc/devel/kdiff3: Makefile PLIST distinfo

Log Message:
kdiff3: update to 1.9.3

(Upstream change log incomplete in summarized form, highlights for the
1.9 bump follow.)

Version 1.9 - 2021-
===========================
*Rewrite of SourceData::FileData::preprocess now only loops through file contents once.
*Major rework of event handling
  -Move away from event filters where feasible, drop code for events now handled by qt.
  -decentralize handlers
*take advantage of Qt and boost signal/slot pattern to avoid needless nullptr checks.
  -decentralize cut/paste handling
*Introduce LineRef wrapper class
*Add enum types and use existing ones.
  -improves readability of code.
*split out doDirectoryCompare from improveFilenames
  -Principle of least surprise
*Stop mis-using c style [] pointer access there is no documented reason to assume QVector<T> has a
  c-style memory layout. Much less that this will remain so.

Not even going to try to list everything here.

See git history for complete log.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/kdiff3/PLIST
cvs rdiff -u -r1.14 -r1.15 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.76 pkgsrc/devel/kdiff3/Makefile:1.77
--- pkgsrc/devel/kdiff3/Makefile:1.76   Fri Jul 30 12:26:45 2021
+++ pkgsrc/devel/kdiff3/Makefile        Wed Nov  3 22:00:42 2021
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2021/07/30 12:26:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2021/11/03 22:00:42 gutteridge Exp $
 
-VERSION=       1.8.5
-DISTNAME=      kdiff3-${VERSION}
-PKGREVISION=   3
+DISTNAME=      kdiff3-1.9.3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
 EXTRACT_SUFX=  .tar.xz
@@ -13,19 +11,21 @@ COMMENT=    File and directory diff and mer
 LICENSE=       gnu-gpl-v2
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++17
+GCC_REQD+=     7 # C++17
 
 BUILDLINK_TRANSFORM+=  rm:-Wl,--fatal-warnings
 
 BUILD_DEPENDS+=                extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules
 TOOLS_DEPENDS.cmake=   cmake>=3.1:../../devel/cmake
 
+.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.kcoreaddons+=    kcoreaddons>=5.70.0
+BUILDLINK_API_DEPENDS.kcoreaddons+=    kcoreaddons>=5.80.0
 .include "../../devel/kcoreaddons/buildlink3.mk"
 .include "../../devel/kcrash/buildlink3.mk"
 .include "../../devel/kdoctools/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ki18n+=  ki18n>=5.70.0
+BUILDLINK_API_DEPENDS.ki18n+=  ki18n>=5.80.0
 .include "../../devel/ki18n/buildlink3.mk"
 .include "../../devel/kio/buildlink3.mk"
 .include "../../devel/kparts/buildlink3.mk"

Index: pkgsrc/devel/kdiff3/PLIST
diff -u pkgsrc/devel/kdiff3/PLIST:1.8 pkgsrc/devel/kdiff3/PLIST:1.9
--- pkgsrc/devel/kdiff3/PLIST:1.8       Tue Jan 26 00:03:17 2021
+++ pkgsrc/devel/kdiff3/PLIST   Wed Nov  3 22:00:42 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2021/01/26 00:03:17 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/11/03 22:00:42 gutteridge Exp $
 bin/kdiff3
 lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
 lib/plugins/kf5/parts/kdiff3part.so
@@ -47,7 +47,6 @@ share/icons/hicolor/32x32/apps/kdiff3.pn
 share/icons/hicolor/48x48/apps/kdiff3.png
 share/icons/hicolor/64x64/apps/kdiff3.png
 share/icons/hicolor/scalable/apps/kdiff3.svgz
-share/kservices5/kdiff3part.desktop
 share/kxmlgui5/kdiff3/kdiff3_shell.rc
 share/kxmlgui5/kdiff3part/kdiff3_part.rc
 share/locale/ar/LC_MESSAGES/kdiff3.mo
@@ -148,6 +147,7 @@ share/locale/rw/LC_MESSAGES/kdiff3.mo
 share/locale/sk/LC_MESSAGES/diff_ext.mo
 share/locale/sk/LC_MESSAGES/kdiff3.mo
 share/locale/sk/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sl/LC_MESSAGES/diff_ext.mo
 share/locale/sl/LC_MESSAGES/kdiff3.mo
 share/locale/sl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/sr/LC_MESSAGES/kdiff3.mo

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.14 pkgsrc/devel/kdiff3/distinfo:1.15
--- pkgsrc/devel/kdiff3/distinfo:1.14   Tue Oct 26 10:15:10 2021
+++ pkgsrc/devel/kdiff3/distinfo        Wed Nov  3 22:00:42 2021
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:15:10 nia Exp $
+$NetBSD: distinfo,v 1.15 2021/11/03 22:00:42 gutteridge Exp $
 
-BLAKE2s (kdiff3-1.8.5.tar.xz) = 61146f13ab39cee5deb640dde9119efb9ee06feacbcfea32e574fbce59d696f3
-SHA512 (kdiff3-1.8.5.tar.xz) = 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
-Size (kdiff3-1.8.5.tar.xz) = 1045812 bytes
+BLAKE2s (kdiff3-1.9.3.tar.xz) = e33c00d7c0703fabfe903303e88de4471c074bae6636b6a2f85ed8368f247103
+SHA512 (kdiff3-1.9.3.tar.xz) = 9d806efa5d92375bc0dd2014492e924a7f26c12fde0e89bb58f076a249dba83fd316253cfd53235eaaae26f29d37c730c5728de1c7de869532fc9c38190412d5
+Size (kdiff3-1.9.3.tar.xz) = 1056920 bytes