rpms/gtk-vnc/F-8 gtk-vnc-0.3.4-scaling-crash.patch, NONE, 1.1 gtk-vnc.spec, 1.9, 1.10 sources, 1.4, 1.5 gtk-vnc-0.3.2-keystate-tracking.patch, 1.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/gtk-vnc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27888

Modified Files:
	gtk-vnc.spec sources 
Added Files:
	gtk-vnc-0.3.4-scaling-crash.patch 
Removed Files:
	gtk-vnc-0.3.2-keystate-tracking.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/F-8/gtk-vnc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-vnc.spec	31 Jan 2008 16:54:05 -0000	1.9
+++ gtk-vnc.spec	7 Mar 2008 19:34:09 -0000	1.10
@@ -1,16 +1,28 @@
 # -*- rpm-spec -*-
 
+# Plugin isn't ready for real world use yet - it needs
+# a security audit at very least
+%define with_plugin 0
+
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.2
-Release: 2%{?dist}
+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}-keystate-tracking.patch
+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
@@ -40,21 +52,43 @@
 
 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
+Requires: %{name} = %{version}
+
+%description plugin
+gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
+allowing it to be completely asynchronous while remaining single threaded.
+
+This package provides a web browser plugin for Mozilla compatible
+browsers.
+%endif
+
 %prep
 %setup -q
 %patch1 -p1
 
 %build
+%if %{with_plugin}
+%configure --enable-plugin=yes
+%else
 %configure
-make
+%endif
+%__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
 rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
+%if %{with_plugin}
+rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a
+rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
+%endif
 
 %clean
 rm -fr %{buildroot}
@@ -81,7 +115,17 @@
 %doc examples/gvncviewer.py
 %{_libdir}/python*/site-packages/gtkvnc.so
 
+%if %{with_plugin}
+%files plugin
+%defattr(-, root, root)
+%{_libdir}/mozilla/plugins/%{name}-plugin.so
+%endif
+
 %changelog
+* Thu Mar  6 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.4-1.fc8
+- Update to 0.3.4 release
+- Fix crash with OpenGL scaling code
+
 * Thu Jan 31 2008 Daniel P. Berrange <berrange at redhat.com> - 0.3.2-2.fc8
 - Fix modifier state tracking (rhbz #427997)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Dec 2007 18:04:57 -0000	1.4
+++ sources	7 Mar 2008 19:34:09 -0000	1.5
@@ -1 +1 @@
-d87f4921c031c77335907c19ca1dbf03  gtk-vnc-0.3.2.tar.gz
+5ccf094bfb47ad5fe224d7feca175de2  gtk-vnc-0.3.4.tar.gz


--- gtk-vnc-0.3.2-keystate-tracking.patch DELETED ---