CVS commit: pkgsrc/devel/kdiff3

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jun 19 17:39:54 UTC 2020

Modified Files:
        pkgsrc/devel/kdiff3: Makefile PLIST distinfo
Removed Files:
        pkgsrc/devel/kdiff3/patches: patch-src_directorymergewindow.cpp
            patch-src_guiutils.h patch-src_kdiff3.cpp
            patch-src_mergeresultwindow.cpp patch-src_mergeresultwindow.h
            patch-src_pdiff.cpp patch-src_smalldialogs.cpp

Log Message:
kdiff3: update to 1.8.2

Change log (which may be incomplete):
Version 1.8.2 - 2020-03-29
===========================
Bug 411472 Allowing editing of blank lines and don't mark newly intserted lines as a confilict
2ba20222 - Remove broken attempt to optimize drawing on horizonal scroll.
Bug 418813 - Fix line numbers not shown. Use QString::number directly not through a format string.
11e93232 - Correcly support "Print Current Page"
64804a64 - Don't attempt to free nullptr in SourceData::FileData::reset()
f4c66ace - Make Preferance dialog panes scrollable if too large to fit on screen.
de06e561 - Fix dialog filter on windows.
e8d06774 - Switch to QElapsedTime for timing avoids explictly undefined behavior inside qt if time is changed.
05e2d6fb - Fix sync mode.
f9bd88a1 - Make matching in CvsIngnoreList always honor bCaseSensitive setting.
418ea78c - Don't use temporary with QLatin1String constructor strange things will happen.
b058c060 - ignore over size cvsignore files
Bug 410962 - Fix '-L' parameter handling
b4b2c970 - Restore acciedently deleted --auto option
Bug 411602 - Fixing missing menu items also resolves a potiential crash in MergeResultWindow::slotUpdateAvailabilities (Bug 407745).
d4239b92 - Prevent intermient crash during reload/refresh
Bug 410008 - Show diff for empty/missing files.
3bb755c5 - Don't give false error when comparing empty folders
Bug 408991 - 4ad69790,0737cc3e,0402f84a - Close files when not in use - Fixes "Too many open files" bug.
Bug 407829 - Avoid crash when recieving mouse or key events during earily startup.
cc6d76e3 - Don't try to manually build url if parent is not set.
85052379 - Fix crash when canceling by using only one event loop in ProgressDialog.
d151f151 - Don't append to already complete url.
d3cb2def - Fix manual url building in FileAccess::setFromUdsEntry  - scheme should not change now.
Bug 405918 - Fix craft install instructions for windows
Bug 411586 - Fix crash in OptionDialog::slotApply()
Bug 407745 - Fix crash in MergeResultWindow::slotUpdateAvailabilities
Bug 407894,399070 - Fixed redraw for horizonal scrolling.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/kdiff3/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/kdiff3/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/kdiff3/patches/patch-src_directorymergewindow.cpp \
    pkgsrc/devel/kdiff3/patches/patch-src_guiutils.h \
    pkgsrc/devel/kdiff3/patches/patch-src_kdiff3.cpp \
    pkgsrc/devel/kdiff3/patches/patch-src_mergeresultwindow.cpp \
    pkgsrc/devel/kdiff3/patches/patch-src_mergeresultwindow.h \
    pkgsrc/devel/kdiff3/patches/patch-src_pdiff.cpp \
    pkgsrc/devel/kdiff3/patches/patch-src_smalldialogs.cpp

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.65 pkgsrc/devel/kdiff3/Makefile:1.66
--- pkgsrc/devel/kdiff3/Makefile:1.65   Tue Jun  2 08:23:38 2020
+++ pkgsrc/devel/kdiff3/Makefile        Fri Jun 19 17:39:54 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2020/06/02 08:23:38 adam Exp $
+# $NetBSD: Makefile,v 1.66 2020/06/19 17:39:54 gutteridge Exp $
 
-VERSION=       1.8.1
-PKGREVISION=   7
+VERSION=       1.8.2
 DISTNAME=      kdiff3-${VERSION}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
@@ -18,7 +17,7 @@ USE_LANGUAGES=        c c++
 BUILDLINK_TRANSFORM+=  rm:-Wl,--fatal-warnings
 
 BUILD_DEPENDS+=                extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules
-TOOLS_DEPENDS.cmake=   cmake>=3.0:../../devel/cmake
+TOOLS_DEPENDS.cmake=   cmake>=3.1:../../devel/cmake
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.kcoreaddons+=    kcoreaddons>=5.61.0

