rpms/gkrellm/F-11 gkrellm-2.3.2-transp-crash.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gkrellm.spec, 1.23, 1.24 sources, 1.6, 1.7 gkrellm-2.3.1-netdb.patch, 1.2, NONE gkrellm-2.3.2-ssl-threadsafety.patch, 1.1, NONE

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/gkrellm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24780

Modified Files:
	.cvsignore gkrellm.spec sources 
Added Files:
	gkrellm-2.3.2-transp-crash.patch 
Removed Files:
	gkrellm-2.3.1-netdb.patch gkrellm-2.3.2-ssl-threadsafety.patch 
Log Message:
* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
- New upstream release 2.3.3
- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
- Drop a number of upstreamed patches


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 18:42:37 -0000	1.6
+++ .cvsignore	22 Dec 2009 08:33:41 -0000	1.7
@@ -1 +1 @@
-gkrellm-2.3.2.tar.bz2
+gkrellm-2.3.3.tar.bz2


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-11/gkrellm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gkrellm.spec	3 Dec 2009 08:59:49 -0000	1.23
+++ gkrellm.spec	22 Dec 2009 08:33:41 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           gkrellm
-Version:        2.3.2
-Release:        7%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -12,8 +12,7 @@ Source3:        gkrellm.png
 Patch1:         gkrellm-2.1.28-config.patch
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
-Patch4:         gkrellm-2.3.1-netdb.patch
-Patch5:         gkrellm-2.3.2-ssl-threadsafety.patch
+Patch4:         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)
@@ -61,8 +60,7 @@ Development files for the GNU Krell Moni
 %patch1 -p1 -z .config
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
-%patch4 -p1 -z .netdb
-%patch5 -p1 -z .ssl
+%patch4 -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 +167,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 22 2009 Hans de Goede <hdegoede at redhat.com> 2.3.3-1
+- New upstream release 2.3.3
+- Fixes the gkrellm client crash when the gkrellm server reboots (#545327)
+- Drop a number of upstreamed patches
+
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Oct 2008 18:42:37 -0000	1.6
+++ sources	22 Dec 2009 08:33:41 -0000	1.7
@@ -1 +1 @@
-d5543a439ee77950282d06b000048be7  gkrellm-2.3.2.tar.bz2
+74c5252952c08a9866a6d381b7fd7454  gkrellm-2.3.3.tar.bz2


--- gkrellm-2.3.1-netdb.patch DELETED ---


--- gkrellm-2.3.2-ssl-threadsafety.patch DELETED ---