rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libksysguard: update to 5.16.4

This commit is contained in:
Mark Davies 2019-08-29 13:57:17 +12:00
parent 5bc231aab3
commit ff968fe75a
5 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libksysguard/Makefile
View File

@ -24,6 +24,12 @@ CMAKE_ARGS.NetBSD+= -DKVM_LIB=kvm
CMAKE_ARGS+= -DKAUTH_DBUS_DIR=${PREFIX}/share/examples/libksysguard
SUBST_CLASSES+= qlc
SUBST_STAGE.qlc= pre-configure
SUBST_MESSAGE.qlc= Move to new KDE location
SUBST_FILES.qlc= CMakeLists.txt
SUBST_SED.qlc= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_LOGGINGCATEGORIESDIR}:'
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dbus-1/system.d
CONF_FILES+= ${PREFIX}/share/examples/libksysguard/org.kde.ksysguard.processlisthelper.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
@ -33,5 +39,5 @@ INSTALLATION_DIRS+= share/examples/libksysguard
.include "../../x11/plasma-framework/buildlink3.mk"
.include "../../x11/libXres/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtwebkit/buildlink3.mk"
#.include "../../x11/qt5-qtwebengine/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

6
libksysguard/PLIST
View File

@ -46,10 +46,6 @@ share/locale/ar/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/ar/LC_MESSAGES/processcore.mo
share/locale/ar/LC_MESSAGES/processui.mo
share/locale/as/LC_MESSAGES/processui.mo
share/locale/ast/LC_MESSAGES/ksgrd.mo
share/locale/ast/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/ast/LC_MESSAGES/processcore.mo
share/locale/ast/LC_MESSAGES/processui.mo
share/locale/be/LC_MESSAGES/processcore.mo
share/locale/be/LC_MESSAGES/processui.mo
share/locale/be@latin/LC_MESSAGES/ksysguardlsofwidgets.mo
@ -153,6 +149,7 @@ share/locale/ia/LC_MESSAGES/ksgrd.mo
share/locale/ia/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/ia/LC_MESSAGES/processcore.mo
share/locale/ia/LC_MESSAGES/processui.mo
share/locale/id/LC_MESSAGES/ksgrd.mo
share/locale/id/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/id/LC_MESSAGES/processcore.mo
share/locale/id/LC_MESSAGES/processui.mo
@ -322,3 +319,4 @@ share/locale/zh_TW/LC_MESSAGES/ksysguardlsofwidgets.mo
share/locale/zh_TW/LC_MESSAGES/processcore.mo
share/locale/zh_TW/LC_MESSAGES/processui.mo
share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
share/qlogging-categories5/libksysguard.categories

12
libksysguard/distinfo
View File

@ -1,10 +1,10 @@
$NetBSD$
SHA1 (libksysguard-5.12.4.tar.xz) = f4a15dc10128d723e040b0698ab81d635c5ce317
RMD160 (libksysguard-5.12.4.tar.xz) = 846d8ba2fdba09a3a5a2d9314b7b74e9fadc3dbf
SHA512 (libksysguard-5.12.4.tar.xz) = c1e7e3c16c88b9ceef463503e6e776ca0a9cf4d4033aad51f6785e33a6b1e17f041ea351456a2c305888a09349d568fbff1f5feda6535b060b1c010c688cad4e
Size (libksysguard-5.12.4.tar.xz) = 567216 bytes
SHA1 (libksysguard-5.16.4.tar.xz) = d5dd6ab0fcea55919ca00abd78a28f3cb13ad427
RMD160 (libksysguard-5.16.4.tar.xz) = 146f086e5c79fc9feabcaf788e07fc5db1ee00ea
SHA512 (libksysguard-5.16.4.tar.xz) = 51143a73cc9c2fb0c13ba51dcaa430689cd1b6562c1af934972fd849d58492aab89b481c1ce91a00e25ac36b6a55915080432fc70cdac27d56a9d44ad62ff555
Size (libksysguard-5.16.4.tar.xz) = 580356 bytes
SHA1 (patch-ksgrd_SensorManager.cpp) = 90390178e85106f936bb0bcb49ae184b50ae52dc
SHA1 (patch-processcore_CMakeLists.txt) = 97f9bf250847fb79545c87e9ec8f1a80f49be338
SHA1 (patch-processcore_CMakeLists.txt) = dc6ad6525eb70079cc5d0a1ee913d8d7c42b85ea
SHA1 (patch-processcore_processes.cpp) = d2d0feb9334e4a2a5845c263ba51615f48356d0c
SHA1 (patch-processcore_processes__netbsd__p.cpp) = 348e06a3ffde214a880fbcda1ff9d73c57741897
SHA1 (patch-processcore_processes__netbsd__p.cpp) = d2812b3e9e498d28e8ede34912025605520d3e65

12
libksysguard/patches/patch-processcore_CMakeLists.txt
View File

@ -1,8 +1,8 @@
$NetBSD$
--- processcore/CMakeLists.txt.orig 2018-01-21 07:39:59.909536116 +0000
--- processcore/CMakeLists.txt.orig 2019-07-30 10:27:02.000000000 +0000
+++ processcore/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(processcore
@@ -26,7 +26,7 @@ target_link_libraries(processcore
if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
message(STATUS "Adding kvm library on NetBSD")
@ -10,13 +10,13 @@ $NetBSD$
+ target_link_libraries(processcore PRIVATE kvm ${RT_LIB_SCHED})
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
target_include_directories(processcore
@@ -56,7 +56,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})
-target_link_libraries(ksysguardprocesslist_helper Qt5::Core KF5::AuthCore KF5::I18n)
+target_link_libraries(ksysguardprocesslist_helper Qt5::Core KF5::AuthCore KF5::I18n ${KVM_LIB})
install(TARGETS ksysguardprocesslist_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
kauth_install_helper_files(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper root)

26
libksysguard/patches/patch-processcore_processes__netbsd__p.cpp
View File

@ -2,7 +2,7 @@ $NetBSD: patch-libs_ksysguard_processcore_processes__netbsd__p.cpp,v 1.1 2013/01
No more sys/user.h in netbsd.
--- processcore/processes_netbsd_p.cpp.orig 2018-03-27 11:18:34.000000000 +0000
--- processcore/processes_netbsd_p.cpp.orig 2019-07-30 10:27:02.000000000 +0000
+++ processcore/processes_netbsd_p.cpp
@@ -29,7 +29,7 @@
#include <sys/param.h>
@ -13,3 +13,27 @@ No more sys/user.h in netbsd.
#include <sys/stat.h>
#include <signal.h>
#include <unistd.h>
@@ -102,7 +102,7 @@ void ProcessesLocal::Private::readProcSt
process->setEgid(p->p_gid);
process->setTracerpid(-1);
- process->setName(QString(p->p_comm ? p->p_comm : "????"));
+ process->setName(QString::fromUtf8(p->p_comm ? p->p_comm : "????"));
}
void ProcessesLocal::Private::readProcStat(struct kinfo_proc2 *p, Process *ps)
@@ -167,11 +167,11 @@ bool ProcessesLocal::Private::readProcCm
if ((argv = kvm_getargv2(kd, p, 256)) == NULL)
return false;
- QString command = QString("");
+ QString command = QString::fromUtf8("");
while (*argv) {
- command += *argv;
- command += " ";
+ command += QString::fromUtf8(*argv);
+ command += QString::fromUtf8(" ");
argv++;
}
process->setCommand(command.trimmed());