forked from Lainports/freebsd-ports
6b1622d5ff
- Bump PORTREVISION
PR: ports/164893
Submitted by: Brandon Gooch <jamesbrandongooch@gmail.com> &
Nikos Ntarmos <ntarmos@ceid.upatras.gr> (maintainer)
64 lines
1.4 KiB
C
64 lines
1.4 KiB
C
--- src/conky.c.orig 2010-10-06 00:29:36.000000000 +0300
|
|
+++ src/conky.c 2012-03-05 01:03:43.000000000 +0200
|
|
@@ -119,7 +119,7 @@
|
|
#include "openbsd.h"
|
|
#endif
|
|
|
|
-#if defined(__FreeBSD_kernel__)
|
|
+#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0)
|
|
#include <bsd/bsd.h>
|
|
#endif
|
|
|
|
@@ -2072,9 +2072,11 @@
|
|
OBJ(xmms2_percent) {
|
|
snprintf(p, p_max_size, "%2.0f", cur->xmms2.progress * 100);
|
|
}
|
|
+#ifdef X11
|
|
OBJ(xmms2_bar) {
|
|
new_bar(obj, p, p_max_size, (int) (cur->xmms2.progress * 255.0f));
|
|
}
|
|
+#endif /* X11 */
|
|
OBJ(xmms2_playlist) {
|
|
snprintf(p, p_max_size, "%s", cur->xmms2.playlist);
|
|
}
|
|
@@ -2150,6 +2152,7 @@
|
|
snprintf(p, p_max_size, "%s",
|
|
cur->audacious.items[AUDACIOUS_MAIN_VOLUME]);
|
|
}
|
|
+#ifdef X11
|
|
OBJ(audacious_bar) {
|
|
double progress;
|
|
|
|
@@ -2158,6 +2161,7 @@
|
|
atof(cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
|
|
new_bar(obj, p, p_max_size, (int) (progress * 255.0f));
|
|
}
|
|
+#endif /* X11 */
|
|
#endif /* AUDACIOUS */
|
|
|
|
#ifdef BMPX
|
|
@@ -5716,6 +5720,7 @@
|
|
"kvm_open")) == NULL) {
|
|
CRIT_ERR(NULL, NULL, "cannot read kvm");
|
|
}
|
|
+ pthread_mutex_init(&kvm_proc_mutex, NULL);
|
|
#endif
|
|
|
|
while (1) {
|
|
@@ -5999,6 +6004,7 @@
|
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
kvm_close(kd);
|
|
+ pthread_mutex_destroy(&kvm_proc_mutex);
|
|
#endif
|
|
|
|
return 0;
|
|
@@ -6007,7 +6013,7 @@
|
|
|
|
void alarm_handler(void) {
|
|
if(childpid > 0) {
|
|
- kill(childpid, SIGTERM);
|
|
+ kill(childpid, SIGKILL);
|
|
}
|
|
}
|
|
|