From owner-freebsd-gnome@FreeBSD.ORG Thu Aug 4 00:14:24 2011 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4926C106564A; Thu, 4 Aug 2011 00:14:24 +0000 (UTC) (envelope-from scf@FreeBSD.org) Received: from mail.farley.org (mail.farley.org [IPv6:2001:470:1f11:66f:2::11]) by mx1.freebsd.org (Postfix) with ESMTP id CE5A48FC0C; Thu, 4 Aug 2011 00:14:23 +0000 (UTC) Received: from thor.farley.org (root@thor.farley.org [IPv6:2001:470:1f11:66f:1::5]) by mail.farley.org (8.14.5/8.14.5) with ESMTP id p740ELtQ075574; Wed, 3 Aug 2011 20:14:21 -0400 (EDT) (envelope-from scf@FreeBSD.org) Received: from thor.farley.org (localhost [127.0.0.1]) by thor.farley.org (8.14.5/8.14.5) with ESMTP id p740ELe3037050; Wed, 3 Aug 2011 20:14:21 -0400 (EDT) (envelope-from scf@FreeBSD.org) Received: (from root@localhost) by thor.farley.org (8.14.5/8.14.5/Submit) id p740ELPt037049; Wed, 3 Aug 2011 20:14:21 -0400 (EDT) (envelope-from scf@FreeBSD.org) Date: Wed, 3 Aug 2011 20:14:21 -0400 (EDT) Message-Id: <201108040014.p740ELPt037049@thor.farley.org> To: FreeBSD-gnats-submit@FreeBSD.org From: "Sean C. Farley" X-send-pr-version: 3.113 X-GNATS-Notify: X-Spam-Status: No, score=-1.2 required=4.0 tests=AWL,BAYES_00,SPF_SOFTFAIL autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.farley.org Cc: gnome@FreeBSD.org Subject: [PATCH] x11-toolkits/gtk: fix repainting bug X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 00:14:24 -0000 >Submitter-Id: current-users >Originator: Sean C. Farley >Organization: >Confidential: no >Synopsis: [PATCH] x11-toolkits/gtk: fix repainting bug >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 8.2-STABLE amd64 >Environment: System: FreeBSD thor.farley.org 8.2-STABLE FreeBSD 8.2-STABLE #1 r223876M: Fri Jul 8 22:52:17 >Description: This is a fix for Gnome bug #652872[3]. Commit 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973[2] in gtk-2.24.5 causes issues for many GTK applications such as Freeciv (I.e., the main map is black). This is commit d7ac9cd71c43689672a9796e518ef3b970197bf2[3] which reverts it. 1. https://bugzilla.gnome.org/show_bug.cgi?id=652872 2. http://git.gnome.org/browse/gtk+/commit/?h=gtk-2-24&id=254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 3. http://git.gnome.org/browse/gtk+/commit/?h=gtk-2-24&id=d7ac9cd71c43689672a9796e518ef3b970197bf2 Added file(s): - files/patch-gdk_gdkwindow.c Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- gtk-2.24.5_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11-toolkits/gtk20.orig/Makefile /usr/ports/x11-toolkits/gtk20/Makefile --- /usr/ports/x11-toolkits/gtk20.orig/Makefile 2011-08-03 19:52:19.000000000 -0400 +++ /usr/ports/x11-toolkits/gtk20/Makefile 2011-08-03 20:04:41.000000000 -0400 @@ -9,7 +9,7 @@ PORTNAME= gtk PORTVERSION= 2.24.5 -PORTREVISION?= 0 +PORTREVISION?= 1 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%/ \ diff -ruN --exclude=CVS /usr/ports/x11-toolkits/gtk20.orig/files/patch-gdk_gdkwindow.c /usr/ports/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c --- /usr/ports/x11-toolkits/gtk20.orig/files/patch-gdk_gdkwindow.c 1969-12-31 19:00:00.000000000 -0500 +++ /usr/ports/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c 2011-08-03 19:53:32.000000000 -0400 @@ -0,0 +1,40 @@ +--- gdk/gdkwindow.c.orig ++++ gdk/gdkwindow.c +@@ -8004,15 +8004,11 @@ gdk_window_set_background (GdkWindow *window, + } + + if (!GDK_WINDOW_DESTROYED (window) && ++ gdk_window_has_impl (private) && + !private->input_only) + { +- if (gdk_window_has_impl (private)) +- { +- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); +- impl_iface->set_background (window, &private->bg_color); +- } +- else +- gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL); ++ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); ++ impl_iface->set_background (window, &private->bg_color); + } + } + +@@ -8081,15 +8077,11 @@ gdk_window_set_back_pixmap (GdkWindow *window, + private->bg_pixmap = GDK_NO_BG; + + if (!GDK_WINDOW_DESTROYED (window) && ++ gdk_window_has_impl (private) && + !private->input_only) + { +- if (gdk_window_has_impl (private)) +- { +- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); +- impl_iface->set_back_pixmap (window, private->bg_pixmap); +- } +- else +- gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL); ++ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); ++ impl_iface->set_back_pixmap (window, private->bg_pixmap); + } + } + --- gtk-2.24.5_1.patch ends here ---