Module Name: pkgsrc-wip
Committed By: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By: markd
Date: Wed Apr 25 10:02:10 2018 +1200
Changeset: f528e267c0f73b55785fbf6483ad44c362071d84
Modified Files:
konsole/Makefile
konsole/PLIST
konsole/distinfo
konsole/patches/patch-src_ProcessInfo.cpp
Log Message:
konsole: update to 18.04.0
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f528e267c0f73b55785fbf6483ad44c362071d84
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
konsole/Makefile | 17 +++++++++++++----
konsole/PLIST | 3 ++-
konsole/distinfo | 10 +++++-----
konsole/patches/patch-src_ProcessInfo.cpp | 18 +++++++++---------
4 files changed, 29 insertions(+), 19 deletions(-)
diffs:
diff --git a/konsole/Makefile b/konsole/Makefile
index 385389d7d3..04fbdd9bf6 100644
--- a/konsole/Makefile
+++ b/konsole/Makefile
@@ -7,17 +7,26 @@ 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 "../../wip/kde5/applications.mk"
+.include "../../meta-pkgs/kde/applications.mk"
BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
-BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden
+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:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
+CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/konsole.knsrc \
+ ${PKG_SYSCONFDIR}/xdg/konsole.knsrc
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4support/buildlink3.mk"
.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"
diff --git a/konsole/PLIST b/konsole/PLIST
index 50ea5e97af..fc25774e2f 100644
--- a/konsole/PLIST
+++ b/konsole/PLIST
@@ -2,7 +2,7 @@
bin/konsole
bin/konsoleprofile
lib/libkdeinit5_konsole.so
-lib/libkonsoleprivate.so.17
+lib/libkonsoleprivate.so.18
lib/libkonsoleprivate.so.${PKGVERSION}
qt5/plugins/konsolepart.so
share/applications/org.kde.konsole.desktop
@@ -29,6 +29,7 @@ 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/examples/kde-xdg/konsole.knsrc
share/knotifications5/konsole.notifyrc
share/konsole/BlackOnLightYellow.colorscheme
share/konsole/BlackOnRandomLight.colorscheme
diff --git a/konsole/distinfo b/konsole/distinfo
index 3ab4025844..a7ac6d257e 100644
--- a/konsole/distinfo
+++ b/konsole/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-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
+SHA1 (konsole-18.04.0.tar.xz) = b7b3ef35d3575d6a544e8b9f8a3f37d201f6f77c
+RMD160 (konsole-18.04.0.tar.xz) = b0eb99a7b3d5b32a1185e0963cb69d711a599536
+SHA512 (konsole-18.04.0.tar.xz) = bbfe004a2cc75e761cd80ebd08e5c86aedf3c43fa9d4273008f0bbda59277f85650a9d59201c3591f2112698159da4ea4e72b02583130a20a048b31e67353396
+Size (konsole-18.04.0.tar.xz) = 1039396 bytes
+SHA1 (patch-src_ProcessInfo.cpp) = a445ec5ea3cf0fff5ed90707e641e3a02d8a9a82
diff --git a/konsole/patches/patch-src_ProcessInfo.cpp b/konsole/patches/patch-src_ProcessInfo.cpp
index 1f6148e347..8b6758a3d1 100644
--- a/konsole/patches/patch-src_ProcessInfo.cpp
+++ b/konsole/patches/patch-src_ProcessInfo.cpp
@@ -1,6 +1,6 @@
$NetBSD$
---- src/ProcessInfo.cpp.orig 2018-01-08 05:04:18.000000000 +0000
+--- src/ProcessInfo.cpp.orig 2018-04-10 14:05:33.000000000 +0000
+++ src/ProcessInfo.cpp
@@ -982,6 +982,163 @@ private:
return false;
@@ -166,12 +166,12 @@ $NetBSD$
#endif
SSHProcessInfo::SSHProcessInfo(const ProcessInfo &process) :
-@@ -1165,6 +1322,8 @@ ProcessInfo *ProcessInfo::newInstance(in
- info = new LinuxProcessInfo(aPid, titleFormat);
- #elif defined(Q_OS_SOLARIS)
- info = new SolarisProcessInfo(aPid, titleFormat);
-+#elif defined(Q_OS_NETBSD)
-+ return new NetBSDProcessInfo(aPid, titleFormat);
- #elif defined(Q_OS_MACOS)
- info = new MacProcessInfo(aPid, titleFormat);
+@@ -1169,6 +1326,8 @@ ProcessInfo *ProcessInfo::newInstance(in
+ info = new MacProcessInfo(pid, titleFormat);
#elif defined(Q_OS_FREEBSD)
+ info = new FreeBSDProcessInfo(pid, titleFormat);
++#elif defined(Q_OS_NETBSD)
++ info = new NetBSDProcessInfo(pid, titleFormat);
+ #elif defined(Q_OS_OPENBSD)
+ info = new OpenBSDProcessInfo(pid, titleFormat);
+ #else