CVS commit: pkgsrc/x11/konsole

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/konsole
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Sun, 21 Dec 2025 20:19:56 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Dec 21 20:19:56 UTC 2025

Modified Files:
        pkgsrc/x11/konsole: Makefile PLIST distinfo
        pkgsrc/x11/konsole/patches: patch-src_ProcessInfo.cpp
Removed Files:
        pkgsrc/x11/konsole/patches: patch-src_session_Session.cpp

Log Message:
konsole: update to 25.08.3

Qt6/KF6 version - Two years of development.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/konsole/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/konsole/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/konsole/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/konsole/patches/patch-src_session_Session.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/Makefile
diff -u pkgsrc/x11/konsole/Makefile:1.89 pkgsrc/x11/konsole/Makefile:1.90
--- pkgsrc/x11/konsole/Makefile:1.89    Thu Oct 23 20:40:03 2025
+++ pkgsrc/x11/konsole/Makefile Sun Dec 21 20:19:56 2025
@@ -1,34 +1,22 @@
-# $NetBSD: Makefile,v 1.89 2025/10/23 20:40:03 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2025/12/21 20:19:56 markd Exp $
 
 DISTNAME=      konsole-${KAPPSVER}
-PKGREVISION=   11
 CATEGORIES=    x11
 
-HOMEPAGE=      http://kde.org/applications/system/konsole/
+HOMEPAGE=      https://apps.kde.org/konsole/
 COMMENT=       Terminal emulator for the K Desktop Environment
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.2
 
 .include "../../meta-pkgs/kde/applications.mk"
 
-TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
-DEPENDS+=      kinit>=5.68.0:../../x11/kinit
+TOOL_DEPENDS+= kf6-kdoctools>=6.18.0:../../devel/kf6-kdoctools
 
 USE_TOOLS+=    msgmerge
 
-SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       pre-configure
-SUBST_MESSAGE.xdg=     Install via examples dir.
-SUBST_FILES.xdg=       data/CMakeLists.txt
-SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
-
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
-CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/konsolerc \
-               ${PKG_SYSCONFDIR}/xdg/konsolerc
-
-.include "../../devel/knotifyconfig/buildlink3.mk"
-.include "../../devel/kparts/buildlink3.mk"
-.include "../../devel/kpty/buildlink3.mk"
-.include "../../net/knewstuff/buildlink3.mk"
+.include "../../devel/kf6-knotifyconfig/buildlink3.mk"
+.include "../../devel/kf6-kparts/buildlink3.mk"
+.include "../../devel/kf6-kpty/buildlink3.mk"
+.include "../../net/kf6-knewstuff/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/konsole/PLIST
diff -u pkgsrc/x11/konsole/PLIST:1.9 pkgsrc/x11/konsole/PLIST:1.10
--- pkgsrc/x11/konsole/PLIST:1.9        Wed Aug  9 20:58:26 2023
+++ pkgsrc/x11/konsole/PLIST    Sun Dec 21 20:19:56 2025
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2023/08/09 20:58:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/12/21 20:19:56 markd Exp $
 bin/konsole
 bin/konsoleprofile
-lib/kconf_update_bin/konsole_globalaccel
-lib/kconf_update_bin/konsole_show_menubar
-lib/libkonsoleapp.so.1
 lib/libkonsoleapp.so.${PKGVERSION}
-lib/libkonsoleprivate.so.1
 lib/libkonsoleprivate.so.${PKGVERSION}
-qt5/plugins/konsolepart.so
-qt5/plugins/konsoleplugins/konsole_quickcommandsplugin.so
-qt5/plugins/konsoleplugins/konsole_sshmanagerplugin.so
+qt6/plugins/kf6/parts/konsolepart.so
+qt6/plugins/konsoleplugins/konsole_quickcommandsplugin.so
+qt6/plugins/konsoleplugins/konsole_sshmanagerplugin.so
 share/applications/org.kde.konsole.desktop
 share/doc/HTML/ca/konsole/draganddrop-contextmenu.png
 share/doc/HTML/ca/konsole/index.cache.bz2
@@ -19,6 +15,8 @@ share/doc/HTML/de/konsole/index.docbook
 share/doc/HTML/en/konsole/draganddrop-contextmenu.png
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
+share/doc/HTML/es/konsole/index.cache.bz2
+share/doc/HTML/es/konsole/index.docbook
 share/doc/HTML/it/konsole/draganddrop-contextmenu.png
 share/doc/HTML/it/konsole/index.cache.bz2
 share/doc/HTML/it/konsole/index.docbook
@@ -31,47 +29,27 @@ share/doc/HTML/pt_BR/konsole/index.cache
 share/doc/HTML/pt_BR/konsole/index.docbook
 share/doc/HTML/ru/konsole/index.cache.bz2
 share/doc/HTML/ru/konsole/index.docbook
+share/doc/HTML/sl/konsole/index.cache.bz2
+share/doc/HTML/sl/konsole/index.docbook
 share/doc/HTML/sr/konsole/index.cache.bz2
 share/doc/HTML/sr/konsole/index.docbook
 share/doc/HTML/sr@latin/konsole/index.cache.bz2
 share/doc/HTML/sr@latin/konsole/index.docbook
 share/doc/HTML/sv/konsole/index.cache.bz2
 share/doc/HTML/sv/konsole/index.docbook
+share/doc/HTML/tr/konsole/index.cache.bz2
+share/doc/HTML/tr/konsole/index.docbook
 share/doc/HTML/uk/konsole/draganddrop-contextmenu.png
 share/doc/HTML/uk/konsole/index.cache.bz2
 share/doc/HTML/uk/konsole/index.docbook
 share/doc/HTML/zh_CN/konsole/index.cache.bz2
 share/doc/HTML/zh_CN/konsole/index.docbook
-share/examples/kde-xdg/konsolerc
-share/kconf_update/konsole.upd
-share/kconf_update/konsole_add_hamburgermenu_to_toolbar.sh
 share/kglobalaccel/org.kde.konsole.desktop
 share/kio/servicemenus/konsolerun.desktop
-share/knotifications5/konsole.notifyrc
-share/knsrcfiles/konsole.knsrc
-share/konsole/1x2-terminals.json
-share/konsole/2x1-terminals.json
-share/konsole/2x2-terminals.json
-share/konsole/BlackOnLightYellow.colorscheme
-share/konsole/BlackOnRandomLight.colorscheme
-share/konsole/BlackOnWhite.colorscheme
-share/konsole/BlueOnBlack.colorscheme
-share/konsole/Breeze.colorscheme
-share/konsole/DarkPastels.colorscheme
-share/konsole/GreenOnBlack.colorscheme
-share/konsole/Linux.colorscheme
-share/konsole/RedOnBlack.colorscheme
-share/konsole/Solarized.colorscheme
-share/konsole/SolarizedLight.colorscheme
-share/konsole/WhiteOnBlack.colorscheme
-share/konsole/default.keytab
-share/konsole/linux.keytab
-share/konsole/macos.keytab
-share/konsole/solaris.keytab
-share/kservices5/konsolepart.desktop
-share/kservicetypes5/terminalemulator.desktop
+share/knotifications6/konsole.notifyrc
 share/locale/af/LC_MESSAGES/konsole.mo
 share/locale/ar/LC_MESSAGES/konsole.mo
+share/locale/ast/LC_MESSAGES/konsole.mo
 share/locale/az/LC_MESSAGES/konsole.mo
 share/locale/be/LC_MESSAGES/konsole.mo
 share/locale/be@latin/LC_MESSAGES/konsole.mo
@@ -138,6 +116,7 @@ share/locale/pt/LC_MESSAGES/konsole.mo
 share/locale/pt_BR/LC_MESSAGES/konsole.mo
 share/locale/ro/LC_MESSAGES/konsole.mo
 share/locale/ru/LC_MESSAGES/konsole.mo
+share/locale/sa/LC_MESSAGES/konsole.mo
 share/locale/se/LC_MESSAGES/konsole.mo
 share/locale/si/LC_MESSAGES/konsole.mo
 share/locale/sk/LC_MESSAGES/konsole.mo
@@ -163,5 +142,5 @@ share/locale/xh/LC_MESSAGES/konsole.mo
 share/locale/zh_CN/LC_MESSAGES/konsole.mo
 share/locale/zh_TW/LC_MESSAGES/konsole.mo
 share/metainfo/org.kde.konsole.appdata.xml
