CVS commit: pkgsrc/devel/kio

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 11 09:17:57 UTC 2022

Modified Files:
        pkgsrc/devel/kio: Makefile distinfo
Added Files:
        pkgsrc/devel/kio/patches: patch-autotests_kcoredirlister__benchmark.cpp
            patch-src_ioslaves_file_file__unix.cpp

Log Message:
kio: Build and test fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/devel/kio/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/kio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/kio/patches/patch-autotests_kcoredirlister__benchmark.cpp
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/kio/patches/patch-src_ioslaves_file_file__unix.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/kio/Makefile
diff -u pkgsrc/devel/kio/Makefile:1.61 pkgsrc/devel/kio/Makefile:1.62
--- pkgsrc/devel/kio/Makefile:1.61      Mon Apr 25 04:34:43 2022
+++ pkgsrc/devel/kio/Makefile   Wed May 11 09:17:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2022/04/25 04:34:43 markd Exp $
+# $NetBSD: Makefile,v 1.62 2022/05/11 09:17:57 jperkin Exp $
 
 DISTNAME=      kio-${KF5VER}
 CATEGORIES=    devel
@@ -11,6 +11,9 @@ LICENSE=      gnu-lgpl-v2.1
 
 USE_TOOLS+=    msgmerge gmake
 
+TEST_TARGET=   test
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/_KDE_build/bin
+
 LDFLAGS.SunOS+=        -lsocket
 
 SUBST_CLASSES+=                xdg

Index: pkgsrc/devel/kio/distinfo
diff -u pkgsrc/devel/kio/distinfo:1.17 pkgsrc/devel/kio/distinfo:1.18
--- pkgsrc/devel/kio/distinfo:1.17      Mon Apr 25 04:34:43 2022
+++ pkgsrc/devel/kio/distinfo   Wed May 11 09:17:57 2022
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.17 2022/04/25 04:34:43 markd Exp $
+$NetBSD: distinfo,v 1.18 2022/05/11 09:17:57 jperkin Exp $
 
 BLAKE2s (kio-5.93.0.tar.xz) = 9a66c32f1e321b6c10064d780cc1f919ecab2ee72f33468fb074b44b1ca84f19
 SHA512 (kio-5.93.0.tar.xz) = d7f1f5ed834dbdc4919dd90def14561e4a8cd1c7f31f0a8b1bb62cb9009509ee2649ed17147bd2197067149942eb65938c41cd3605c9463f7d2cc109d7688747
 Size (kio-5.93.0.tar.xz) = 3327996 bytes
+SHA1 (patch-autotests_kcoredirlister__benchmark.cpp) = b0d8c7543c15682f4f1699e9db2cba560a7ab5c2
 SHA1 (patch-src_core_kmountpoint.cpp) = 463809efb317c5eb721209504521a0c0013b0442
 SHA1 (patch-src_filewidgets_kurlnavigator.cpp) = a6a459fdbeaa7e07b2596079c8f5f4a6789fd0eb
+SHA1 (patch-src_ioslaves_file_file__unix.cpp) = 30db3f02a507b7a4f561eeccba955c96e07c2c7d

Added files:

Index: pkgsrc/devel/kio/patches/patch-autotests_kcoredirlister__benchmark.cpp
diff -u /dev/null pkgsrc/devel/kio/patches/patch-autotests_kcoredirlister__benchmark.cpp:1.1
--- /dev/null   Wed May 11 09:17:57 2022
+++ pkgsrc/devel/kio/patches/patch-autotests_kcoredirlister__benchmark.cpp      Wed May 11 09:17:57 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-autotests_kcoredirlister__benchmark.cpp,v 1.1 2022/05/11 09:17:57 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- autotests/kcoredirlister_benchmark.cpp.orig        2022-04-02 10:22:23.000000000 +0000
++++ autotests/kcoredirlister_benchmark.cpp
+@@ -16,6 +16,8 @@
+ #include <algorithm>
+ #include <random>
+ 
++using std::pow;
++
+ // BEGIN Global variables
+ const QString fileNameArg = QLatin1String("/home/user/Folder1/SubFolder2/a%1.txt");
+ // to check with 10, 100, 1000, ... KFileItem

Index: pkgsrc/devel/kio/patches/patch-src_ioslaves_file_file__unix.cpp
diff -u /dev/null pkgsrc/devel/kio/patches/patch-src_ioslaves_file_file__unix.cpp:1.3
--- /dev/null   Wed May 11 09:17:57 2022
+++ pkgsrc/devel/kio/patches/patch-src_ioslaves_file_file__unix.cpp     Wed May 11 09:17:57 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_ioslaves_file_file__unix.cpp,v 1.3 2022/05/11 09:17:57 jperkin Exp $
+
+Fix HAVE_DIRENT_D_TYPE type.
+
+--- src/ioslaves/file/file_unix.cpp.orig       2022-04-02 10:22:23.000000000 +0000
++++ src/ioslaves/file/file_unix.cpp
+@@ -1088,7 +1088,7 @@ void FileProtocol::listDir(const QUrl &u
+     // qDebug() << "========= LIST " << url << "details=" << details << " =========";
+     UDSEntry entry;
+ 
+-#ifndef HAVE_DIRENT_D_TYPE
++#if !HAVE_DIRENT_D_TYPE
+     QT_STATBUF st;
+ #endif
+     QT_DIRENT *ep;
+@@ -1109,7 +1109,7 @@ void FileProtocol::listDir(const QUrl &u
+          */
+         if (details == KIO::StatBasic) {
+             entry.fastInsert(KIO::UDSEntry::UDS_NAME, filename);
+-#ifdef HAVE_DIRENT_D_TYPE
++#if HAVE_DIRENT_D_TYPE
+             entry.fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, (ep->d_type == DT_DIR) ? S_IFDIR : S_IFREG);
+             const bool isSymLink = (ep->d_type == DT_LNK);
+ #else