Fri Jun 19 17:39:54 2020 UTC ()
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.


(gutteridge)
diff -r1.65 -r1.66 pkgsrc/devel/kdiff3/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/kdiff3/PLIST
diff -r1.9 -r1.10 pkgsrc/devel/kdiff3/distinfo
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_directorymergewindow.cpp
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_guiutils.h
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_kdiff3.cpp
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_mergeresultwindow.cpp
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_mergeresultwindow.h
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_pdiff.cpp
diff -r1.1 -r0 pkgsrc/devel/kdiff3/patches/patch-src_smalldialogs.cpp
cvs diff -r1.65 -r1.66 pkgsrc/devel/kdiff3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/kdiff3/Makefile 2020/06/02 08:23:38 1.65
+++ pkgsrc/devel/kdiff3/Makefile 2020/06/19 17:39:54 1.66
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.65 2020/06/02 08:23:38 adam Exp $ 1# $NetBSD: Makefile,v 1.66 2020/06/19 17:39:54 gutteridge Exp $
2 2
3VERSION= 1.8.1 3VERSION= 1.8.2
4PKGREVISION= 7 
5DISTNAME= kdiff3-${VERSION} 4DISTNAME= kdiff3-${VERSION}
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_KDE:=kdiff3/} 6MASTER_SITES= ${MASTER_SITE_KDE:=kdiff3/}
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://kde.org/applications/development/org.kde.kdiff3 10HOMEPAGE= https://kde.org/applications/development/org.kde.kdiff3
12COMMENT= File and directory diff and merge tool 11COMMENT= File and directory diff and merge tool
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15USE_CMAKE= yes 14USE_CMAKE= yes
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17 16
18BUILDLINK_TRANSFORM+= rm:-Wl,--fatal-warnings 17BUILDLINK_TRANSFORM+= rm:-Wl,--fatal-warnings
19 18
20BUILD_DEPENDS+= extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules 19BUILD_DEPENDS+= extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules
21TOOLS_DEPENDS.cmake= cmake>=3.0:../../devel/cmake 20TOOLS_DEPENDS.cmake= cmake>=3.1:../../devel/cmake
22 21
23.include "../../devel/gettext-lib/buildlink3.mk" 22.include "../../devel/gettext-lib/buildlink3.mk"
24BUILDLINK_API_DEPENDS.kcoreaddons+= kcoreaddons>=5.61.0 23BUILDLINK_API_DEPENDS.kcoreaddons+= kcoreaddons>=5.61.0
25.include "../../devel/kcoreaddons/buildlink3.mk" 24.include "../../devel/kcoreaddons/buildlink3.mk"
26.include "../../devel/kcrash/buildlink3.mk" 25.include "../../devel/kcrash/buildlink3.mk"
27.include "../../devel/kdoctools/buildlink3.mk" 26.include "../../devel/kdoctools/buildlink3.mk"
28BUILDLINK_API_DEPENDS.ki18n+= ki18n>=5.61.0 27BUILDLINK_API_DEPENDS.ki18n+= ki18n>=5.61.0
29.include "../../devel/ki18n/buildlink3.mk" 28.include "../../devel/ki18n/buildlink3.mk"
30.include "../../devel/kio/buildlink3.mk" 29.include "../../devel/kio/buildlink3.mk"
31.include "../../devel/kparts/buildlink3.mk" 30.include "../../devel/kparts/buildlink3.mk"
32.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 31.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../graphics/kiconthemes/buildlink3.mk" 32.include "../../graphics/kiconthemes/buildlink3.mk"
34.include "../../x11/kwidgetsaddons/buildlink3.mk" 33.include "../../x11/kwidgetsaddons/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/devel/kdiff3/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/kdiff3/PLIST 2019/11/03 02:19:16 1.5
+++ pkgsrc/devel/kdiff3/PLIST 2020/06/19 17:39:54 1.6
@@ -1,40 +1,53 @@ @@ -1,40 +1,53 @@
1@comment $NetBSD: PLIST,v 1.5 2019/11/03 02:19:16 gutteridge Exp $ 1@comment $NetBSD: PLIST,v 1.6 2020/06/19 17:39:54 gutteridge Exp $
2bin/kdiff3 2bin/kdiff3
3lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so 3lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
4lib/plugins/kf5/parts/kdiff3part.so 4lib/plugins/kf5/parts/kdiff3part.so
 5man/ca/man1/kdiff3.1
