1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

Update to 2.12.11.

This commit is contained in:
Joe Marcus Clarke 2008-07-02 03:05:29 +00:00
parent 0d77ef3b39
commit 6b399c7687
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=216112
6 changed files with 10 additions and 72 deletions

View File

@ -7,8 +7,8 @@
#
PORTNAME= gtk
PORTVERSION= 2.12.10
PORTREVISION?= 2
PORTVERSION= 2.12.11
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \

View File

@ -1,3 +1,3 @@
MD5 (gnome2/gtk+-2.12.10.tar.bz2) = 5fcbdd2254eedb6b9ae828afc01d9eaa
SHA256 (gnome2/gtk+-2.12.10.tar.bz2) = 6e4ca68a2e099418610eddd699012558cb704c441094228161966683ec8c2f18
SIZE (gnome2/gtk+-2.12.10.tar.bz2) = 16230724
MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad
SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428

View File

@ -1,31 +0,0 @@
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;

View File

@ -7,8 +7,8 @@
#
PORTNAME= gtk
PORTVERSION= 2.12.10
PORTREVISION?= 2
PORTVERSION= 2.12.11
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \

View File

@ -1,3 +1,3 @@
MD5 (gnome2/gtk+-2.12.10.tar.bz2) = 5fcbdd2254eedb6b9ae828afc01d9eaa
SHA256 (gnome2/gtk+-2.12.10.tar.bz2) = 6e4ca68a2e099418610eddd699012558cb704c441094228161966683ec8c2f18
SIZE (gnome2/gtk+-2.12.10.tar.bz2) = 16230724
MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad
SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428

View File

@ -1,31 +0,0 @@
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;