head	1.2;
access;
symbols
	pkgsrc-2020Q1:1.1.0.2
	pkgsrc-2020Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2020.06.19.17.39.54;	author gutteridge;	state dead;
branches;
next	1.1;
commitid	Q3HQuQvv1YIQnRcC;

1.1
date	2020.01.16.02.37.30;	author gutteridge;	state Exp;
branches;
next	;
commitid	tT0dEQ7pyD0znRSB;


desc
@@


1.2
log
@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.
@
text
@$NetBSD: patch-src_directorymergewindow.cpp,v 1.1 2020/01/16 02:37:30 gutteridge Exp $

kdiff3 fails to close files properly leading to stability and speed issues.
Patches via Fedora:
https://src.fedoraproject.org/rpms/kdiff3/c/8a700c10780b157e681637404e97718f5ba0cff2
https://src.fedoraproject.org/rpms/kdiff3/c/bc38b46ef5c96b2b7800e1195b3895527bceea65

--- src/directorymergewindow.cpp.orig	2019-05-18 01:01:30.000000000 +0000
+++ src/directorymergewindow.cpp
@@@@ -741,6 +741,7 @@@@ bool DirectoryMergeWindow::DirectoryMerg
 
     if(!fi2.open(QIODevice::ReadOnly))
     {
+        fi1.close();
         status = fi2.errorString();
         return bEqual;
     }
@@@@ -758,17 +759,23 @@@@ bool DirectoryMergeWindow::DirectoryMerg
         if(len != fi1.read(&buf1[0], len))
         {
             status = fi1.errorString();
+            fi1.close();
+            fi2.close();
             return bEqual;
         }
 
         if(len != fi2.read(&buf2[0], len))
         {
-            status = fi2.errorString();;
+            status = fi2.errorString();
+            fi1.close();
+            fi2.close();
             return bEqual;
         }
 
         if(memcmp(&buf1[0], &buf2[0], len) != 0)
         {
+            fi1.close();
+            fi2.close();
             bError = false;
             return bEqual;
         }
@@@@ -780,6 +787,9 @@@@ bool DirectoryMergeWindow::DirectoryMerg
     // If the program really arrives here, then the files are really equal.
     bError = false;
     bEqual = true;
+
+    fi1.close();
+    fi2.close();
     return bEqual;
 }
 
@


1.1
log
@kdiff3: add patches to fix crashes, etc.
@
text
@d1 1
a1 1
$NetBSD$
@