[arch-commits] Commit in gtk2/trunk (PKGBUILD gtk2-windowpos.patch)

[Jan de Groot]

    Date: Tuesday, June 10, 2008 @ 13:27:38
  Author: jgc
Revision: 2655

upgpkg: gtk2 2.12.10-2
    Fix FS#10613

Added:
  gtk2/trunk/gtk2-windowpos.patch
Modified:
  gtk2/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   11 ++++++++---
 gtk2-windowpos.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-10 12:22:05 UTC (rev 2654)
+++ PKGBUILD	2008-06-10 17:27:38 UTC (rev 2655)
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.12.10
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -16,15 +16,20 @@
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.12/gtk+-${pkgver}.tar.bz2
-	gtkclipboard-check.patch)
+	gtkclipboard-check.patch
+	gtk2-windowpos.patch)
 md5sums=('5fcbdd2254eedb6b9ae828afc01d9eaa'
-         '4025d3c15d6c6f73a032f403ffd4ff1c')
+         '4025d3c15d6c6f73a032f403ffd4ff1c'
+	 'bbff943e597f0000b9d47cde0ffba289')
 
 build() {
   cd ${startdir}/src/gtk+-${pkgver}
   # Workaround patch for flash
   patch -Np1 -i ${startdir}/src/gtkclipboard-check.patch || return 1
 
+  # bgo 536757 / FS#10613
+  patch -Np0 -i ${startdir}/src/gtk2-windowpos.patch || return 1
+
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=xfree \
 	      --with-included-loaders=png || return 1

Added: gtk2-windowpos.patch
===================================================================
--- gtk2-windowpos.patch	                        (rev 0)
+++ gtk2-windowpos.patch	2008-06-10 17:27:38 UTC (rev 2655)
@@ -0,0 +1,31 @@
+Index: gdk/x11/gdkwindow-x11.c
+===================================================================
+--- gdk/x11/gdkwindow-x11.c	(revision 20280)
++++ gdk/x11/gdkwindow-x11.c	(working copy)
+@@ -3412,6 +3412,7 @@
+   Window xwindow;
+   Window xparent;
+   Window root;
++  Window child;
+   Window *children;
+   guchar *data;
+   Window *vroots;
+@@ -3470,13 +3471,15 @@
+       if ((type_return == XA_CARDINAL) && (format_return == 32) &&
+ 	  (nitems_return == 4) && (data))
+         {
+-	  guint32 *ldata = (guint32 *) data;
++	  gulong *ldata = (gulong *) data;
+ 	  got_frame_extents = TRUE;
+ 
+ 	  /* try to get the real client window geometry */
+ 	  if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow,
+-			    &root, &wx, &wy, &ww, &wh, &wb, &wd))
+-	    {
++			    &root, &wx, &wy, &ww, &wh, &wb, &wd) &&
++              XTranslateCoordinates (GDK_DISPLAY_XDISPLAY (display),
++	  			     xwindow, root, 0, 0, &wx, &wy, &child))
++            {
+ 	      rect->x = wx;
+ 	      rect->y = wy;
+ 	      rect->width = ww;