Index: pkgsrc/devel/kdiff3/PLIST
diff -u pkgsrc/devel/kdiff3/PLIST:1.5 pkgsrc/devel/kdiff3/PLIST:1.6
--- pkgsrc/devel/kdiff3/PLIST:1.5       Sun Nov  3 02:19:16 2019
+++ pkgsrc/devel/kdiff3/PLIST   Fri Jun 19 17:39:54 2020
@@ -1,13 +1,22 @@
-@comment $NetBSD: PLIST,v 1.5 2019/11/03 02:19:16 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/06/19 17:39:54 gutteridge Exp $
 bin/kdiff3
 lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
 lib/plugins/kf5/parts/kdiff3part.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/sv/man1/kdiff3.1
 man/uk/man1/kdiff3.1
 share/applications/org.kde.kdiff3.desktop
+share/doc/HTML/ca/kdiff3/index.cache.bz2
+share/doc/HTML/ca/kdiff3/index.docbook
+share/doc/HTML/ca/kdiff3/letter_by_letter.png
+share/doc/HTML/ca/kdiff3/open_dialog.png
+share/doc/HTML/de/kdiff3/index.cache.bz2
+share/doc/HTML/de/kdiff3/index.docbook
 share/doc/HTML/en/kdiff3/dirbrowser.png
 share/doc/HTML/en/kdiff3/dirmergebig.png
 share/doc/HTML/en/kdiff3/index.cache.bz2
@@ -21,10 +30,14 @@ share/doc/HTML/en/kdiff3/screenshot_diff
 share/doc/HTML/en/kdiff3/screenshot_merge.png
 share/doc/HTML/en/kdiff3/triple_diff.png
 share/doc/HTML/en/kdiff3/white_space.png
+share/doc/HTML/es/kdiff3/index.cache.bz2
+share/doc/HTML/es/kdiff3/index.docbook
 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/sv/kdiff3/index.cache.bz2
+share/doc/HTML/sv/kdiff3/index.docbook
 share/doc/HTML/uk/kdiff3/index.cache.bz2
 share/doc/HTML/uk/kdiff3/index.docbook
 share/icons/hicolor/128x128/apps/kdiff3.png
@@ -86,6 +99,9 @@ share/locale/hne/LC_MESSAGES/kdiff3.mo
 share/locale/hr/LC_MESSAGES/kdiff3.mo
 share/locale/hu/LC_MESSAGES/kdiff3.mo
 share/locale/hu/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ia/LC_MESSAGES/diff_ext.mo
+share/locale/ia/LC_MESSAGES/kdiff3.mo
+share/locale/ia/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/is/LC_MESSAGES/kdiff3.mo
 share/locale/it/LC_MESSAGES/diff_ext.mo
 share/locale/it/LC_MESSAGES/kdiff3.mo

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.9 pkgsrc/devel/kdiff3/distinfo:1.10
--- pkgsrc/devel/kdiff3/distinfo:1.9    Thu Jan 16 02:37:30 2020
+++ pkgsrc/devel/kdiff3/distinfo        Fri Jun 19 17:39:54 2020
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.9 2020/01/16 02:37:30 gutteridge Exp $
+$NetBSD: distinfo,v 1.10 2020/06/19 17:39:54 gutteridge Exp $
 
-SHA1 (kdiff3-1.8.1.tar.xz) = cfb63e7fb8ef81e9ebc0ae47d6922f25a32a1ef9
-RMD160 (kdiff3-1.8.1.tar.xz) = b5076a50461f3612071aa08732c1d7c3b5ec5d8b
-SHA512 (kdiff3-1.8.1.tar.xz) = 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
-Size (kdiff3-1.8.1.tar.xz) = 897692 bytes
-SHA1 (patch-src_directorymergewindow.cpp) = a2b429584e30467501ccadbc9266ffbf05250900
-SHA1 (patch-src_guiutils.h) = 82bb9629ce73057beb5e81cac031ef9b881d90ab
-SHA1 (patch-src_kdiff3.cpp) = d5c497d02064f716ea8a26521061605477fd9272
-SHA1 (patch-src_mergeresultwindow.cpp) = c7da5bcc2f9834a48e1fdd90d070295c6dc62332
-SHA1 (patch-src_mergeresultwindow.h) = 22412d26ff9879abd4759387fbd3fd195593b028
-SHA1 (patch-src_pdiff.cpp) = d88157d208116c63cbd7cc85b96a2717bd675a80
-SHA1 (patch-src_smalldialogs.cpp) = d189a1631ba5bed1d794babb11764eff40efcf07
+SHA1 (kdiff3-1.8.2.tar.xz) = a0ade8bc56ec4a01ef0a42ad08a165914986cd61
+RMD160 (kdiff3-1.8.2.tar.xz) = 953f3b6e3cc8cbd0b8a31e7142e044a1c64a36bc
+SHA512 (kdiff3-1.8.2.tar.xz) = c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
+Size (kdiff3-1.8.2.tar.xz) = 1039304 bytes