-share/qlogging-categories5/konsole.categories
+share/qlogging-categories6/konsole.categories
 share/zsh/site-functions/_konsole

Index: pkgsrc/x11/konsole/distinfo
diff -u pkgsrc/x11/konsole/distinfo:1.18 pkgsrc/x11/konsole/distinfo:1.19
--- pkgsrc/x11/konsole/distinfo:1.18    Fri Jun 20 02:35:49 2025
+++ pkgsrc/x11/konsole/distinfo Sun Dec 21 20:19:56 2025
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.18 2025/06/20 02:35:49 markd Exp $
+$NetBSD: distinfo,v 1.19 2025/12/21 20:19:56 markd Exp $
 
-BLAKE2s (konsole-23.08.4.tar.xz) = 8ca4890a72a1f04392005c59c0b9f5468c95aedbcf2516338e305e2088eba62d
-SHA512 (konsole-23.08.4.tar.xz) = 7b6e8a3190290b82283adaf8da59cd41f14da9350ad8baa6340e37d8e8021c65694bda09b89ad3bcbf490a932ab16b2fc3182c0cafa70df189353dfc807cb5dc
-Size (konsole-23.08.4.tar.xz) = 1839412 bytes
-SHA1 (patch-src_ProcessInfo.cpp) = 6ca72a192f0fd852a2dcd1576715f2cb423af2bb
+BLAKE2s (konsole-25.08.3.tar.xz) = ef9929e1aa3f4b47e74431d517d4a672475b3e672fb699ea7b5176f047061a93
+SHA512 (konsole-25.08.3.tar.xz) = b41e51a9a56c09eae2a9f9d46d8a54e31ed7d0b5d43bd502855fdb21e185e8aa23569c2083ebd42da90a9e1b4e22ffc749f140985a859a3e6fadf932c81736cd
+Size (konsole-25.08.3.tar.xz) = 1849632 bytes
+SHA1 (patch-src_ProcessInfo.cpp) = f5ef78eafb61defa2edf9cdf346b330d5cea0c5d
 SHA1 (patch-src_characters_CharacterColor.h) = 47e4d0d9660e4bc059c3416dd16a4b16c2f17f38
-SHA1 (patch-src_session_Session.cpp) = 873ec68b0fb1696efcaa293dcb9411232acc2a66

Index: pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp
diff -u pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.6 pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.7
--- pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.6    Fri May 13 15:00:04 2022
+++ pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp        Sun Dec 21 20:19:56 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_ProcessInfo.cpp,v 1.6 2022/05/13 15:00:04 jperkin Exp $
+$NetBSD: patch-src_ProcessInfo.cpp,v 1.7 2025/12/21 20:19:56 markd Exp $
 
 NetBSD support and QT fixes.
 
---- src/ProcessInfo.cpp.orig   2021-02-24 23:11:38.000000000 +0000
+--- src/ProcessInfo.cpp.orig   2025-10-31 21:34:06.000000000 +0000
 +++ src/ProcessInfo.cpp
-@@ -646,6 +646,164 @@ private:
+@@ -889,6 +889,227 @@ private:
      }
  };
  
