pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/konsole

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Mar  6 04:47:37 UTC 2021

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

Log Message:
konsole: update to 20.04.1

qt5/kf5 version.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/konsole/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/konsole/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/konsole/distinfo
cvs rdiff -u -r1.3 -r1.4 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/Makefile
diff -u pkgsrc/x11/konsole/Makefile:1.51 pkgsrc/x11/konsole/Makefile:1.52
--- pkgsrc/x11/konsole/Makefile:1.51    Fri Jan  1 08:24:59 2021
+++ pkgsrc/x11/konsole/Makefile Sat Mar  6 04:47:37 2021
@@ -1,16 +1,22 @@
-# $NetBSD: Makefile,v 1.51 2021/01/01 08:24:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2021/03/06 04:47:37 markd Exp $
 
-DISTNAME=      konsole-${_KDE_VERSION}
-PKGREVISION=   24
+DISTNAME=      konsole-${KAPPSVER}
 CATEGORIES=    x11
+
+HOMEPAGE=      http://kde.org/applications/system/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/kde4/Makefile.kde4"
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+BUILD_DEPENDS+=        kdoctools>=5.19.0:../../devel/kdoctools
 
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kde-baseapps4/buildlink3.mk"
+USE_TOOLS+=    msgmerge
 
+.include "../../devel/knotifyconfig/buildlink3.mk"
+.include "../../devel/kpty/buildlink3.mk"
+.include "../../net/knewstuff/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kdelibs4support/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/konsole/PLIST
diff -u pkgsrc/x11/konsole/PLIST:1.4 pkgsrc/x11/konsole/PLIST:1.5
--- pkgsrc/x11/konsole/PLIST:1.4        Thu Nov 13 10:53:49 2014
+++ pkgsrc/x11/konsole/PLIST    Sat Mar  6 04:47:37 2021
@@ -1,40 +1,112 @@
-@comment $NetBSD: PLIST,v 1.4 2014/11/13 10:53:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/03/06 04:47:37 markd Exp $
 bin/konsole
 bin/konsoleprofile
