rpms/conky/devel conky-1.7.0-texeci.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 conky.spec, 1.13, 1.14 sources, 1.8, 1.9 conky-1.6.0-rdtsc.patch, 1.1, NONE conky-1.6.1-ifaddrs.patch, 1.1, NONE
Miroslav Lichvar
mlichvar at fedoraproject.org
Mon May 11 16:42:36 UTC 2009
Author: mlichvar
Update of /cvs/pkgs/rpms/conky/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15046
Modified Files:
.cvsignore conky.spec sources
Added Files:
conky-1.7.0-texeci.patch
Removed Files:
conky-1.6.0-rdtsc.patch conky-1.6.1-ifaddrs.patch
Log Message:
- Update to 1.7.0
conky-1.7.0-texeci.patch:
--- NEW FILE conky-1.7.0-texeci.patch ---
commit 27fff0d9cbe067fc08e3690655e8d2e80dd83be4
Author: Brenden Matthews <brenden at 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) {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 14 Aug 2008 17:53:59 -0000 1.8
+++ .cvsignore 11 May 2009 16:42:06 -0000 1.9
@@ -1 +1 @@
-conky-1.6.1.tar.bz2
+conky-1.7.0.tar.bz2
Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/conky.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- conky.spec 24 Feb 2009 08:56:46 -0000 1.13
+++ conky.spec 11 May 2009 16:42:06 -0000 1.14
@@ -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 at redhat.com> - 1.7.0-1
+- Update to 1.7.0
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 14 Aug 2008 17:53:59 -0000 1.8
+++ sources 11 May 2009 16:42:06 -0000 1.9
@@ -1 +1 @@
-b2839f21cec18e5eaa338c7440a1ba28 conky-1.6.1.tar.bz2
+10360c37d76ab25f4d585bcdfd07f075 conky-1.7.0.tar.bz2
--- conky-1.6.0-rdtsc.patch DELETED ---
--- conky-1.6.1-ifaddrs.patch DELETED ---
More information about the scm-commits
mailing list