[arch-commits] Commit in gtk2/repos (3 files)
Jan de Groot
jgc at archlinux.org
Tue Jun 10 17:27:56 UTC 2008
Date: Tuesday, June 10, 2008 @ 13:27:56
Author: jgc
Revision: 2656
Merged revisions 2559-2655 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/gtk2/trunk
........
r2655 | jgc | 2008-06-10 17:27:38 +0000 (Tue, 10 Jun 2008) | 2 lines
upgpkg: gtk2 2.12.10-2
Fix FS#10613
........
Added:
gtk2/repos/extra-i686/gtk2-windowpos.patch
(from rev 2655, gtk2/trunk/gtk2-windowpos.patch)
Modified:
gtk2/repos/extra-i686/ (properties)
gtk2/repos/extra-i686/PKGBUILD
----------------------+
PKGBUILD | 11 ++++++++---
gtk2-windowpos.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
Property changes on: gtk2/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /gtk2/trunk:1-2558
+ /gtk2/trunk:1-2655
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-06-10 17:27:38 UTC (rev 2655)
+++ extra-i686/PKGBUILD 2008-06-10 17:27:56 UTC (rev 2656)
@@ -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
Copied: gtk2/repos/extra-i686/gtk2-windowpos.patch (from rev 2655, gtk2/trunk/gtk2-windowpos.patch)
===================================================================
--- extra-i686/gtk2-windowpos.patch (rev 0)
+++ extra-i686/gtk2-windowpos.patch 2008-06-10 17:27:56 UTC (rev 2656)
@@ -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;
More information about the arch-commits
mailing list