-lib/kde4/libkonsolepart.so
-lib/libkdeinit4_konsole.so
-lib/libkonsoleprivate.so
-share/applications/kde4/konsole.desktop
-share/doc/kde/HTML/en/konsole/common
-share/doc/kde/HTML/en/konsole/draganddrop-contextmenu.png
-share/doc/kde/HTML/en/konsole/index.cache.bz2
-share/doc/kde/HTML/en/konsole/index.docbook
-share/kde/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
-share/kde/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
-share/kde/apps/kconf_update/konsole-2.9.0-global-options.sh
-share/kde/apps/kconf_update/konsole.upd
-share/kde/apps/kconf_update/konsole_remove_background_mode.upd
-share/kde/apps/konsole/BlackOnLightYellow.colorscheme
-share/kde/apps/konsole/BlackOnRandomLight.colorscheme
-share/kde/apps/konsole/BlackOnWhite.colorscheme
-share/kde/apps/konsole/BlueOnBlack.colorscheme
-share/kde/apps/konsole/DarkPastels.colorscheme
-share/kde/apps/konsole/GreenOnBlack.colorscheme
-share/kde/apps/konsole/Linux.colorscheme
-share/kde/apps/konsole/README.KeyTab
-share/kde/apps/konsole/RedOnBlack.colorscheme
-share/kde/apps/konsole/Shell.profile
-share/kde/apps/konsole/Solarized.colorscheme
-share/kde/apps/konsole/SolarizedLight.colorscheme
-share/kde/apps/konsole/WhiteOnBlack.colorscheme
-share/kde/apps/konsole/default.keytab
-share/kde/apps/konsole/konsole.notifyrc
-share/kde/apps/konsole/konsoleui.rc
-share/kde/apps/konsole/linux.keytab
-share/kde/apps/konsole/partui.rc
-share/kde/apps/konsole/sessionui.rc
-share/kde/apps/konsole/solaris.keytab
-share/kde4/services/ServiceMenus/konsolehere.desktop
-share/kde4/services/ServiceMenus/konsolerun.desktop
-share/kde4/services/konsolepart.desktop
-share/kde4/servicetypes/terminalemulator.desktop
+lib/libkdeinit5_konsole.so
+lib/libkonsoleprivate.so.20
+lib/libkonsoleprivate.so.${PKGVERSION}
+qt5/plugins/konsolepart.so
+share/applications/org.kde.konsole.desktop
+share/doc/HTML/ca/konsole/draganddrop-contextmenu.png
+share/doc/HTML/ca/konsole/index.cache.bz2
+share/doc/HTML/ca/konsole/index.docbook
+share/doc/HTML/de/konsole/index.cache.bz2
+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/it/konsole/index.cache.bz2
+share/doc/HTML/it/konsole/index.docbook
+share/doc/HTML/nl/konsole/index.cache.bz2
+share/doc/HTML/nl/konsole/index.docbook
+share/doc/HTML/pt/konsole/index.cache.bz2
+share/doc/HTML/pt/konsole/index.docbook
+share/doc/HTML/pt_BR/konsole/draganddrop-contextmenu.png
+share/doc/HTML/pt_BR/konsole/index.cache.bz2
+share/doc/HTML/pt_BR/konsole/index.docbook
+share/doc/HTML/sr/konsole/index.cache.bz2
+share/doc/HTML/sr/konsole/index.docbook
+share/doc/HTML/sv/konsole/index.cache.bz2
+share/doc/HTML/sv/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/khotkeys/konsole.khotkeys
+share/knotifications5/konsole.notifyrc
+share/knsrcfiles/konsole.knsrc
+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/solaris.keytab
+share/kservices5/ServiceMenus/konsolehere.desktop
+share/kservices5/ServiceMenus/konsolerun.desktop
+share/kservices5/konsolepart.desktop
+share/kservicetypes5/terminalemulator.desktop
+share/locale/ar/LC_MESSAGES/konsole.mo
+share/locale/ast/LC_MESSAGES/konsole.mo
+share/locale/bg/LC_MESSAGES/konsole.mo
+share/locale/bs/LC_MESSAGES/konsole.mo
+share/locale/ca/LC_MESSAGES/konsole.mo
+share/locale/ca@valencia/LC_MESSAGES/konsole.mo
+share/locale/cs/LC_MESSAGES/konsole.mo
+share/locale/da/LC_MESSAGES/konsole.mo
+share/locale/de/LC_MESSAGES/konsole.mo
+share/locale/el/LC_MESSAGES/konsole.mo
+share/locale/en_GB/LC_MESSAGES/konsole.mo
+share/locale/eo/LC_MESSAGES/konsole.mo
+share/locale/es/LC_MESSAGES/konsole.mo
+share/locale/et/LC_MESSAGES/konsole.mo
+share/locale/eu/LC_MESSAGES/konsole.mo
+share/locale/fa/LC_MESSAGES/konsole.mo
+share/locale/fi/LC_MESSAGES/konsole.mo
+share/locale/fr/LC_MESSAGES/konsole.mo
+share/locale/ga/LC_MESSAGES/konsole.mo
+share/locale/gl/LC_MESSAGES/konsole.mo
+share/locale/he/LC_MESSAGES/konsole.mo
+share/locale/hi/LC_MESSAGES/konsole.mo
+share/locale/hr/LC_MESSAGES/konsole.mo
+share/locale/hu/LC_MESSAGES/konsole.mo
+share/locale/ia/LC_MESSAGES/konsole.mo
+share/locale/id/LC_MESSAGES/konsole.mo
+share/locale/is/LC_MESSAGES/konsole.mo
+share/locale/it/LC_MESSAGES/konsole.mo
+share/locale/ja/LC_MESSAGES/konsole.mo
+share/locale/kk/LC_MESSAGES/konsole.mo
+share/locale/km/LC_MESSAGES/konsole.mo
+share/locale/ko/LC_MESSAGES/konsole.mo
+share/locale/lt/LC_MESSAGES/konsole.mo
+share/locale/lv/LC_MESSAGES/konsole.mo
+share/locale/ml/LC_MESSAGES/konsole.mo
+share/locale/mr/LC_MESSAGES/konsole.mo
+share/locale/nb/LC_MESSAGES/konsole.mo
+share/locale/nds/LC_MESSAGES/konsole.mo
+share/locale/nl/LC_MESSAGES/konsole.mo
+share/locale/nn/LC_MESSAGES/konsole.mo
+share/locale/pa/LC_MESSAGES/konsole.mo
+share/locale/pl/LC_MESSAGES/konsole.mo
+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/sk/LC_MESSAGES/konsole.mo
+share/locale/sl/LC_MESSAGES/konsole.mo
+share/locale/sr/LC_MESSAGES/konsole.mo
+share/locale/sv/LC_MESSAGES/konsole.mo
+share/locale/tr/LC_MESSAGES/konsole.mo
+share/locale/ug/LC_MESSAGES/konsole.mo
+share/locale/uk/LC_MESSAGES/konsole.mo
+share/locale/wa/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

