rpms/gkrellm/F-12 gkrellm-2.3.2-dead-bat-crash.patch, NONE, 1.1 gkrellm-2.3.2-transp-crash.patch, NONE, 1.1 gkrellm.spec, 1.25, 1.26
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Dec 20 14:09:50 UTC 2009
Author: jwrdegoede
Update of /cvs/pkgs/rpms/gkrellm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11549
Modified Files:
gkrellm.spec
Added Files:
gkrellm-2.3.2-dead-bat-crash.patch
gkrellm-2.3.2-transp-crash.patch
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
- Don't crash on laptops with dead batteries (#545987)
- Don't crash with transparent themes (#549005)
gkrellm-2.3.2-dead-bat-crash.patch:
linux.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE gkrellm-2.3.2-dead-bat-crash.patch ---
diff -up gkrellm-2.3.2/src/sysdeps/linux.c~ gkrellm-2.3.2/src/sysdeps/linux.c
--- gkrellm-2.3.2/src/sysdeps/linux.c~ 2008-10-04 02:38:28.000000000 +0200
+++ gkrellm-2.3.2/src/sysdeps/linux.c 2009-12-20 14:51:17.000000000 +0100
@@ -1862,6 +1862,9 @@ sysfs_power_data (struct syspower *sp)
if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_full))
{
charge_full = strtoll (buf, NULL, 0);
+ /* Check for broken batteries (avoids div by zero) */
+ if (charge_full == 0)
+ return FALSE;
}
if (read_sysfs_entry (buf, sizeof (buf), sp->sys_charge_now))
{
gkrellm-2.3.2-transp-crash.patch:
winops-x11.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gkrellm-2.3.2-transp-crash.patch ---
diff -up gkrellm-2.3.2/src/winops-x11.c~ gkrellm-2.3.2/src/winops-x11.c
--- gkrellm-2.3.2/src/winops-x11.c~ 2008-10-04 02:35:53.000000000 +0200
+++ gkrellm-2.3.2/src/winops-x11.c 2009-12-20 14:43:45.000000000 +0100
@@ -538,7 +538,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
GkrellmMargin *m;
gint x, y;
- if ( root_xpixmap == None || !cp->transparency
+ if ( root_xpixmap == None || trans_gc == NULL || !cp->transparency
|| !cp->drawing_area || !cp->drawing_area->window
)
return FALSE;
@@ -605,7 +605,7 @@ gkrellm_winop_draw_rootpixmap_onto_trans
Window child;
gint x, y;
- if ( root_xpixmap == None || !p->transparency
+ if ( root_xpixmap == None || trans_gc == NULL || !p->transparency
|| !p->drawing_area || !p->drawing_area->window
)
return FALSE;
Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-12/gkrellm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gkrellm.spec 3 Dec 2009 08:58:55 -0000 1.25
+++ gkrellm.spec 20 Dec 2009 14:09:50 -0000 1.26
@@ -1,6 +1,6 @@
Name: gkrellm
Version: 2.3.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Multiple stacked system monitors in one process
Group: Applications/System
License: GPLv3+
@@ -14,6 +14,8 @@ Patch2: gkrellm-2.2.4-sansfont.p
Patch3: gkrellm-2.2.7-width.patch
Patch4: gkrellm-2.3.1-netdb.patch
Patch5: gkrellm-2.3.2-ssl-threadsafety.patch
+Patch6: gkrellm-2.3.2-dead-bat-crash.patch
+Patch7: gkrellm-2.3.2-transp-crash.patch
BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
BuildRequires: lm_sensors-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +65,8 @@ Development files for the GNU Krell Moni
%patch3 -p1 -z .width
%patch4 -p1 -z .netdb
%patch5 -p1 -z .ssl
+%patch6 -p1
+%patch7 -p1
for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -169,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-8
+- Don't crash on laptops with dead batteries (#545987)
+- Don't crash with transparent themes (#549005)
+
* Fri Nov 27 2009 Hans de Goede <hdegoede at redhat.com> 2.3.2-7
- Fix crash when using multiple simap/spop mailboxes (#541824)
More information about the fedora-extras-commits
mailing list