diff --git a/gtk-vnc-0.3.4-scaling-crash.patch b/gtk-vnc-0.3.4-scaling-crash.patch new file mode 100644 index 0000000..efbdcfe --- /dev/null +++ b/gtk-vnc-0.3.4-scaling-crash.patch @@ -0,0 +1,16 @@ +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); + diff --git a/gtk-vnc.spec b/gtk-vnc.spec index 87db798..7954fe0 100644 --- a/gtk-vnc.spec +++ b/gtk-vnc.spec @@ -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 @@ allowing it to be completely asynchronous while remaining single threaded. 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 @@ 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} @@ -67,11 +76,11 @@ browsers. %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 @@ rm -fr %{buildroot} %endif %changelog +* Thu Mar 6 2008 Daniel P. Berrange - 0.3.4-1.fc9 +- Update to 0.3.4 release +- Fix crash with OpenGL scaling code + * Sun Feb 3 2008 Daniel P. Berrange - 0.3.3-1.fc9 - Update to 0.3.3 release