Index: pkgsrc/x11/konsole/distinfo
diff -u pkgsrc/x11/konsole/distinfo:1.9 pkgsrc/x11/konsole/distinfo:1.10
--- pkgsrc/x11/konsole/distinfo:1.9     Wed Nov  4 03:28:44 2015
+++ pkgsrc/x11/konsole/distinfo Sat Mar  6 04:47:37 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:28:44 agc Exp $
+$NetBSD: distinfo,v 1.10 2021/03/06 04:47:37 markd Exp $
 
-SHA1 (konsole-4.14.3.tar.xz) = 5ae78061f38f06f80ee10f4475ff33d1c0843b4d
-RMD160 (konsole-4.14.3.tar.xz) = 501481894fb397b52ae739b7950a5ac886d377f6
-SHA512 (konsole-4.14.3.tar.xz) = 88a919ea7230ae96518a347b80dbf08d641c60557f24cff02421f22cc99da5b2daf306d8e7b820cd701983fcd3ee46171cc97e231591ad2c334574777fbdb135
-Size (konsole-4.14.3.tar.xz) = 455216 bytes
-SHA1 (patch-src_ProcessInfo.cpp) = 1b844f74b6af284d50e80b94e2ad8a1ce85b182b
+SHA1 (konsole-20.04.1.tar.xz) = 8ba73f791b283b377536d92f989ac70252bf1912
+RMD160 (konsole-20.04.1.tar.xz) = 3c3981ead2ce86c79a3d7643c2bcf72d0d6ef930
+SHA512 (konsole-20.04.1.tar.xz) = 608bc4e9652e1129b219867c01b40ea2aba4044b9827b6b39ef0d2fed436dfd091c3cd4f568673122761ceb3106e8304d490b0ad5b73210d1890a5ec9e516fa3
+Size (konsole-20.04.1.tar.xz) = 1165784 bytes
+SHA1 (patch-src_ProcessInfo.cpp) = a4c6b166f10885ae088b787d2b419b150b9446a8

Index: pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp
diff -u pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.3 pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.4
--- pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp:1.3    Thu Nov 13 10:53:49 2014
+++ pkgsrc/x11/konsole/patches/patch-src_ProcessInfo.cpp        Sat Mar  6 04:47:37 2021
@@ -1,22 +1,24 @@
-$NetBSD: patch-src_ProcessInfo.cpp,v 1.3 2014/11/13 10:53:49 markd Exp $
+$NetBSD: patch-src_ProcessInfo.cpp,v 1.4 2021/03/06 04:47:37 markd Exp $
 
---- src/ProcessInfo.cpp.orig   2014-11-01 04:17:02.000000000 +0000
+NetBSD support
+
+--- src/ProcessInfo.cpp.orig   2019-08-08 23:59:38.000000000 +0000
 +++ src/ProcessInfo.cpp
