pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libksysguard: update to 5.11.5
Module Name: pkgsrc-wip
Committed By: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By: markd
Date: Mon Jan 22 16:07:25 2018 +1300
Changeset: 095154ef9820e3986528b4d4ded2de051fc9654a
Modified Files:
libksysguard/Makefile
libksysguard/PLIST
libksysguard/distinfo
libksysguard/patches/patch-processcore_CMakeLists.txt
libksysguard/patches/patch-processcore_processes.cpp
Added Files:
libksysguard/hacks.mk
Log Message:
libksysguard: update to 5.11.5
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=095154ef9820e3986528b4d4ded2de051fc9654a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libksysguard/Makefile | 3 +++
libksysguard/PLIST | 2 ++
libksysguard/distinfo | 12 ++++++------
libksysguard/hacks.mk | 7 +++++++
.../patches/patch-processcore_CMakeLists.txt | 11 ++++++++++-
libksysguard/patches/patch-processcore_processes.cpp | 20 ++++++++++++++++++--
6 files changed, 46 insertions(+), 9 deletions(-)
diffs:
diff --git a/libksysguard/Makefile b/libksysguard/Makefile
index e776da0769..68c0413e3b 100644
--- a/libksysguard/Makefile
+++ b/libksysguard/Makefile
@@ -22,6 +22,7 @@ RT_LIB_SCHED= rt
RT_LIB_SCHED= # empty
.endif
CMAKE_ARGS+= -DRT_LIB_SCHED=${RT_LIB_SCHED}
+CMAKE_ARGS.NetBSD+= -DKVM_LIB=kvm
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d
CONF_FILES+= ${PREFIX}/share/examples/libksysguard/org.kde.ksysguard.processlisthelper.conf \
@@ -29,6 +30,8 @@ CONF_FILES+= ${PREFIX}/share/examples/libksysguard/org.kde.ksysguard.processlist
INSTALLATION_DIRS+= share/examples/libksysguard
+BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden
+
post-install:
mv ${DESTDIR}/etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf \
${DESTDIR}${PREFIX}/share/examples/libksysguard/
diff --git a/libksysguard/PLIST b/libksysguard/PLIST
index 8e2531a105..29e7351ba9 100644
--- a/libksysguard/PLIST
+++ b/libksysguard/PLIST
@@ -104,6 +104,7 @@ share/locale/et/LC_MESSAGES/ksgrd.mo
share/locale/et/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/et/LC_MESSAGES/processcore.mo
share/locale/et/LC_MESSAGES/processui.mo
+share/locale/eu/LC_MESSAGES/ksgrd.mo
share/locale/eu/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/eu/LC_MESSAGES/processcore.mo
share/locale/eu/LC_MESSAGES/processui.mo
@@ -130,6 +131,7 @@ share/locale/gl/LC_MESSAGES/processui.mo
share/locale/gu/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/gu/LC_MESSAGES/processcore.mo
share/locale/gu/LC_MESSAGES/processui.mo
+share/locale/he/LC_MESSAGES/ksgrd.mo
share/locale/he/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/he/LC_MESSAGES/processcore.mo
share/locale/he/LC_MESSAGES/processui.mo
diff --git a/libksysguard/distinfo b/libksysguard/distinfo
index e91daa82ed..b644f23246 100644
--- a/libksysguard/distinfo
+++ b/libksysguard/distinfo
@@ -1,10 +1,10 @@
$NetBSD$
-SHA1 (libksysguard-5.6.3.tar.xz) = ec014e040091ab5b92fe441974ea73c7275061fb
-RMD160 (libksysguard-5.6.3.tar.xz) = 9f5d1e7e35f062761b53ff3d311362c0f8ba91ed
-SHA512 (libksysguard-5.6.3.tar.xz) = 0254e9f1190c94173a9401f7d83583e87b16dd4cbd17d634d5ca11da9886fa595c0f91bb7c475b2ccf4d2927de59f2ecf688d6dda18d7e86e7d9f9fb6eb28813
-Size (libksysguard-5.6.3.tar.xz) = 700080 bytes
+SHA1 (libksysguard-5.11.5.tar.xz) = 9986039f6f9033e191ff1abb7c4d6003142cc4ee
+RMD160 (libksysguard-5.11.5.tar.xz) = cec53d564465ec52054dd4ac0bf409b122984a9b
+SHA512 (libksysguard-5.11.5.tar.xz) = 3a4c08aba07a71841643fc830a77ae4684ed41a8f26e6222d202738fb3c9f7ee2e816f15bcbbf5b3032fc100d33feb4d6771bf335c70548ab3bb4440d6d90286
+Size (libksysguard-5.11.5.tar.xz) = 576200 bytes
SHA1 (patch-ksgrd_SensorManager.cpp) = 90390178e85106f936bb0bcb49ae184b50ae52dc
-SHA1 (patch-processcore_CMakeLists.txt) = 7ebae7b61ddf09da6a02a9d18b42da09b79974b3
-SHA1 (patch-processcore_processes.cpp) = e117a60a77aa7355e562ac22966e2adbdfb402e7
+SHA1 (patch-processcore_CMakeLists.txt) = 97f9bf250847fb79545c87e9ec8f1a80f49be338
+SHA1 (patch-processcore_processes.cpp) = d2d0feb9334e4a2a5845c263ba51615f48356d0c
SHA1 (patch-processcore_processes__netbsd__p.cpp) = e69a3775effc375bb8eb5dfdc0cb4622d4c3aeb1
diff --git a/libksysguard/hacks.mk b/libksysguard/hacks.mk
new file mode 100644
index 0000000000..6a89854605
--- /dev/null
+++ b/libksysguard/hacks.mk
@@ -0,0 +1,7 @@
+# $NetBSD: hacks.mk,v 1.1 2018/01/17 20:00:21 markd Exp $
+
+# linking -lQt5Widgets on NetBSD with gcc produces
+# ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
+# /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
+# unless -lexecinfo preceeds -lQt5Widgets
+BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets
diff --git a/libksysguard/patches/patch-processcore_CMakeLists.txt b/libksysguard/patches/patch-processcore_CMakeLists.txt
index 566f18e58e..5bf2edb7e7 100644
--- a/libksysguard/patches/patch-processcore_CMakeLists.txt
+++ b/libksysguard/patches/patch-processcore_CMakeLists.txt
@@ -1,6 +1,6 @@
$NetBSD$
---- processcore/CMakeLists.txt.orig 2016-04-19 11:13:53.000000000 +0000
+--- processcore/CMakeLists.txt.orig 2018-01-21 07:39:59.909536116 +0000
+++ processcore/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(processcore
@@ -11,3 +11,12 @@ $NetBSD$
endif()
target_include_directories(processcore PUBLIC "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>" "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/ksysguard>")
+@@ -49,7 +49,7 @@ set(ksysguardprocesslist_helper_srcs
+ processes_base_p.cpp)
+
+ add_executable(ksysguardprocesslist_helper ${ksysguardprocesslist_helper_srcs})
+-target_link_libraries(ksysguardprocesslist_helper Qt5::Core KF5::Auth KF5::I18n)
++target_link_libraries(ksysguardprocesslist_helper Qt5::Core KF5::Auth KF5::I18n ${KVM_LIB})
+ install(TARGETS ksysguardprocesslist_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
+
+ kauth_install_helper_files(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper root)
diff --git a/libksysguard/patches/patch-processcore_processes.cpp b/libksysguard/patches/patch-processcore_processes.cpp
index 9f745f6dbd..daa30b280b 100644
--- a/libksysguard/patches/patch-processcore_processes.cpp
+++ b/libksysguard/patches/patch-processcore_processes.cpp
@@ -2,7 +2,23 @@ $NetBSD: patch-libs_ksysguard_processcore_processes.cpp,v 1.1 2012/03/19 19:44:0
--- processcore/processes.cpp.orig 2016-04-19 11:13:53.000000000 +0000
+++ processcore/processes.cpp
-@@ -206,6 +206,7 @@ bool Processes::updateProcessInfo(Proces
+@@ -162,6 +162,7 @@ bool Processes::updateProcess( Process *
+ }
+
+ bool Processes::updateProcessInfo(Process *ps) {
++#ifndef Q_OS_NETBSD
+ //Now we can actually get the process info
+ qlonglong oldUserTime = ps->userTime();
+ qlonglong oldSysTime = ps->sysTime();
+@@ -181,6 +182,7 @@ bool Processes::updateProcessInfo(Proces
+ oldIoCharactersActuallyRead = ps->ioCharactersActuallyRead();
+ oldIoCharactersActuallyWritten = ps->ioCharactersActuallyWritten();
+ }
++#endif
+
+ ps->setChanges(Process::Nothing);
+ bool success;
+@@ -206,6 +208,7 @@ bool Processes::updateProcessInfo(Proces
}
#endif
if(d->mUpdateFlags.testFlag(Processes::IOStatistics)) {
@@ -10,7 +26,7 @@ $NetBSD: patch-libs_ksysguard_processcore_processes.cpp,v 1.1 2012/03/19 19:44:0
if( d->mHavePreviousIoValues ) {
ps->setIoCharactersReadRate((ps->ioCharactersRead() - oldIoCharactersRead) * 1000.0 / elapsedTime);
ps->setIoCharactersWrittenRate((ps->ioCharactersWritten() - oldIoCharactersWritten) * 1000.0 / elapsedTime);
-@@ -215,6 +216,7 @@ bool Processes::updateProcessInfo(Proces
+@@ -215,6 +218,7 @@ bool Processes::updateProcessInfo(Proces
ps->setIoCharactersActuallyWrittenRate((ps->ioCharactersActuallyWritten() - oldIoCharactersActuallyWritten) * 1000.0 / elapsedTime);
} else
d->mHavePreviousIoValues = true;
Home |
Main Index |
Thread Index |
Old Index