CVS commit: pkgsrc/devel/kdiff3

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb  7 09:24:31 UTC 2025

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

Log Message:
kdiff3: update to 1.12.0.

Version 1.12.0 - 2024
=========================

*Completed port away from Qt5, 6.6 now required version due to delayed ICU support in Qt
*Fixed UTF-8-BOM output encoding issues mustly seen on windows.
*horizontal scroll correctly comptuted for diff windows
--Note due to changes in windows/Qt the scrollbars may be vary small or hidden on Windows 11. This cann't be controlled from kdiff3.
*False errors on first launch with files selected should be fixed.

Version 1.11.x - 2024
===========================
*Fix false memory error when using "admin://" protocol
*Cleanup BOM handling lock detection to only known UTF-* encodings that use it.
*Fix bugged connection to non-existent signal (This is why we now use new style connections only.)
*fix crash in  Diff3Line::getLineData when doing history check for nonexistent lines.
*fix crash on some setups that create 0 height widgets when no data is loaded.
*Fixed encoding handling for non-UTF encodings
*Fixed encoding detection for lower case 'HTML' and 'XML' tags
*Fix handling of KIO jobs for non-file urls.
-Actually wait for secondary event loop to end (Not sure if this is documention bug in qt or behavior bug.)
-Don't arbitrarily kill jobs when progress dialog is hidden.
*Fix possible invalid line given by mousedown in Overview pane. (Caught by SafeInt range checking)
*Fix bad algorithm in getBestFirstLine.
-Related regression also fixed (BUG:486909)
*craft based builds are now Qt6/kf6.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/kdiff3/PLIST
cvs rdiff -u -r1.24 -r1.25 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.113 pkgsrc/devel/kdiff3/Makefile:1.114
--- pkgsrc/devel/kdiff3/Makefile:1.113  Thu Jan 23 23:27:25 2025
+++ pkgsrc/devel/kdiff3/Makefile        Fri Feb  7 09:24:31 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.113 2025/01/23 23:27:25 riastradh Exp $
+# $NetBSD: Makefile,v 1.114 2025/02/07 09:24:31 wiz Exp $
 
-DISTNAME=      kdiff3-1.10.7
-PKGREVISION=   7
+DISTNAME=      kdiff3-1.12.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,31 +10,26 @@ HOMEPAGE=   https://kde.org/applications/d
 COMMENT=       File and directory diff and merge tool
 LICENSE=       gnu-gpl-v2
 
-USE_CMAKE=     yes
-USE_LANGUAGES= c c++
-
-# Upstream states GCC < 8.2 support is "best effort only"; it is presently
-# confirmed to work without issue on NetBSD 9.x with GCC 7.5.
+USE_LANGUAGES=         c c++
+# upstream states GCC < 9.2 support is "best effort only"
 USE_CXX_FEATURES+=     c++17
+CMAKE_REQD+=           3.1
 
 BUILDLINK_TRANSFORM+=  rm:-Wl,--fatal-warnings
 
-TOOLS_DEPENDS.cmake=   cmake>=3.1:../../devel/cmake
-
+.include "../../devel/cmake/build.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
-BUILDLINK_API_DEPENDS.extra-cmake-modules+=    extra-cmake-modules>=5.10.0
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/extra-cmake-modules/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-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.80.0
-.include "../../devel/ki18n/buildlink3.mk"
-.include "../../devel/kio/buildlink3.mk"
-.include "../../devel/kparts/buildlink3.mk"
+.include "../../devel/kf6-kconfig/buildlink3.mk"
+.include "../../devel/kf6-kcoreaddons/buildlink3.mk"
+.include "../../devel/kf6-kcrash/buildlink3.mk"
+.include "../../devel/kf6-ki18n/buildlink3.mk"
+.include "../../devel/kf6-kio/buildlink3.mk"
+.include "../../devel/qt6-qt5compat/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/kiconthemes/buildlink3.mk"
-.include "../../x11/kwidgetsaddons/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/kf6-kwidgetsaddons/buildlink3.mk"
+.include "../../x11/kf6-kxmlgui/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/kdiff3/PLIST
diff -u pkgsrc/devel/kdiff3/PLIST:1.13 pkgsrc/devel/kdiff3/PLIST:1.14
--- pkgsrc/devel/kdiff3/PLIST:1.13      Thu Dec 14 22:47:05 2023
+++ pkgsrc/devel/kdiff3/PLIST   Fri Feb  7 09:24:31 2025
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.13 2023/12/14 22:47:05 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/02/07 09:24:31 wiz Exp $
 bin/kdiff3
-lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
-lib/plugins/kf5/parts/kdiff3part.so
+lib/plugins/kf6/kfileitemaction/kdiff3fileitemaction.so
 man/ca/man1/kdiff3.1
 man/de/man1/kdiff3.1
 man/es/man1/kdiff3.1
 man/it/man1/kdiff3.1
 man/man1/kdiff3.1
 man/nl/man1/kdiff3.1
+man/sl/man1/kdiff3.1
 man/sv/man1/kdiff3.1
 man/uk/man1/kdiff3.1
 share/applications/org.kde.kdiff3.desktop
@@ -35,6 +35,10 @@ share/doc/HTML/it/kdiff3/index.cache.bz2
 share/doc/HTML/it/kdiff3/index.docbook
 share/doc/HTML/nl/kdiff3/index.cache.bz2
 share/doc/HTML/nl/kdiff3/index.docbook
+share/doc/HTML/pt/kdiff3/index.cache.bz2
+share/doc/HTML/pt/kdiff3/index.docbook
+share/doc/HTML/sl/kdiff3/index.cache.bz2
+share/doc/HTML/sl/kdiff3/index.docbook
 share/doc/HTML/sv/kdiff3/index.cache.bz2
 share/doc/HTML/sv/kdiff3/index.docbook
 share/doc/HTML/uk/kdiff3/index.cache.bz2
@@ -47,10 +51,10 @@ 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
+share/locale/ast/LC_MESSAGES/diff_ext.mo
+share/locale/ast/LC_MESSAGES/kdiff3.mo
+share/locale/ast/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/bg/LC_MESSAGES/diff_ext.mo
 share/locale/bg/LC_MESSAGES/kdiff3.mo
 share/locale/bg/LC_MESSAGES/kdiff3fileitemactionplugin.mo
@@ -101,6 +105,9 @@ share/locale/ga/LC_MESSAGES/kdiff3fileit
 share/locale/gl/LC_MESSAGES/diff_ext.mo
 share/locale/gl/LC_MESSAGES/kdiff3.mo
 share/locale/gl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/he/LC_MESSAGES/diff_ext.mo
+share/locale/he/LC_MESSAGES/kdiff3.mo
+share/locale/he/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/hi/LC_MESSAGES/kdiff3.mo
 share/locale/hne/LC_MESSAGES/kdiff3.mo
 share/locale/hr/LC_MESSAGES/kdiff3.mo
@@ -125,6 +132,7 @@ share/locale/ka/LC_MESSAGES/kdiff3fileit
 share/locale/ko/LC_MESSAGES/diff_ext.mo
 share/locale/ko/LC_MESSAGES/kdiff3.mo
 share/locale/ko/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/lt/LC_MESSAGES/diff_ext.mo
 share/locale/lt/LC_MESSAGES/kdiff3.mo
 share/locale/lt/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/mai/LC_MESSAGES/kdiff3.mo

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.24 pkgsrc/devel/kdiff3/distinfo:1.25
--- pkgsrc/devel/kdiff3/distinfo:1.24   Thu Dec 14 22:47:05 2023
+++ pkgsrc/devel/kdiff3/distinfo        Fri Feb  7 09:24:31 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.24 2023/12/14 22:47:05 gutteridge Exp $
+$NetBSD: distinfo,v 1.25 2025/02/07 09:24:31 wiz Exp $
 
-BLAKE2s (kdiff3-1.10.7.tar.xz) = 88de36f58c21cf25d15a7637cd7c4629eb3093da435c42dc9a11a5bf174c4ee4
-SHA512 (kdiff3-1.10.7.tar.xz) = ab7ce8312014de200bcc613be1a28b384289f96be08d7f2e1e640b202cede3bbfeffa7b3e53b605f8edf9be2368d2aa6c6b5ee4501577ed8560ca1c4704802db
-Size (kdiff3-1.10.7.tar.xz) = 1131116 bytes
+BLAKE2s (kdiff3-1.12.0.tar.xz) = 8039e23394f68e42ca8925d32f2eaee8d066c635490005cb3f8a27987225bf76
+SHA512 (kdiff3-1.12.0.tar.xz) = d409f3be076ee2a4a736c201fe7b509304b29a843490b6e60b5f2e221dc34c5d78ba717e08c4ce053f9af28c6750c600658a84853e0ed5591161320e3bcef631
+Size (kdiff3-1.12.0.tar.xz) = 1204256 bytes