konsole: update to 17.12.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: konsole: update to 17.12.1
From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Date: Mon, 22 Jan 2018 10:29:09 +0000
Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Mon Jan 22 23:29:09 2018 +1300
Changeset:	70549f65aa1b647cdc4924ce5c300fd2b4ff1841

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

Log Message:
konsole: update to 17.12.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=70549f65aa1b647cdc4924ce5c300fd2b4ff1841

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

diffstat:
 konsole/Makefile                          |  2 +
 konsole/PLIST                             | 82 +++++++++++++++++++++++++++++--
 konsole/distinfo                          | 10 ++--
 konsole/patches/patch-src_ProcessInfo.cpp | 58 ++++++++++------------
 4 files changed, 109 insertions(+), 43 deletions(-)

diffs:
diff --git a/konsole/Makefile b/konsole/Makefile
index 16f5eb5723..385389d7d3 100644
--- a/konsole/Makefile
+++ b/konsole/Makefile
@@ -13,6 +13,8 @@ BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge
 
+BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4support/buildlink3.mk"
 .include "../../devel/knotifyconfig/buildlink3.mk"
diff --git a/konsole/PLIST b/konsole/PLIST
index 3fa0329608..50ea5e97af 100644
--- a/konsole/PLIST
+++ b/konsole/PLIST
@@ -2,22 +2,42 @@
 bin/konsole
 bin/konsoleprofile
 lib/libkdeinit5_konsole.so
-lib/libkonsoleprivate.so.16
+lib/libkonsoleprivate.so.17
 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/index.cache.bz2
+share/doc/HTML/uk/konsole/index.docbook
 share/knotifications5/konsole.notifyrc
 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/README.KeyTab
 share/konsole/RedOnBlack.colorscheme
 share/konsole/Solarized.colorscheme
 share/konsole/SolarizedLight.colorscheme
@@ -29,7 +49,59 @@ share/kservices5/ServiceMenus/konsolehere.desktop
 share/kservices5/ServiceMenus/konsolerun.desktop
 share/kservices5/konsolepart.desktop
 share/kservicetypes5/terminalemulator.desktop
-share/kxmlgui5/konsole/konsoleui.rc
-share/kxmlgui5/konsole/partui.rc
-share/kxmlgui5/konsole/sessionui.rc
+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/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
diff --git a/konsole/distinfo b/konsole/distinfo
index f2c98e9b5f..3ab4025844 100644
--- a/konsole/distinfo
+++ b/konsole/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (konsole-16.04.0.tar.xz) = 7731926ee425149a8798dd3f618e6ff6e131dac7
-RMD160 (konsole-16.04.0.tar.xz) = 16821478861008664a0c7437a9690e5baf1c4a60
-SHA512 (konsole-16.04.0.tar.xz) = 0c1c1e334e30900a1b5cd0dc2993bcd7f5d76e1a79b8f3e7603acbf76a69d466411de36aef82e77af69c052594098fe0a1d9ec34da8d03fbe649253a8b018cc3
-Size (konsole-16.04.0.tar.xz) = 460388 bytes
-SHA1 (patch-src_ProcessInfo.cpp) = bfda4ebb4be56727cfd0b994dd9164c3eeff0378
+SHA1 (konsole-17.12.1.tar.xz) = a24a63a6c2ca23eba039c932086082bbc11539d2
+RMD160 (konsole-17.12.1.tar.xz) = e8793f4d9b513aff8a991bc1ee6303d263f6e594
+SHA512 (konsole-17.12.1.tar.xz) = af1e2e0ecb18a213de0ab452ed7db5b17ac477571b9d5ebaadad407714733e80f379f7ee6a506312c42e9bfe5990087b6f63655d18dc1cb302ff1bd446c2dfdb
+Size (konsole-17.12.1.tar.xz) = 1026684 bytes
+SHA1 (patch-src_ProcessInfo.cpp) = bc29390b58f44c6281ef459895ceb1260969b4e1
diff --git a/konsole/patches/patch-src_ProcessInfo.cpp b/konsole/patches/patch-src_ProcessInfo.cpp
index 23cecee853..1f6148e347 100644
--- a/konsole/patches/patch-src_ProcessInfo.cpp
+++ b/konsole/patches/patch-src_ProcessInfo.cpp
@@ -1,22 +1,22 @@
 $NetBSD$
 
---- src/ProcessInfo.cpp.orig	2016-04-13 16:49:23.000000000 +0000
+--- src/ProcessInfo.cpp.orig	2018-01-08 05:04:18.000000000 +0000
 +++ src/ProcessInfo.cpp
-@@ -1014,6 +1014,171 @@ private:
-         }
+@@ -982,6 +982,163 @@ private:
+         return false;
      }
  };
 +#elif defined(Q_OS_NETBSD)
 +class NetBSDProcessInfo : public UnixProcessInfo
 +{
 +public:
-+    NetBSDProcessInfo(int pid, bool env) :
-+        UnixProcessInfo(pid,env)
++    NetBSDProcessInfo(int aPid, const QString &titleFormat) :
++        UnixProcessInfo(aPid, titleFormat)
 +    {
 +    }
 +
 +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 +38,7 @@ $NetBSD$
 +        //
 +        // 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 +48,16 @@ $NetBSD$
 +            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,24 +108,24 @@ $NetBSD$
 +            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();
 +
-+            QStringList argList = data.split( QChar('\0') );
++            QStringList argList = data.split( QLatin1Char('\0') );
 +
 +            foreach ( const QString &entry , argList )
 +            {
@@ -143,9 +141,9 @@ $NetBSD$
 +        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 +162,16 @@ $NetBSD$
 +            return false;
 +        }
 +    }
-+
-+    virtual bool readEnvironment(int pid)
-+    {
-+        // Not supported in NetBSD
-+        return true;
-+    }
 +} ;
  #endif
  
- SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
-@@ -1170,6 +1335,8 @@ ProcessInfo* ProcessInfo::newInstance(in
-     return new LinuxProcessInfo(aPid, enableEnvironmentRead);
+ SSHProcessInfo::SSHProcessInfo(const ProcessInfo &process) :
+@@ -1165,6 +1322,8 @@ ProcessInfo *ProcessInfo::newInstance(in
+     info = new LinuxProcessInfo(aPid, titleFormat);
  #elif defined(Q_OS_SOLARIS)
-     return new SolarisProcessInfo(aPid, enableEnvironmentRead);
+     info = new SolarisProcessInfo(aPid, titleFormat);
 +#elif defined(Q_OS_NETBSD)
-+    return new NetBSDProcessInfo(aPid, enableEnvironmentRead);
- #elif defined(Q_OS_MAC)
-     return new MacProcessInfo(aPid, enableEnvironmentRead);
++    return new NetBSDProcessInfo(aPid, titleFormat);
+ #elif defined(Q_OS_MACOS)
+     info = new MacProcessInfo(aPid, titleFormat);
  #elif defined(Q_OS_FREEBSD)
Prev by Date: kscreen: update to 5.11.5
Next by Date: kinfocenter: update to 5.11.5
Previous by Thread: kscreen: update to 5.11.5
Next by Thread: kinfocenter: update to 5.11.5
Indexes:
Home | Main Index | Thread Index | Old Index