CVS commit: pkgsrc/sysutils/baloo5

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 17 17:17:57 UTC 2022

Modified Files:
        pkgsrc/sysutils/baloo5: Makefile distinfo
Added Files:
        pkgsrc/sysutils/baloo5/patches: patch-CMakeLists.txt
            patch-src_file_timeestimator.cpp

Log Message:
baloo5: Support SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/baloo5/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/baloo5/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/sysutils/baloo5/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/baloo5/patches/patch-src_file_timeestimator.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/baloo5/Makefile
diff -u pkgsrc/sysutils/baloo5/Makefile:1.54 pkgsrc/sysutils/baloo5/Makefile:1.55
--- pkgsrc/sysutils/baloo5/Makefile:1.54        Mon Apr 25 06:36:45 2022
+++ pkgsrc/sysutils/baloo5/Makefile     Tue May 17 17:17:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2022/04/25 06:36:45 markd Exp $
+# $NetBSD: Makefile,v 1.55 2022/05/17 17:17:57 jperkin Exp $
 
 DISTNAME=      baloo-${KF5VER}
 PKGNAME=       baloo5-${KF5VER}
@@ -38,7 +38,7 @@ SUBST_SED.fix-moc=    -e 's;"${PREFIX}/incl
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "Linux"
+.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
 .include "../../devel/libinotify/buildlink3.mk"
 .endif
 .include "../../databases/lmdb/buildlink3.mk"

Index: pkgsrc/sysutils/baloo5/distinfo
diff -u pkgsrc/sysutils/baloo5/distinfo:1.14 pkgsrc/sysutils/baloo5/distinfo:1.15
--- pkgsrc/sysutils/baloo5/distinfo:1.14        Mon Apr 25 06:36:45 2022
+++ pkgsrc/sysutils/baloo5/distinfo     Tue May 17 17:17:57 2022
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.14 2022/04/25 06:36:45 markd Exp $
+$NetBSD: distinfo,v 1.15 2022/05/17 17:17:57 jperkin Exp $
 
 BLAKE2s (baloo-5.93.0.tar.xz) = cce213dd6619642366fbb8016ffa0ab5c208984c1c85f622b192f154953d5f14
 SHA512 (baloo-5.93.0.tar.xz) = d75c097db7a5badbf0cdbecfc5e9a8597d2693a4358096b6b02a9322b17291d365deb2e316c4901127d8a9be2d3906c8fca23cf38309e7e3c68a8836b37e2cfb
 Size (baloo-5.93.0.tar.xz) = 287692 bytes
+SHA1 (patch-CMakeLists.txt) = 6ee8651d42703842cae8a58823f0fd758142fb52
+SHA1 (patch-src_file_timeestimator.cpp) = 3f3dc48f4a744060ea23c1cf15acee1b6208a371

Added files:

Index: pkgsrc/sysutils/baloo5/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/sysutils/baloo5/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Tue May 17 17:17:58 2022
+++ pkgsrc/sysutils/baloo5/patches/patch-CMakeLists.txt Tue May 17 17:17:57 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2022/05/17 17:17:57 jperkin Exp $
+
+Avoid inotify on SunOS.
+
+--- CMakeLists.txt.orig        2022-04-02 10:13:54.000000000 +0000
++++ CMakeLists.txt
+@@ -82,7 +82,11 @@ add_definitions(-DKF_DISABLE_DEPRECATED_
+ find_package(Inotify)
+ set_package_properties(Inotify PROPERTIES
+     PURPOSE "Filesystem alteration notifications using inotify")
++if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
++set(BUILD_KINOTIFY 0)
++else()
+ set(BUILD_KINOTIFY ${Inotify_FOUND})
++endif()
+ 
+ configure_file(config.h.in ${CMAKE_BINARY_DIR}/config.h)
+ 

Index: pkgsrc/sysutils/baloo5/patches/patch-src_file_timeestimator.cpp
diff -u /dev/null pkgsrc/sysutils/baloo5/patches/patch-src_file_timeestimator.cpp:1.1
--- /dev/null   Tue May 17 17:17:58 2022
+++ pkgsrc/sysutils/baloo5/patches/patch-src_file_timeestimator.cpp     Tue May 17 17:17:57 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_file_timeestimator.cpp,v 1.1 2022/05/17 17:17:57 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- src/file/timeestimator.cpp.orig    2022-04-02 10:13:54.000000000 +0000
++++ src/file/timeestimator.cpp
+@@ -10,6 +10,8 @@
+ #include "timeestimator.h"
+ #include "filecontentindexerprovider.h"
+ 
++using std::sqrt;
++
+ using namespace Baloo;
+ 
+ TimeEstimator::TimeEstimator(QObject* parent)