rpms/gtk-vnc/devel gtk-vnc-0.3.4-scaling-crash.patch, NONE, 1.1 gtk-vnc.spec, 1.11, 1.12

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-0.3.4-scaling-crash.patch 
Log Message:
Update to 0.3.4 release

gtk-vnc-0.3.4-scaling-crash.patch:

--- NEW FILE gtk-vnc-0.3.4-scaling-crash.patch ---
diff -r 02bc30c3e8f6 src/vncdisplay.c
--- a/src/vncdisplay.c	Wed Mar 05 19:21:36 2008 -0600
+++ b/src/vncdisplay.c	Thu Mar 06 17:50:12 2008 -0500
@@ -1084,6 +1084,12 @@ static gboolean configure_event(GtkWidge
 static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *configure,
 				gpointer data G_GNUC_UNUSED)
 {
+	VncDisplay *obj = VNC_DISPLAY(widget);
+	VncDisplayPrivate *priv = obj->priv;
+
+	if (priv->fb.data == NULL)
+		return FALSE;
+
 	rescale_display(VNC_DISPLAY(widget),
 			configure->width, configure->height);
 	


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-vnc.spec	3 Feb 2008 22:27:17 -0000	1.11
+++ gtk-vnc.spec	7 Mar 2008 17:58:33 -0000	1.12
@@ -6,17 +6,23 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.3
+Version: 0.3.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-scaling-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gtk-vnc.sf.net/
-BuildRequires: gtk2-devel pygtk2-devel python-devel gnutls-devel zlib-devel
+BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
+BuildRequires: gnutls-devel gtkglext-devel
 %if %{with_plugin}
+%if "%{fedora}" > "8"
+BuildRequires: xulrunner-devel
+%else
 BuildRequires: firefox-devel
 %endif
+%endif
 
 %description
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@@ -46,6 +52,7 @@
 
 A module allowing use of the GTK-VNC widget from python
 
+%if %{with_plugin}
 %package plugin
 Summary: Mozilla plugin for the gtk-vnc library
 Group: Development/Libraries
@@ -57,9 +64,11 @@
 
 This package provides a web browser plugin for Mozilla compatible
 browsers.
+%endif
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %if %{with_plugin}
@@ -67,11 +76,11 @@
 %else
 %configure
 %endif
-make
+%__make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
-make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/python*/site-packages/*.a
@@ -113,6 +122,10 @@
 %endif
 
 %changelog
+* Thu Mar  6 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.4-1.fc9
+- Update to 0.3.4 release
+- Fix crash with OpenGL scaling code
+
 * Sun Feb  3 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.3-1.fc9
 - Update to 0.3.3 release