aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2014-11-24 18:22:43 +0800
committerkwm <kwm@FreeBSD.org>2014-11-24 18:22:43 +0800
commit18d576aa30eb84ed0ded209602f3aa152c879ffe (patch)
treec94eaf785c46a40a708ea2348b2f50740a59b42c /x11-toolkits
parent1e39efe47bd22b5c30c54d6f895ed207c6f9e06f (diff)
downloadfreebsd-ports-gnome-18d576aa30eb84ed0ded209602f3aa152c879ffe.tar.gz
freebsd-ports-gnome-18d576aa30eb84ed0ded209602f3aa152c879ffe.tar.zst
freebsd-ports-gnome-18d576aa30eb84ed0ded209602f3aa152c879ffe.zip
Remove old firefox/thunderbird crash workaround. Upstream fixed it, and now
the patch is causing window update issues. PR: 195312 Submitted by: gblach@
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c37
2 files changed, 1 insertions, 38 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 91ffdf453f4c..63686b60d3c3 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtk
PORTVERSION= 2.24.25
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c b/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c
deleted file mode 100644
index e1798160fad4..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c
+++ /dev/null
@@ -1,37 +0,0 @@
-Revert the following Gtk+ commit [1], this commit is seems to cause
-firefox/thunderbird to crash [2]. Reverting this patch will make ff/tb stop
-crashing while upstream is looking at the exact cause.
-
-[1] https://git.gnome.org/browse/gtk+/commit/?h=gtk-2-24&id=692a0e5906c5da7f85c16c9d6cbb0d3ed8b4a576
-[2] https://bugzilla.mozilla.org/show_bug.cgi?id=887587
-
-All information:
-http://lists.freebsd.org/pipermail/freebsd-gnome/2013-July/028852.html
-
---- gdk/gdkwindow.c.orig 2013-07-25 11:01:16.000000000 +0200
-+++ gdk/gdkwindow.c 2013-07-25 11:02:24.000000000 +0200
-@@ -5463,7 +5463,6 @@
- GdkWindowImplIface *impl_iface;
- gboolean save_region = FALSE;
- GdkRectangle clip_box;
-- int iteration;
-
- /* Ensure the window lives while updating it */
- g_object_ref (window);
-@@ -5471,15 +5470,8 @@
- /* If an update got queued during update processing, we can get a
- * window in the update queue that has an empty update_area.
- * just ignore it.
-- *
-- * We run this multiple times if needed because on win32 the
-- * first run can cause new (synchronous) updates from
-- * gdk_window_flush_outstanding_moves(). However, we
-- * limit it to two iterations to avoid any potential loops.
- */
-- iteration = 0;
-- while (private->update_area &&
-- iteration++ < 2)
-+ if (private->update_area)
- {
- GdkRegion *update_area = private->update_area;
- private->update_area = NULL;