Index: devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp =================================================================== --- /dev/null +++ devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp @@ -0,0 +1,62 @@ +--- src/corelib/io/qlockfile_unix.cpp.orig 2018-06-06 09:26:40 UTC ++++ src/corelib/io/qlockfile_unix.cpp +@@ -75,6 +75,8 @@ + # include + # if !defined(Q_OS_NETBSD) + # include ++# include ++# include + # endif + #endif + +@@ -246,23 +248,43 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) + struct kinfo_proc kp; + int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc), 1 }; + # else ++ kvm_t * kvm = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, ""); ++ int cnt; ++ struct kinfo_proc * kvm_kp = kvm_getprocs(kvm, KERN_PROC_PID, getpid(), &cnt); ++ struct procstat * ps = procstat_open_sysctl(); ++ char ** argv = procstat_getargv(ps, kvm_kp, 0); ++ QString nameFromProcstat; ++ if (argv != nullptr && argv[0] != nullptr) ++ nameFromProcstat = QString::fromLocal8Bit(argv[0]); ++ procstat_close(ps); ++ kvm_close(kvm); ++ + struct kinfo_proc kp; + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid }; + # endif +- size_t len = sizeof(kp); +- u_int mib_len = sizeof(mib)/sizeof(u_int); ++ if (nameFromProcstat.isEmpty()) ++ { ++ size_t len = sizeof(kp); ++ u_int mib_len = sizeof(mib)/sizeof(u_int); + +- if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) +- return QString(); +- ++ if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) ++ return QString(); ++ } + # if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) + if (kp.p_pid != pid) + return QString(); + QString name = QFile::decodeName(kp.p_comm); + # else +- if (kp.ki_pid != pid) ++ QString name; ++ if (!nameFromProcstat.isEmpty()) ++ { ++ QFileInfo fi(nameFromProcstat); ++ name = fi.fileName(); ++ } ++ else if (kp.ki_pid != pid) + return QString(); +- QString name = QFile::decodeName(kp.ki_comm); ++ else ++ QString name = QFile::decodeName(kp.ki_comm); + # endif + return name; + \ No newline at end of file