5man/de/man1/kdiff3.1 6man/de/man1/kdiff3.1
 7man/es/man1/kdiff3.1
6man/it/man1/kdiff3.1 8man/it/man1/kdiff3.1
7man/man1/kdiff3.1 9man/man1/kdiff3.1
8man/nl/man1/kdiff3.1 10man/nl/man1/kdiff3.1
 11man/sv/man1/kdiff3.1
9man/uk/man1/kdiff3.1 12man/uk/man1/kdiff3.1
10share/applications/org.kde.kdiff3.desktop 13share/applications/org.kde.kdiff3.desktop
 14share/doc/HTML/ca/kdiff3/index.cache.bz2
 15share/doc/HTML/ca/kdiff3/index.docbook
 16share/doc/HTML/ca/kdiff3/letter_by_letter.png
 17share/doc/HTML/ca/kdiff3/open_dialog.png
 18share/doc/HTML/de/kdiff3/index.cache.bz2
 19share/doc/HTML/de/kdiff3/index.docbook
11share/doc/HTML/en/kdiff3/dirbrowser.png 20share/doc/HTML/en/kdiff3/dirbrowser.png
12share/doc/HTML/en/kdiff3/dirmergebig.png 21share/doc/HTML/en/kdiff3/dirmergebig.png
13share/doc/HTML/en/kdiff3/index.cache.bz2 22share/doc/HTML/en/kdiff3/index.cache.bz2
14share/doc/HTML/en/kdiff3/index.docbook 23share/doc/HTML/en/kdiff3/index.docbook
15share/doc/HTML/en/kdiff3/iteminfo.png 24share/doc/HTML/en/kdiff3/iteminfo.png
16share/doc/HTML/en/kdiff3/letter_by_letter.png 25share/doc/HTML/en/kdiff3/letter_by_letter.png
17share/doc/HTML/en/kdiff3/merge_current.png 26share/doc/HTML/en/kdiff3/merge_current.png
18share/doc/HTML/en/kdiff3/new.png 27share/doc/HTML/en/kdiff3/new.png
19share/doc/HTML/en/kdiff3/open_dialog.png 28share/doc/HTML/en/kdiff3/open_dialog.png
20share/doc/HTML/en/kdiff3/screenshot_diff.png 29share/doc/HTML/en/kdiff3/screenshot_diff.png
21share/doc/HTML/en/kdiff3/screenshot_merge.png 30share/doc/HTML/en/kdiff3/screenshot_merge.png
22share/doc/HTML/en/kdiff3/triple_diff.png 31share/doc/HTML/en/kdiff3/triple_diff.png
23share/doc/HTML/en/kdiff3/white_space.png 32share/doc/HTML/en/kdiff3/white_space.png
 33share/doc/HTML/es/kdiff3/index.cache.bz2
 34share/doc/HTML/es/kdiff3/index.docbook
24share/doc/HTML/it/kdiff3/index.cache.bz2 35share/doc/HTML/it/kdiff3/index.cache.bz2
25share/doc/HTML/it/kdiff3/index.docbook 36share/doc/HTML/it/kdiff3/index.docbook
26share/doc/HTML/nl/kdiff3/index.cache.bz2 37share/doc/HTML/nl/kdiff3/index.cache.bz2
27share/doc/HTML/nl/kdiff3/index.docbook 38share/doc/HTML/nl/kdiff3/index.docbook
 39share/doc/HTML/sv/kdiff3/index.cache.bz2
 40share/doc/HTML/sv/kdiff3/index.docbook
