aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2011-08-04 15:54:39 +0800
committerkwm <kwm@FreeBSD.org>2011-08-04 15:54:39 +0800
commitcd6bd7d49e6b87466ff9569048202b20ff62fa5e (patch)
treef791808334c018fd2249a3c7f2eb9bdcbbec5e80
parent459cfca806a82e54efdfe3863f5caff4c8edfb96 (diff)
downloadfreebsd-ports-gnome-cd6bd7d49e6b87466ff9569048202b20ff62fa5e.tar.gz
freebsd-ports-gnome-cd6bd7d49e6b87466ff9569048202b20ff62fa5e.tar.zst
freebsd-ports-gnome-cd6bd7d49e6b87466ff9569048202b20ff62fa5e.zip
Add a upstream patch that revert a patch that was committed for 2.24.5. This
patch causes issues for some GTK applications like freeciv (the main map stays black). PR: ports/159510 Submitted by: scf@ Obtained from: GTK git
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c51
2 files changed, 52 insertions, 1 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index cb0896554cc6..46dfef30af99 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -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 --git a/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c b/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c
new file mode 100644
index 000000000000..5e5ac7cc35f2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c
@@ -0,0 +1,51 @@
+From d7ac9cd71c43689672a9796e518ef3b970197bf2 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 20 Jun 2011 12:10:36 +0000
+Subject: Revert "gdk: Make background changes queue a repaint"
+
+This reverts commit 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973.
+---
+diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
+index 10d83ab..f058570 100644
+--- gdk/gdkwindow.c
++++ 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);
+ }
+ }
+
+--
+cgit v0.9