Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=fc09dd8e887d2d932269d34002460674f298e465
commit fc09dd8e887d2d932269d34002460674f298e465
Author: bouleetbil
Date: Mon Jan 31 13:30:01 2011 +0100
gtk-vnc-0.4.2-2-x86_64
*added gtk3 support
diff --git a/source/xlib-extra/gtk-vnc/FrugalBuild
b/source/xlib-extra/gtk-vnc/FrugalBuild
index e106619..4a3a70e 100644
--- a/source/xlib-extra/gtk-vnc/FrugalBuild
+++ b/source/xlib-extra/gtk-vnc/FrugalBuild
@@ -10,10 +10,38 @@ depends=('gtk+2>=2.20.0-2' 'libxau' 'libxdmcp' 'freetype2'
'gnutls' 'libgcrypt'
makedepends=('intltool' 'perl-text-csv' 'libtool')
_F_gnome_devel="y"
Finclude gnome
+source=($source frambuffer.diff gdk3.diff motion.diff tlsShutdown.diff \
+ gtk3.diff pixmap.diff unref.diff)
groups=('xlib-extra')
archs=('i686' 'ppc' 'x86_64')
-Fconfopts="${Fconfopts[@]} --with-coroutine=gthread"
-sha1sums=('8aa76bbb6a47951d4692ebb1ac241fa7b3bda2ef')
+Fconfopts="${Fconfopts[@]} --with-coroutine=gthread --enable-introspection=yes"
+sha1sums=('8aa76bbb6a47951d4692ebb1ac241fa7b3bda2ef' \
+ 'd9946a3b70b1d422b5f20adb15cafccd864211e3' \
+ '628120a888a75ddbefeb4a62389baead71b97c8c' \
+ 'd9fe581576afbe199a5f86e657699381f37ef390' \
+ '5f20b95c0d88d596dac638d5050ad5b2331174e1' \
+ '4acc3447e42b48e02570b7a73ce645241b52015a' \
+ 'b88a1360c916f5cd5ad0b670ede68b5afd9fd50a' \
+ '50f29841f6c00b451897d4aece69ace253189154')
unset MAKEFLAGS
+subpkgs=('gtk3-vnc')
+subdescs=('Vnc viewer widget for gtk+3')
+subdepends=('gtk+3')
+subarchs=('i686 x86_64 ppc')
+subgroups=('xlib-extra')
+
+build() {
+ Fcd
+ Fbuild --with-gtk=3.0
+ Fsplit gtk3-vnc usr/lib/libgtk-vnc-2.0.so.*
+ Fsplit gtk3-vnc usr/lib/pkgconfig/*
+ Fsplit gtk3-vnc usr/include
+ Fsplit gtk3-vnc usr/lib/girepository-1.0/GtkVnc-2.0.typelib
+ Fsplit gtk3-vnc usr/share/gir-1.0/GtkVnc-2.0.gir
+ make clean
+ Fmake --with-gtk=2.0
+ Fmakeinstall
+}
+
# optimization OK
diff --git a/source/xlib-extra/gtk-vnc/frambuffer.diff
b/source/xlib-extra/gtk-vnc/frambuffer.diff
new file mode 100644
index 000..815bd9f
--- /dev/null
+++ b/source/xlib-extra/gtk-vnc/frambuffer.diff
@@ -0,0 +1,78 @@
+commit f3fc5e57a78d4be9872f1394f697b9929873a737
+Author: Daniel P. Berrange
+Date: Tue Nov 23 22:59:37 2010 +
+
+Fix framebuffer update boundary check
+
+Framebuffer boundary checks need to take into account offset,
+in addition to width/height
+
+* src/vncconnection.c: Fix boundary check
+
+diff --git a/src/vncconnection.c b/src/vncconnection.c
+index 433256a..165a5f1 100644
+--- a/src/vncconnection.c
b/src/vncconnection.c
+@@ -2653,13 +2653,14 @@ static void vnc_connection_ext_key_event(VncConnection
*conn)
+
+
+ static gboolean vnc_connection_validate_boundary(VncConnection *conn,
++ guint16 x, guint16 y,
+guint16 width, guint16 height)
+ {
+ VncConnectionPrivate *priv = conn->priv;
+
+- if (width > priv->width || height > priv->height) {
+- VNC_DEBUG("Framebuffer update %dx%d outside boundary %dx%d",
+-width, height, priv->width, priv->height);
++ if ((x + width) > priv->width || (y + height) > priv->height) {
++ VNC_DEBUG("Framebuffer update %dx%d at %d,%d outside boundary
%dx%d",
++width, height, x, y, priv->width, priv->height);
+ priv->has_error = TRUE;
+ }
+
+@@ -2681,37 +2682,37 @@ static gboolean
vnc_connection_framebuffer_update(VncConnection *conn, gint32 et
+
+ switch (etype) {
+ case VNC_CONNECTION_ENCODING_RAW:
+- if (!vnc_connection_validate_boundary(conn, width, height))
++ if (!vnc_connection_validate_boundary(conn, x, y, width,
height))
+ break;
+ vnc_connection_raw_update(conn, x, y, width, height);
+ vnc_connection_update(conn, x, y, width, height);
+ break;
+ case VNC_CONNECTION_ENCODING_COPY_RECT:
+- if (!vnc_connection_validate_boundary(conn, width, height))
++ if (!vnc_connection_validate_boundary(conn, x, y, width,
height))
+ break;
+ vnc_connection_copyrect_update(conn, x, y, width, height);
+ vnc_connection_update(conn, x, y, width, height);
+ break;
+ case VNC_CONNECTION_ENCODING_RRE:
+- if (!vnc_connection_validate_boundary(conn, width, height))
++ if (!vnc_connection_validate_boundary(conn, x, y, width,
height))
+ break;
+ vnc_connection_rre_update(conn, x, y, width, height);
+ vnc_connection_update(conn, x, y, width, height);
+ break;
+ case VNC_CONNECTION_ENCODING_HEXTILE:
+- if (!vnc_connection_validate_bou
