CVS commit: pkgsrc/devel/kdiff3

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Nov  3 04:01:32 UTC 2019

Modified Files:
        pkgsrc/devel/kdiff3: Makefile distinfo
Added Files:
        pkgsrc/devel/kdiff3/patches: patch-src_smalldialogs.cpp

Log Message:
kdiff3: fix file dialog issue

Add a patch I missed in my original commit: this makes the file
selection dialogs in the "small dialog" window actually function
properly.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/kdiff3/distinfo
cvs rdiff -u -r0 -r1.1 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.57 pkgsrc/devel/kdiff3/Makefile:1.58
--- pkgsrc/devel/kdiff3/Makefile:1.57   Sun Nov  3 02:19:16 2019
+++ pkgsrc/devel/kdiff3/Makefile        Sun Nov  3 04:01:32 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2019/11/03 02:19:16 gutteridge Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 04:01:32 gutteridge Exp $
 
 VERSION=       1.8.1
+PKGREVISION=   1
 DISTNAME=      kdiff3-${VERSION}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.7 pkgsrc/devel/kdiff3/distinfo:1.8
--- pkgsrc/devel/kdiff3/distinfo:1.7    Sun Nov  3 02:19:16 2019
+++ pkgsrc/devel/kdiff3/distinfo        Sun Nov  3 04:01:32 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2019/11/03 02:19:16 gutteridge Exp $
+$NetBSD: distinfo,v 1.8 2019/11/03 04:01:32 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_smalldialogs.cpp) = d189a1631ba5bed1d794babb11764eff40efcf07

Added files:

Index: pkgsrc/devel/kdiff3/patches/patch-src_smalldialogs.cpp
diff -u /dev/null pkgsrc/devel/kdiff3/patches/patch-src_smalldialogs.cpp:1.1
--- /dev/null   Sun Nov  3 04:01:32 2019
+++ pkgsrc/devel/kdiff3/patches/patch-src_smalldialogs.cpp      Sun Nov  3 04:01:32 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_smalldialogs.cpp,v 1.1 2019/11/03 04:01:32 gutteridge Exp $
+
+Fix the file dialog list in the "small dialog window", taken from:
+https://github.com/KDE/kdiff3/commit/fa6d0d8a0505a7e7cf4b0d743b1a222f3a9940ce
+
+--- src/smalldialogs.cpp.orig  2019-05-18 01:01:30.000000000 +0000
++++ src/smalldialogs.cpp
+@@ -231,8 +231,8 @@ void OpenDialog::selectURL(QComboBox* pL
+ 
+     currentUrl = QUrl::fromUserInput(current, QString(), QUrl::AssumeLocalFile);
+     QUrl newURL = bDir ? QFileDialog::getExistingDirectoryUrl(this, i18n("Open Directory"), currentUrl)
+-                       : bSave ? QFileDialog::getSaveFileUrl(this, i18n("Select Output File"), currentUrl, QLatin1Literal("all/allfiles"))
+-                               : QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, QLatin1Literal("all/allfiles"));
++                       : bSave ? QFileDialog::getSaveFileUrl(this, i18n("Select Output File"), currentUrl, i18n("All files (*)"))
++                               : QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, i18n("All files (*)"));
+     if(!newURL.isEmpty()) {
+         /*
+         Since we are selecting a directory open in the parent directory