CVS commit: pkgsrc/x11/konsole

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 13 15:00:04 UTC 2022

Modified Files:
        pkgsrc/x11/konsole: distinfo
        pkgsrc/x11/konsole/patches: patch-src_ProcessInfo.cpp

Log Message:
konsole: Newer QT API fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/konsole/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp

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

Modified files:

Index: pkgsrc/x11/konsole/distinfo
diff -u pkgsrc/x11/konsole/distinfo:1.13 pkgsrc/x11/konsole/distinfo:1.14
--- pkgsrc/x11/konsole/distinfo:1.13    Tue Oct 26 11:34:03 2021
+++ pkgsrc/x11/konsole/distinfo Fri May 13 15:00:04 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:34:03 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/05/13 15:00:04 jperkin Exp $
 
 BLAKE2s (konsole-20.12.3.tar.xz) = 9ecfd4599123ffcf934020afeba6db4ee0130541241a01b36a184b2b128640bd
 SHA512 (konsole-20.12.3.tar.xz) = a48eaa0080b26369f5f163f3ae345bca7f35aa06d581ecc0bbeca54fee2e9b900a4b648f940a67f506ecb00dba971220f1c1c7a699efcbb6e27ee0932c27e37a
 Size (konsole-20.12.3.tar.xz) = 1250536 bytes
-SHA1 (patch-src_ProcessInfo.cpp) = 3919cc3b4c3b1f4acc6bd8fc1bbf58ce66803ef3
+SHA1 (patch-src_ProcessInfo.cpp) = 6ca72a192f0fd852a2dcd1576715f2cb423af2bb

Index: pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp
diff -u pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.5 pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.6
--- pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.5    Wed Apr  7 12:28:32 2021
+++ pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp        Fri May 13 15:00:04 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_ProcessInfo.cpp,v 1.5 2021/04/07 12:28:32 markd Exp $
+$NetBSD: patch-src_ProcessInfo.cpp,v 1.6 2022/05/13 15:00:04 jperkin Exp $
 
-NetBSD support
+NetBSD support and QT fixes.
 
 --- src/ProcessInfo.cpp.orig   2021-02-24 23:11:38.000000000 +0000
 +++ src/ProcessInfo.cpp
@@ -169,7 +169,41 @@ NetBSD support
  #elif defined(Q_OS_OPENBSD)
  class OpenBSDProcessInfo : public UnixProcessInfo
  {
-@@ -937,6 +1095,8 @@ ProcessInfo *ProcessInfo::newInstance(in
+@@ -879,7 +1037,7 @@ protected:
+     // version uses readlink.
+     bool readCurrentDir(int pid) override
+     {
+-        QFileInfo info(QString("/proc/%1/path/cwd").arg(pid));
++        QFileInfo info(QStringLiteral("/proc/%1/path/cwd").arg(pid));
+         const bool readable = info.isReadable();
+ 
+         if (readable && info.isSymLink()) {
+@@ -899,7 +1057,7 @@ protected:
+ private:
+     bool readProcInfo(int pid) override
+     {
+-        QFile psinfo(QString("/proc/%1/psinfo").arg(pid));
++        QFile psinfo(QStringLiteral("/proc/%1/psinfo").arg(pid));
+         if (psinfo.open(QIODevice::ReadOnly)) {
+             struct psinfo info;
+             if (psinfo.read((char *)&info, sizeof(info)) != sizeof(info)) {
+@@ -908,12 +1066,13 @@ private:
+ 
+             setParentPid(info.pr_ppid);
+             setForegroundPid(info.pr_pgid);
+-            setName(info.pr_fname);
++            //setName(info.pr_fname);
++            setName(QString::fromUtf8(info.pr_fname));
+             setPid(pid);
+ 
+             // Bogus, because we're treating the arguments as one single string
+             info.pr_psargs[PRARGSZ - 1] = 0;
+-            addArgument(info.pr_psargs);
++            addArgument(QString::fromUtf8(info.pr_psargs));
+         }
+         return true;
+     }
+@@ -937,6 +1096,8 @@ ProcessInfo *ProcessInfo::newInstance(in
      info = new MacProcessInfo(pid);
  #elif defined(Q_OS_FREEBSD)
      info = new FreeBSDProcessInfo(pid);