28share/doc/HTML/uk/kdiff3/index.cache.bz2 41share/doc/HTML/uk/kdiff3/index.cache.bz2
29share/doc/HTML/uk/kdiff3/index.docbook 42share/doc/HTML/uk/kdiff3/index.docbook
30share/icons/hicolor/128x128/apps/kdiff3.png 43share/icons/hicolor/128x128/apps/kdiff3.png
31share/icons/hicolor/16x16/apps/kdiff3.png 44share/icons/hicolor/16x16/apps/kdiff3.png
32share/icons/hicolor/22x22/apps/kdiff3.png 45share/icons/hicolor/22x22/apps/kdiff3.png
33share/icons/hicolor/256x256/apps/kdiff3.png 46share/icons/hicolor/256x256/apps/kdiff3.png
34share/icons/hicolor/32x32/apps/kdiff3.png 47share/icons/hicolor/32x32/apps/kdiff3.png
35share/icons/hicolor/48x48/apps/kdiff3.png 48share/icons/hicolor/48x48/apps/kdiff3.png
36share/icons/hicolor/64x64/apps/kdiff3.png 49share/icons/hicolor/64x64/apps/kdiff3.png
37share/icons/hicolor/scalable/apps/kdiff3.svgz 50share/icons/hicolor/scalable/apps/kdiff3.svgz
38share/kservices5/kdiff3part.desktop 51share/kservices5/kdiff3part.desktop
39share/kxmlgui5/kdiff3/kdiff3_shell.rc 52share/kxmlgui5/kdiff3/kdiff3_shell.rc
40share/kxmlgui5/kdiff3part/kdiff3_part.rc 53share/kxmlgui5/kdiff3part/kdiff3_part.rc
@@ -76,26 +89,29 @@ share/locale/fi/LC_MESSAGES/kdiff3fileit @@ -76,26 +89,29 @@ share/locale/fi/LC_MESSAGES/kdiff3fileit
76share/locale/fr/LC_MESSAGES/diff_ext.mo 89share/locale/fr/LC_MESSAGES/diff_ext.mo
77share/locale/fr/LC_MESSAGES/kdiff3.mo 90share/locale/fr/LC_MESSAGES/kdiff3.mo
78share/locale/fr/LC_MESSAGES/kdiff3fileitemactionplugin.mo 91share/locale/fr/LC_MESSAGES/kdiff3fileitemactionplugin.mo
79share/locale/ga/LC_MESSAGES/kdiff3.mo 92share/locale/ga/LC_MESSAGES/kdiff3.mo
80share/locale/ga/LC_MESSAGES/kdiff3fileitemactionplugin.mo 93share/locale/ga/LC_MESSAGES/kdiff3fileitemactionplugin.mo
81share/locale/gl/LC_MESSAGES/diff_ext.mo 94share/locale/gl/LC_MESSAGES/diff_ext.mo
82share/locale/gl/LC_MESSAGES/kdiff3.mo 95share/locale/gl/LC_MESSAGES/kdiff3.mo
83share/locale/gl/LC_MESSAGES/kdiff3fileitemactionplugin.mo 96share/locale/gl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
84share/locale/hi/LC_MESSAGES/kdiff3.mo 97share/locale/hi/LC_MESSAGES/kdiff3.mo
85share/locale/hne/LC_MESSAGES/kdiff3.mo 98share/locale/hne/LC_MESSAGES/kdiff3.mo
86share/locale/hr/LC_MESSAGES/kdiff3.mo 99share/locale/hr/LC_MESSAGES/kdiff3.mo
87share/locale/hu/LC_MESSAGES/kdiff3.mo 100share/locale/hu/LC_MESSAGES/kdiff3.mo
88share/locale/hu/LC_MESSAGES/kdiff3fileitemactionplugin.mo 101share/locale/hu/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 102share/locale/ia/LC_MESSAGES/diff_ext.mo
 103share/locale/ia/LC_MESSAGES/kdiff3.mo
 104share/locale/ia/LC_MESSAGES/kdiff3fileitemactionplugin.mo
