CVS commit: pkgsrc/devel/kf6-kcoreaddons

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 21 10:38:10 UTC 2024

Modified Files:
        pkgsrc/devel/kf6-kcoreaddons: distinfo
Added Files:
        pkgsrc/devel/kf6-kcoreaddons/patches:
            patch-src_lib_caching_ksdcmapping__p.h

Log Message:
kf6-kcoreaddons: Support systems that lack RLIMIT_MEMLOCK.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/kf6-kcoreaddons/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_caching_ksdcmapping__p.h

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

Modified files:

Index: pkgsrc/devel/kf6-kcoreaddons/distinfo
diff -u pkgsrc/devel/kf6-kcoreaddons/distinfo:1.1 pkgsrc/devel/kf6-kcoreaddons/distinfo:1.2
--- pkgsrc/devel/kf6-kcoreaddons/distinfo:1.1   Sun May 26 11:26:13 2024
+++ pkgsrc/devel/kf6-kcoreaddons/distinfo       Fri Jun 21 10:38:10 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2024/05/26 11:26:13 markd Exp $
+$NetBSD: distinfo,v 1.2 2024/06/21 10:38:10 jperkin Exp $
 
 BLAKE2s (kcoreaddons-6.2.0.tar.xz) = 0f99c257e75ff87e79a074b81ea81695d634ba2efdb3ee303482f76bf8c60e55
 SHA512 (kcoreaddons-6.2.0.tar.xz) = f4134611de25c2e30f22d6d807ea16e83211a856255265fc94b9e767053475fe500f027be720283b85b8d10218443e528f249d4d95cefabb45b30177223810cc
 Size (kcoreaddons-6.2.0.tar.xz) = 2565752 bytes
 SHA1 (patch-src_lib_caching_ksdclock.cpp) = 1d52b3881e415b2ad8a165ac21e9f295e353e69c
+SHA1 (patch-src_lib_caching_ksdcmapping__p.h) = 657e45acf9201f4b2611e9f0eadf925577b27855
 SHA1 (patch-src_lib_io_kautosavefile.cpp) = b50bd37139febd7e82f3087241107171161dec2a
 SHA1 (patch-src_lib_io_kfilesystemtype.cpp) = 67da0515cbcdad0d59c34a0ee922bf0af883377c

Added files:

Index: pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_caching_ksdcmapping__p.h
diff -u /dev/null pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_caching_ksdcmapping__p.h:1.1
--- /dev/null   Fri Jun 21 10:38:10 2024
+++ pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_caching_ksdcmapping__p.h Fri Jun 21 10:38:10 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_lib_caching_ksdcmapping__p.h,v 1.1 2024/06/21 10:38:10 jperkin Exp $
+
+Support systems that lack RLIMIT_MEMLOCK.
+
+--- src/lib/caching/ksdcmapping_p.h.orig       2024-06-21 10:28:04.989153487 +0000
++++ src/lib/caching/ksdcmapping_p.h
+@@ -191,6 +191,7 @@ private:
+             // the size to be able to access every entry, so fixup the mapping.
+             if (mapAddress != MAP_FAILED) {
+                 // Successful mmap doesn't actually mean that whole range is readable so ensure it is
++#ifdef RLIMIT_MEMLOCK
+                 struct rlimit memlock;
+                 if (getrlimit(RLIMIT_MEMLOCK, &memlock) == 0 && memlock.rlim_cur >= 2) {
+                     // Half of limit in case something else has already locked some mem
+@@ -207,6 +208,7 @@ private:
+                 } else {
+                     qCWarning(KCOREADDONS_DEBUG) << "Failed to get RLIMIT_MEMLOCK!";
+                 }
++#endif
+ 
+                 SharedMemory *mapped = reinterpret_cast<SharedMemory *>(mapAddress);
+