[oe-commits] org.oe.oz354x gtk+: Add patch to fix runtime warning (from Familiar tree).

[florian commit]

gtk+: Add patch to fix runtime warning (from Familiar tree).

Author: florian at openembedded.org
Branch: org.openembedded.oz354x
Revision: 78f9b14f34f18630d4fe3af37b7df7d0b169d79d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=78f9b14f34f18630d4fe3af37b7df7d0b169d79d
Files:
1
packages/gtk+/gtk+-2.6.10/unbreak-gdkproperty-x11-c.patch
packages/gtk+/gtk+_2.6.10.bb
Diffs:

#
# mt diff -rf8b59c474995a4a6775db2174779fcc4d050cf0f -r78f9b14f34f18630d4fe3af37b7df7d0b169d79d
#
# 
# 
# add_file "packages/gtk+/gtk+-2.6.10/unbreak-gdkproperty-x11-c.patch"
#  content [7d6b5fa4177a6fcfca7800e45d39c58633f18610]
# 
# patch "packages/gtk+/gtk+_2.6.10.bb"
#  from [d693f7135d487ec3e62142321457fb5ea3d5a919]
#    to [424fa3f10ce1913195693f42f9c5af8cd84c30be]
# 
============================================================
--- packages/gtk+/gtk+-2.6.10/unbreak-gdkproperty-x11-c.patch	7d6b5fa4177a6fcfca7800e45d39c58633f18610
+++ packages/gtk+/gtk+-2.6.10/unbreak-gdkproperty-x11-c.patch	7d6b5fa4177a6fcfca7800e45d39c58633f18610
@@ -0,0 +1,42 @@
+--- gtk+-2.6.10/gdk/x11/gdkproperty-x11.c.orig	2005-08-18 16:10:56.000000000 +0200
++++ gtk+-2.6.10/gdk/x11/gdkproperty-x11.c	2006-04-08 23:37:06.000000000 +0200
+@@ -493,7 +493,6 @@
+   gint ret_format;
+   gulong ret_nitems;
+   gulong ret_bytes_after;
+-  gulong get_length;
+   gulong ret_length;
+   guchar *ret_data;
+   Atom xproperty;
+@@ -522,30 +521,9 @@
+ 
+   ret_data = NULL;
+   
+-  /* 
+-   * Round up length to next 4 byte value.  Some code is in the (bad?)
+-   * habit of passing G_MAXLONG as the length argument, causing an
+-   * overflow to negative on the add.  In this case, we clamp the
+-   * value to G_MAXLONG.
+-   */
+-  get_length = length + 3;
+-  if (get_length > G_MAXLONG)
+-    {
+-      g_warning ("gdk_property_get(): length value has wrapped in calculation "
+-		 "(did you pass G_MAXLONG?)");
+-      get_length = G_MAXLONG;
+-    }
+-  /* To fail, either the user passed 0 or G_MAXULONG */
+-  get_length = get_length / 4;
+-  if (get_length == 0)
+-    {
+-      g_warning ("gdk_propery-get(): invalid length 0");
+-      return FALSE;
+-    }
+-
+   res = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
+ 			    GDK_WINDOW_XWINDOW (window), xproperty,
+-			    offset, get_length, pdelete,
++			    offset, (length + 3) / 4, pdelete,
+ 			    xtype, &ret_prop_type, &ret_format,
+ 			    &ret_nitems, &ret_bytes_after,
+ 			    &ret_data);
============================================================
--- packages/gtk+/gtk+_2.6.10.bb	d693f7135d487ec3e62142321457fb5ea3d5a919
+++ packages/gtk+/gtk+_2.6.10.bb	424fa3f10ce1913195693f42f9c5af8cd84c30be
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb at handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
-PR = "r5"
+PR = "r6"
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" 
 RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
@@ -26,7 +26,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
 	   file://scroll-timings.patch;patch=1 \
 	   file://small-gtkfilesel.patch;patch=1 \
 	   file://migration.patch;patch=1;pnum=0 \
-	   file://single-click.patch;patch=1"
+	   file://single-click.patch;patch=1 \
+	   file://unbreak-gdkproperty-x11-c.patch;patch=1"
 
 inherit autotools pkgconfig