Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | dde0a9b66f | |
Bill Nottingham | 12207b9235 | |
Miroslav Lichvar | 46d3b8caac | |
Jesse Keating | c8550dcee9 |
|
@ -1 +0,0 @@
|
|||
conky-1.6.1.tar.bz2
|
|
@ -0,0 +1 @@
|
|||
conky-1.7.0.tar.bz2
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: conky
|
||||
# $Id$
|
||||
NAME := conky
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -1,17 +0,0 @@
|
|||
diff -up conky-1.6.0/src/linux.c.rdtsc conky-1.6.0/src/linux.c
|
||||
--- conky-1.6.0/src/linux.c.rdtsc 2008-07-15 03:02:37.000000000 +0200
|
||||
+++ conky-1.6.0/src/linux.c 2008-07-22 13:56:04.000000000 +0200
|
||||
@@ -1061,9 +1061,11 @@ void get_adt746x_cpu(char *p_client_buff
|
||||
unsigned long long int rdtsc(void)
|
||||
{
|
||||
unsigned long long int x;
|
||||
+ unsigned int a, d;
|
||||
|
||||
- __asm__ volatile(".byte 0x0f, 0x31":"=A" (x));
|
||||
- return x;
|
||||
+ __asm__ volatile(".byte 0x0f, 0x31":"=a" (a),"=d" (d));
|
||||
+ x = d;
|
||||
+ return x << 32 | a;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -up conky-1.6.1/src/linux.c.ifaddrs conky-1.6.1/src/linux.c
|
||||
--- conky-1.6.1/src/linux.c.ifaddrs 2008-08-20 12:50:15.000000000 +0200
|
||||
+++ conky-1.6.1/src/linux.c 2008-08-20 12:50:31.000000000 +0200
|
||||
@@ -353,7 +353,7 @@ void update_net_stats(void)
|
||||
for (i2 = 0; i2 < 16; i2++) {
|
||||
struct net_stat *ns;
|
||||
char *s, *p;
|
||||
- char temp_addr[17];
|
||||
+ char temp_addr[18];
|
||||
long long r, t, last_recv, last_trans;
|
||||
|
||||
if (fgets(buf, 255, net_dev_fp) == NULL) {
|
||||
@@ -380,9 +380,9 @@ void update_net_stats(void)
|
||||
memset(&(ns->addr.sa_data), 0, 14);
|
||||
|
||||
if(NULL == ns->addrs)
|
||||
- ns->addrs = (char*) malloc(17 * 16);
|
||||
+ ns->addrs = (char*) malloc(17 * 16 + 1);
|
||||
if(NULL != ns->addrs)
|
||||
- memset(ns->addrs, 0, 17 * 16); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
|
||||
+ memset(ns->addrs, 0, 17 * 16 + 1); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
|
||||
|
||||
last_recv = ns->recv;
|
||||
last_trans = ns->trans;
|
|
@ -0,0 +1,54 @@
|
|||
commit 27fff0d9cbe067fc08e3690655e8d2e80dd83be4
|
||||
Author: Brenden Matthews <brenden@rty.ca>
|
||||
Date: Fri May 1 23:05:06 2009 -0600
|
||||
|
||||
Fixed $texeci regression.
|
||||
|
||||
diff --git a/src/conky.c b/src/conky.c
|
||||
index 13ae965..128494e 100644
|
||||
--- a/src/conky.c
|
||||
+++ b/src/conky.c
|
||||
@@ -587,21 +587,24 @@ void *threaded_exec(void *) __attribute__((noreturn));
|
||||
|
||||
void *threaded_exec(void *arg)
|
||||
{
|
||||
- char *p2;
|
||||
+ char *buff, *p2;
|
||||
struct text_object *obj = (struct text_object *)arg;
|
||||
|
||||
while (1) {
|
||||
- p2 = obj->data.texeci.buffer;
|
||||
- timed_thread_lock(obj->data.texeci.p_timed_thread);
|
||||
- read_exec(obj->data.texeci.cmd, obj->data.texeci.buffer,
|
||||
+ buff = malloc(text_buffer_size);
|
||||
+ read_exec(obj->data.texeci.cmd, buff,
|
||||
text_buffer_size);
|
||||
+ p2 = buff;
|
||||
while (*p2) {
|
||||
if (*p2 == '\001') {
|
||||
*p2 = ' ';
|
||||
}
|
||||
p2++;
|
||||
}
|
||||
+ timed_thread_lock(obj->data.texeci.p_timed_thread);
|
||||
+ strncpy(obj->data.texeci.buffer, buff, text_buffer_size);
|
||||
timed_thread_unlock(obj->data.texeci.p_timed_thread);
|
||||
+ free(buff);
|
||||
if (timed_thread_test(obj->data.texeci.p_timed_thread, 0)) {
|
||||
timed_thread_exit(obj->data.texeci.p_timed_thread);
|
||||
}
|
||||
@@ -3746,10 +3749,11 @@ static void generate_text_internal(char *p, int p_max_size,
|
||||
if (timed_thread_run(obj->data.texeci.p_timed_thread)) {
|
||||
ERR("Error running texeci timed thread");
|
||||
}
|
||||
+ } else {
|
||||
+ timed_thread_lock(obj->data.texeci.p_timed_thread);
|
||||
+ snprintf(p, text_buffer_size, "%s", obj->data.texeci.buffer);
|
||||
+ timed_thread_unlock(obj->data.texeci.p_timed_thread);
|
||||
}
|
||||
- timed_thread_lock(obj->data.texeci.p_timed_thread);
|
||||
- snprintf(p, text_buffer_size, "%s", obj->data.texeci.buffer);
|
||||
- timed_thread_unlock(obj->data.texeci.p_timed_thread);
|
||||
}
|
||||
#endif /* HAVE_POPEN */
|
||||
OBJ(imap_unseen) {
|
23
conky.spec
23
conky.spec
|
@ -1,21 +1,21 @@
|
|||
%bcond_without audacious
|
||||
%bcond_with moc
|
||||
%bcond_without mpd
|
||||
%bcond_with nvidia
|
||||
%bcond_without rss
|
||||
%bcond_without smapi
|
||||
%bcond_without ibm
|
||||
%bcond_without wlan
|
||||
|
||||
Name: conky
|
||||
Version: 1.6.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A system monitor for X
|
||||
|
||||
Group: User Interface/X
|
||||
License: GPLv3+
|
||||
URL: http://conky.sf.net/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: conky-1.6.0-rdtsc.patch
|
||||
Patch1: conky-1.6.1-ifaddrs.patch
|
||||
Patch1: conky-1.7.0-texeci.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libXft-devel
|
||||
|
@ -36,20 +36,20 @@ It just keeps on given'er. Yeah.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .rdtsc
|
||||
%patch1 -p1 -b .ifaddrs
|
||||
%patch1 -p1 -b .texeci
|
||||
|
||||
for i in AUTHORS ChangeLog; do
|
||||
for i in AUTHORS; do
|
||||
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
||||
done
|
||||
|
||||
%build
|
||||
%configure \
|
||||
%{?with_audacious: --enable-audacious=yes} \
|
||||
%{!?with_moc: --disable-moc} \
|
||||
%{!?with_mpd: --disable-mpd} \
|
||||
%{?with_nvidia: --enable-nvidia} \
|
||||
%{?with_rss: --enable-rss} \
|
||||
%{?with_smapi: --enable-smapi} \
|
||||
%{?with_ibm: --enable-ibm} \
|
||||
%{?with_wlan: --enable-wlan} \
|
||||
;
|
||||
|
||||
|
@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html doc/conky.conf
|
||||
%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html
|
||||
%dir %{_sysconfdir}/conky
|
||||
%config %{_sysconfdir}/conky/conky.conf
|
||||
%{_bindir}/*
|
||||
|
@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon May 11 2009 Miroslav Lichvar <mlichvar@redhat.com> - 1.7.0-1
|
||||
- Update to 1.7.0
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue