diff options
| author | root <root@rshg047.dnsready.net> | 2011-05-27 22:47:26 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-05-27 22:47:26 +0000 |
| commit | 33feb015eb09eee76827f359e685fce981d88111 (patch) | |
| tree | 775ca3a4bc06155ce29cd205ba583df5d9b1ba44 /extra/gtk3 | |
| parent | 956ae4eb53422c92f78d86d5511f25fbf6fa6497 (diff) | |
Fri May 27 22:47:26 UTC 2011
Diffstat (limited to 'extra/gtk3')
| -rw-r--r-- | extra/gtk3/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch | 28 |
2 files changed, 36 insertions, 5 deletions
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 5550647fc..4cff80b52 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ +# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.9 +pkgver=3.0.10 pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') @@ -14,12 +14,15 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) -sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini + only_draw_resize_grip_if_its_window_exists.patch) +sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + 'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch new file mode 100644 index 000000000..a6514b550 --- /dev/null +++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch @@ -0,0 +1,28 @@ +From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Mon, 23 May 2011 13:46:59 +0000 +Subject: window: Only draw resize grip if its window exists + +Don't rely on priv->resize_grip_visible as the code comment in the +variable declaration indicates. +This fixes warnings with GtkPlug, which can cause resize_grip_visible to +be TRUE but grid_window to be NULL - running tests/teststatusicon +reproduces this. + +This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc +--- +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index b97418a..b1caa9b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget, + if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw) + ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr); + +- if (priv->resize_grip_visible && ++ if (priv->grip_window && + gtk_cairo_should_draw_window (cr, priv->grip_window)) + { + GdkRectangle rect; +-- +cgit v0.9 |