From 98e2e208558ab28814cd63fd6ac5ec9f34cb850b Mon Sep 17 00:00:00 2001
From: Jean-Yves Lefort <jylefort@FreeBSD.org>
Date: Sat, 6 May 2006 18:12:49 +0000
Subject: Fix a crash that occurred when changing the screen resolution.

GNOME Bugzilla:	http://bugzilla.gnome.org/show_bug.cgi?id=340847
---
 x11-wm/metacity/Makefile                 |  1 +
 x11-wm/metacity/files/patch-src_screen.c | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 x11-wm/metacity/files/patch-src_screen.c

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 4416f3bb7533..5c7d9794dc9a 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	metacity
 PORTVERSION=	2.14.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-wm/metacity/files/patch-src_screen.c b/x11-wm/metacity/files/patch-src_screen.c
new file mode 100644
index 000000000000..70c88332d13e
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_screen.c
@@ -0,0 +1,44 @@
+--- src/screen.c.orig	Sat May  6 19:21:53 2006
++++ src/screen.c	Sat May  6 19:22:13 2006
+@@ -187,6 +187,20 @@
+ {
+   MetaDisplay *display;
+ 
++  {
++    GList *tmp;
++
++    tmp = screen->workspaces;
++    while (tmp != NULL)
++      {
++        MetaWorkspace *space = tmp->data;
++
++        meta_workspace_invalidate_work_area (space);
++        
++        tmp = tmp->next;
++      }
++  }
++
+   display = screen->display;
+   
+   if (screen->xinerama_infos)
+@@ -348,20 +362,6 @@
+ 
+   g_assert (screen->n_xinerama_infos > 0);
+   g_assert (screen->xinerama_infos != NULL);
+-
+-  {
+-    GList *tmp;
+-
+-    tmp = screen->workspaces;
+-    while (tmp != NULL)
+-      {
+-        MetaWorkspace *space = tmp->data;
+-
+-        meta_workspace_invalidate_work_area (space);
+-        
+-        tmp = tmp->next;
+-      }
+-  }
+ }
+ 
+ MetaScreen*
-- 
cgit v1.2.3