89share/locale/is/LC_MESSAGES/kdiff3.mo 105share/locale/is/LC_MESSAGES/kdiff3.mo
90share/locale/it/LC_MESSAGES/diff_ext.mo 106share/locale/it/LC_MESSAGES/diff_ext.mo
91share/locale/it/LC_MESSAGES/kdiff3.mo 107share/locale/it/LC_MESSAGES/kdiff3.mo
92share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo 108share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo
93share/locale/ja/LC_MESSAGES/diff_ext.mo 109share/locale/ja/LC_MESSAGES/diff_ext.mo
94share/locale/ja/LC_MESSAGES/kdiff3.mo 110share/locale/ja/LC_MESSAGES/kdiff3.mo
95share/locale/ja/LC_MESSAGES/kdiff3fileitemactionplugin.mo 111share/locale/ja/LC_MESSAGES/kdiff3fileitemactionplugin.mo
96share/locale/ka/LC_MESSAGES/kdiff3.mo 112share/locale/ka/LC_MESSAGES/kdiff3.mo
97share/locale/ko/LC_MESSAGES/diff_ext.mo 113share/locale/ko/LC_MESSAGES/diff_ext.mo
98share/locale/ko/LC_MESSAGES/kdiff3.mo 114share/locale/ko/LC_MESSAGES/kdiff3.mo
99share/locale/ko/LC_MESSAGES/kdiff3fileitemactionplugin.mo 115share/locale/ko/LC_MESSAGES/kdiff3fileitemactionplugin.mo
100share/locale/lt/LC_MESSAGES/kdiff3.mo 116share/locale/lt/LC_MESSAGES/kdiff3.mo
101share/locale/lt/LC_MESSAGES/kdiff3fileitemactionplugin.mo 117share/locale/lt/LC_MESSAGES/kdiff3fileitemactionplugin.mo
cvs diff -r1.9 -r1.10 pkgsrc/devel/kdiff3/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/kdiff3/distinfo 2020/01/16 02:37:30 1.9
+++ pkgsrc/devel/kdiff3/distinfo 2020/06/19 17:39:54 1.10
@@ -1,13 +1,6 @@ @@ -1,13 +1,6 @@
1$NetBSD: distinfo,v 1.9 2020/01/16 02:37:30 gutteridge Exp $ 1$NetBSD: distinfo,v 1.10 2020/06/19 17:39:54 gutteridge Exp $
2 2
3SHA1 (kdiff3-1.8.1.tar.xz) = cfb63e7fb8ef81e9ebc0ae47d6922f25a32a1ef9 3SHA1 (kdiff3-1.8.2.tar.xz) = a0ade8bc56ec4a01ef0a42ad08a165914986cd61
4RMD160 (kdiff3-1.8.1.tar.xz) = b5076a50461f3612071aa08732c1d7c3b5ec5d8b 4RMD160 (kdiff3-1.8.2.tar.xz) = 953f3b6e3cc8cbd0b8a31e7142e044a1c64a36bc
5SHA512 (kdiff3-1.8.1.tar.xz) = 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720 5SHA512 (kdiff3-1.8.2.tar.xz) = c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
6Size (kdiff3-1.8.1.tar.xz) = 897692 bytes 6Size (kdiff3-1.8.2.tar.xz) = 1039304 bytes
7SHA1 (patch-src_directorymergewindow.cpp) = a2b429584e30467501ccadbc9266ffbf05250900 
8SHA1 (patch-src_guiutils.h) = 82bb9629ce73057beb5e81cac031ef9b881d90ab 
9SHA1 (patch-src_kdiff3.cpp) = d5c497d02064f716ea8a26521061605477fd9272 
10SHA1 (patch-src_mergeresultwindow.cpp) = c7da5bcc2f9834a48e1fdd90d070295c6dc62332 
11SHA1 (patch-src_mergeresultwindow.h) = 22412d26ff9879abd4759387fbd3fd195593b028 
12SHA1 (patch-src_pdiff.cpp) = d88157d208116c63cbd7cc85b96a2717bd675a80 
13SHA1 (patch-src_smalldialogs.cpp) = d189a1631ba5bed1d794babb11764eff40efcf07 
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_directorymergewindow.cpp
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_guiutils.h
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_kdiff3.cpp
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_mergeresultwindow.cpp
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_mergeresultwindow.h
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_pdiff.cpp
File Deleted: pkgsrc/devel/kdiff3/patches/Attic/patch-src_smalldialogs.cpp