Sun Nov 3 04:01:32 2019 UTC ()
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.


(gutteridge)
diff -r1.57 -r1.58 pkgsrc/devel/kdiff3/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/kdiff3/distinfo
diff -r0 -r1.1 pkgsrc/devel/kdiff3/patches/patch-src_smalldialogs.cpp
cvs diff -r1.57 -r1.58 pkgsrc/devel/kdiff3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/kdiff3/Makefile 2019/11/03 02:19:16 1.57
+++ pkgsrc/devel/kdiff3/Makefile 2019/11/03 04:01:32 1.58
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.57 2019/11/03 02:19:16 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.58 2019/11/03 04:01:32 gutteridge Exp $
2 2
3VERSION= 1.8.1 3VERSION= 1.8.1
 4PKGREVISION= 1
4DISTNAME= kdiff3-${VERSION} 5DISTNAME= kdiff3-${VERSION}
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_KDE:=kdiff3/} 7MASTER_SITES= ${MASTER_SITE_KDE:=kdiff3/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://kde.org/applications/development/org.kde.kdiff3 11HOMEPAGE= https://kde.org/applications/development/org.kde.kdiff3
11COMMENT= File and directory diff and merge tool 12COMMENT= File and directory diff and merge tool
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14USE_CMAKE= yes 15USE_CMAKE= yes
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16 17
cvs diff -r1.7 -r1.8 pkgsrc/devel/kdiff3/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/kdiff3/distinfo 2019/11/03 02:19:16 1.7
+++ pkgsrc/devel/kdiff3/distinfo 2019/11/03 04:01:32 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.7 2019/11/03 02:19:16 gutteridge Exp $ 1$NetBSD: distinfo,v 1.8 2019/11/03 04:01:32 gutteridge Exp $
2 2
3SHA1 (kdiff3-1.8.1.tar.xz) = cfb63e7fb8ef81e9ebc0ae47d6922f25a32a1ef9 3SHA1 (kdiff3-1.8.1.tar.xz) = cfb63e7fb8ef81e9ebc0ae47d6922f25a32a1ef9
4RMD160 (kdiff3-1.8.1.tar.xz) = b5076a50461f3612071aa08732c1d7c3b5ec5d8b 4RMD160 (kdiff3-1.8.1.tar.xz) = b5076a50461f3612071aa08732c1d7c3b5ec5d8b
5SHA512 (kdiff3-1.8.1.tar.xz) = 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720 5SHA512 (kdiff3-1.8.1.tar.xz) = 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
6Size (kdiff3-1.8.1.tar.xz) = 897692 bytes 6Size (kdiff3-1.8.1.tar.xz) = 897692 bytes
 7SHA1 (patch-src_smalldialogs.cpp) = d189a1631ba5bed1d794babb11764eff40efcf07
File Added: pkgsrc/devel/kdiff3/patches/Attic/patch-src_smalldialogs.cpp
$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