-@@ -1012,6 +1012,171 @@ private:
-         }
+@@ -999,6 +999,163 @@ private:
+         return false;
      }
  };
 +#elif defined(Q_OS_NETBSD)
 +class NetBSDProcessInfo : public UnixProcessInfo
 +{
 +public:
-+    NetBSDProcessInfo(int pid, bool env) :
-+        UnixProcessInfo(pid,env)
++    NetBSDProcessInfo(int pid) :
++        UnixProcessInfo(pid)
 +    {
 +    }
 +
 +private:
-+    virtual bool readProcInfo(int pid)
++    bool readProcInfo(int aPid) Q_DECL_OVERRIDE
 +    {
 +        // indicies of various fields within the process status file which
 +        // contain various information about the process
@@ -38,7 +40,7 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.3
 +        //
 +        // FIELD FIELD (FIELD WITH SPACES) FIELD FIELD
 +        //
-+        QFile processInfo( QString("/proc/%1/status").arg(pid) );
++        QFile processInfo( QStringLiteral("/proc/%1/status").arg(aPid) );
 +        if ( processInfo.open(QIODevice::ReadOnly) )
 +        {
 +            QTextStream stream(&processInfo);
@@ -48,18 +50,16 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.3
 +            int field = 0;
 +            int pos = 0;
 +
-+            while (pos < data.count())
-+            {
++            while (pos < data.count()) {
 +                QChar c = data[pos];
 +
-+                if ( c == '(' )
++                if ( c == QLatin1Char('(')) {
 +                    stack++;
-+                else if ( c == ')' )
++                } else if ( c == QLatin1Char(')')) {
 +                    stack--;
-+                else if ( stack == 0 && c == ' ' )
++                } else if ( stack == 0 && c == QLatin1Char(' ')) {
 +                    field++;
-+                else
-+                {
++                } else {
 +                    switch ( field )
 +                    {
 +                        case PARENT_PID_FIELD:
@@ -110,26 +110,26 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.3
 +            setName(processNameString);
 +
 +        // update object state
-+        setPid(pid);
++        setPid(aPid);
 +
 +        return ok;
 +    }
 +
-+    virtual bool readArguments(int pid)
++    bool readArguments(int aPid) Q_DECL_OVERRIDE
 +    {
 +        // read command-line arguments file found at /proc/<pid>/cmdline
 +        // the expected format is a list of strings delimited by null characters,
 +        // and ending in a double null character pair.
 +
-+        QFile argumentsFile( QString("/proc/%1/cmdline").arg(pid) );
++        QFile argumentsFile( QStringLiteral("/proc/%1/cmdline").arg(aPid) );
 +        if ( argumentsFile.open(QIODevice::ReadOnly) )
 +        {
 +            QTextStream stream(&argumentsFile);
-+            QString data = stream.readAll();
++            const QString &data = stream.readAll();
 +
-+            QStringList argList = data.split( QChar('\0') );
++            const QStringList &argList = data.split( QLatin1Char('\0') );
 +
-+            foreach ( const QString &entry , argList )
++            for ( const QString &entry : argList )
 +            {
 +                if (!entry.isEmpty())
 +                    addArgument(entry);
@@ -143,9 +143,9 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.3
 +        return true;
 +    }
 +
-+    virtual bool readCurrentDir(int pid)
++    bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
 +    {
-+        QFileInfo info( QString("/proc/%1/cwd").arg(pid) );
++        QFileInfo info( QStringLiteral("/proc/%1/cwd").arg(aPid) );
 +
 +        const bool readable = info.isReadable();
 +
@@ -164,22 +164,16 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.3
 +            return false;
 +        }
 +    }
-+
-+    virtual bool readEnvironment(int pid)
-+    {
-+        // Not supported in NetBSD
-+        return true;
-+    }
 +} ;
  #endif
  
- SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
-@@ -1168,6 +1333,8 @@ ProcessInfo* ProcessInfo::newInstance(in
-     return new LinuxProcessInfo(aPid, enableEnvironmentRead);
- #elif defined(Q_OS_SOLARIS)
-     return new SolarisProcessInfo(aPid, enableEnvironmentRead);
-+#elif defined(Q_OS_NETBSD)
-+    return new NetBSDProcessInfo(aPid, enableEnvironmentRead);
- #elif defined(Q_OS_MAC)
-     return new MacProcessInfo(aPid, enableEnvironmentRead);
+ SSHProcessInfo::SSHProcessInfo(const ProcessInfo &process) :
+@@ -1186,6 +1343,8 @@ ProcessInfo *ProcessInfo::newInstance(in
+     info = new MacProcessInfo(pid);
  #elif defined(Q_OS_FREEBSD)
+     info = new FreeBSDProcessInfo(pid);
++#elif defined(Q_OS_NETBSD)
++    info = new NetBSDProcessInfo(pid);
+ #elif defined(Q_OS_OPENBSD)
+     info = new OpenBSDProcessInfo(pid);
+ #else
Home | Main Index | Thread Index | Old Index