@@ -12,13 +12,76 @@ NetBSD support and QT fixes.
 +class NetBSDProcessInfo : public UnixProcessInfo
 +{
 +public:
-+    NetBSDProcessInfo(int pid) :
-+        UnixProcessInfo(pid)
++    explicit NetBSDProcessInfo(int pid)
++        : UnixProcessInfo(pid)
 +    {
 +    }
 +
 +private:
-+    bool readProcInfo(int aPid) Q_DECL_OVERRIDE
++    bool readProcessName(int aPid) override
++    {
++        // indicies of various fields within the process status file which
++        // contain various information about the process
++        const int PROCESS_NAME_FIELD = 0;
++
++        QString processNameString;
++
++        // read process status file ( /proc/<pid/status )
++        //
++        // the expected file format is a list of fields separated by spaces, using
++        // parenthesies to escape fields such as the process name which may itself contain
++        // spaces:
++        //
++        // FIELD FIELD (FIELD WITH SPACES) FIELD FIELD
++        //
++        QFile processInfo( QStringLiteral("/proc/%1/status").arg(aPid) );
++        if ( processInfo.open(QIODevice::ReadOnly) )
++        {
++           QTextStream stream(&processInfo);
++            QString data = stream.readAll();
++
++            int stack = 0;
++            int field = 0;
++            int pos = 0;
++
++            while (pos < data.count()) {
++                QChar c = data[pos];
++
++                if ( c == QLatin1Char('(')) {
++                    stack++;
++                } else if ( c == QLatin1Char(')')) {
++                    stack--;
++                } else if ( stack == 0 && c == QLatin1Char(' ')) {
++                    field++;
++                } else {
++                    switch ( field )
++                    {
++                        case PROCESS_NAME_FIELD:
++                            processNameString.append(c);
++                            break;
++                    }
++                }
++
++                pos++;
++            }
++        }
++        else
++        {
++            setFileError( processInfo.error() );
++            return false;
++        }
++
++        // check that data was read successfully
++        bool ok = false;
++
++        if (!processNameString.isEmpty())
++            setName(processNameString);
++
++        return ok;
++    }
++
++private:
++    bool readProcInfo(int aPid) override
 +    {
 +        // indicies of various fields within the process status file which
 +        // contain various information about the process
@@ -115,7 +178,7 @@ NetBSD support and QT fixes.
 +        return ok;
 +    }
 +
-+    bool readArguments(int aPid) Q_DECL_OVERRIDE
++    bool readArguments(int aPid) override
 +    {
 +        // read command-line arguments file found at /proc/<pid>/cmdline
 +        // the expected format is a list of strings delimited by null characters,
@@ -143,7 +206,7 @@ NetBSD support and QT fixes.
 +        return true;
 +    }
 +
-+    bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
++    bool readCurrentDir(int aPid) override
 +    {
 +        QFileInfo info( QStringLiteral("/proc/%1/cwd").arg(aPid) );
 +
@@ -169,7 +232,7 @@ NetBSD support and QT fixes.
  #elif defined(Q_OS_OPENBSD)
  class OpenBSDProcessInfo : public UnixProcessInfo
  {
-@@ -879,7 +1037,7 @@ protected:
+@@ -1214,7 +1435,7 @@ protected:
      // version uses readlink.
      bool readCurrentDir(int pid) override
      {
@@ -178,7 +241,7 @@ NetBSD support and QT fixes.
          const bool readable = info.isReadable();
  
          if (readable && info.isSymLink()) {
-@@ -899,7 +1057,7 @@ protected:
+@@ -1244,7 +1465,7 @@ protected:
  private:
      bool readProcInfo(int pid) override
      {
@@ -187,7 +250,7 @@ NetBSD support and QT fixes.
          if (psinfo.open(QIODevice::ReadOnly)) {
              struct psinfo info;
              if (psinfo.read((char *)&info, sizeof(info)) != sizeof(info)) {
-@@ -908,12 +1066,13 @@ private:
+@@ -1253,12 +1474,13 @@ private:
  
              setParentPid(info.pr_ppid);
              setForegroundPid(info.pr_pgid);
@@ -201,9 +264,9 @@ NetBSD support and QT fixes.
 -            addArgument(info.pr_psargs);
 +            addArgument(QString::fromUtf8(info.pr_psargs));
          }
-         return true;
-     }
-@@ -937,6 +1096,8 @@ ProcessInfo *ProcessInfo::newInstance(in
+ 
+         _execNameFile = std::make_unique(new QFile());
+@@ -1283,6 +1505,8 @@ ProcessInfo *ProcessInfo::newInstance(in
      info = new MacProcessInfo(pid);
  #elif defined(Q_OS_FREEBSD)
      info = new FreeBSDProcessInfo(pid);

Prev by Date: CVS commit: pkgsrc/x11/kirigami-addons
Next by Date: CVS commit: pkgsrc/audio/amarok
Previous by Thread: CVS commit: pkgsrc/x11/kirigami-addons
Next by Thread: CVS commit: pkgsrc/audio/amarok
Indexes:

Home | Main Index | Thread Index | Old Index