CVS commit: pkgsrc/devel/kcoreaddons

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Apr 28 13:59:09 UTC 2022

Modified Files:
        pkgsrc/devel/kcoreaddons: Makefile distinfo
Added Files:
        pkgsrc/devel/kcoreaddons/patches: patch-src_lib_io_kfilesystemtype.cpp

Log Message:
kcoreaddons: SunOS (and probably others) fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/kcoreaddons/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/kcoreaddons/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/kcoreaddons/patches/patch-src_lib_io_kfilesystemtype.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/kcoreaddons/Makefile
diff -u pkgsrc/devel/kcoreaddons/Makefile:1.55 pkgsrc/devel/kcoreaddons/Makefile:1.56
--- pkgsrc/devel/kcoreaddons/Makefile:1.55      Mon Apr 25 03:47:48 2022
+++ pkgsrc/devel/kcoreaddons/Makefile   Thu Apr 28 13:59:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2022/04/25 03:47:48 markd Exp $
+# $NetBSD: Makefile,v 1.56 2022/04/28 13:59:09 jperkin Exp $
 
 DISTNAME=      kcoreaddons-${KF5VER}
 CATEGORIES=    devel
@@ -9,6 +9,9 @@ LICENSE=        gnu-lgpl-v2 AND gnu-lgpl-v2.1 A
 
 .include "../../meta-pkgs/kde/kf5.mk"
 
+CMAKE_ARGS.SunOS+=     -DENABLE_INOTIFY=OFF
+LDFLAGS.SunOS+=                -lsocket
+
 .if ${OPSYS} != "SunOS"
 .include "../../devel/libinotify/buildlink3.mk"
 .endif

Index: pkgsrc/devel/kcoreaddons/distinfo
diff -u pkgsrc/devel/kcoreaddons/distinfo:1.15 pkgsrc/devel/kcoreaddons/distinfo:1.16
--- pkgsrc/devel/kcoreaddons/distinfo:1.15      Mon Apr 25 03:47:48 2022
+++ pkgsrc/devel/kcoreaddons/distinfo   Thu Apr 28 13:59:09 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2022/04/25 03:47:48 markd Exp $
+$NetBSD: distinfo,v 1.16 2022/04/28 13:59:09 jperkin Exp $
 
 BLAKE2s (kcoreaddons-5.93.0.tar.xz) = b1a98030faf9a9979e35edddea3620ba15cba9e3973af6be2e13391f70f959a2
 SHA512 (kcoreaddons-5.93.0.tar.xz) = 37aafb84a53cf347d8ae18d98e59e3cfe8500782f3b3d24355f55d711db32c527b7d3be0e30f1c7a44f64235dd429833352b210e88819419834ecd1e2b3ad17f
 Size (kcoreaddons-5.93.0.tar.xz) = 455372 bytes
 SHA1 (patch-src_lib_caching_kshareddatacache_p.h) = a3dff380dd98bbef3f9bbfe32f1e852b985b6306
 SHA1 (patch-src_lib_io_kautosavefile.cpp) = b50bd37139febd7e82f3087241107171161dec2a
+SHA1 (patch-src_lib_io_kfilesystemtype.cpp) = b35871c35e9295c6399b2ea69d584ba89845a16f

Added files:

Index: pkgsrc/devel/kcoreaddons/patches/patch-src_lib_io_kfilesystemtype.cpp
diff -u /dev/null pkgsrc/devel/kcoreaddons/patches/patch-src_lib_io_kfilesystemtype.cpp:1.1
--- /dev/null   Thu Apr 28 13:59:09 2022
+++ pkgsrc/devel/kcoreaddons/patches/patch-src_lib_io_kfilesystemtype.cpp       Thu Apr 28 13:59:09 2022
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_lib_io_kfilesystemtype.cpp,v 1.1 2022/04/28 13:59:09 jperkin Exp $
+
+Fix #endif logic.
+
+--- src/lib/io/kfilesystemtype.cpp.orig        2022-04-02 10:17:11.000000000 +0000
++++ src/lib/io/kfilesystemtype.cpp
+@@ -160,13 +160,13 @@ KFileSystemType::Type determineFileSyste
+     return kde_typeFromName(buf.f_basetype);
+ #endif
+ }
+-#endif
+ #else
+ KFileSystemType::Type determineFileSystemTypeImpl(const QByteArray &path)
+ {
+     return KFileSystemType::Unknown;
+ }
+ #endif
++#endif
+ 
+ KFileSystemType::Type KFileSystemType::fileSystemType(const QString &path)
+ {