added patch

4 files changed, 26 insertions, 3 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 6c323997ed86..9ab2ba73768a 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.34 2003/02/12 06:49:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.35 2003/02/17 18:25:57 foser Exp $
+
+*gnome-panel-2.2.0.1-r1 (17 Feb 2003)
+
+  17 Feb 2003; foser <foser@gentoo.org> gnome-panel-2.2.0.1-r1.ebuild :
+  Added patch to fix notification area crash (#15685)
 
 *gnome-panel-2.2.0.1 (04 Feb 2003)
 
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1-r1
index 9d7dd7da8365..9d7dd7da8365 100644
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1-r1
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch
new file mode 100644
index 000000000000..da10cbc13285
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch
@@ -0,0 +1,12 @@
+diff -ur gnome-panel-2.2.0.1/applets/notification_area/eggtraymanager.c gnome-panel-2.2.0.1.patched/applets/notification_area/eggtraymanager.c
+--- gnome-panel-2.2.0.1/applets/notification_area/eggtraymanager.c	2003-01-30 06:52:16.000000000 +0100
++++ gnome-panel-2.2.0.1.patched/applets/notification_area/eggtraymanager.c	2003-02-17 14:36:59.000000000 +0100
+@@ -399,7 +399,7 @@
+ 
+   invisible = manager->invisible;
+   
+-  display = GDK_WINDOW_XDISPLAY (manager->invisible);
++  display = GDK_WINDOW_XDISPLAY (manager->invisible->window);
+   
+   if (XGetSelectionOwner (display, manager->selection_atom) ==
+       GDK_WINDOW_XWINDOW (manager->invisible->window))
diff --git a/gnome-base/gnome-panel/gnome-panel-2.2.0.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild
index 8523d67791a8..f20f5c787d16 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.2.0.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.2.0.1.ebuild,v 1.3 2003/02/13 12:09:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild,v 1.1 2003/02/17 18:25:57 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The Panel for Gnome2"
@@ -34,4 +34,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21
 	doc? ( >=dev-util/gtk-doc-0.9 )"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-notification_area_crash_on_exit_fix.patch
+}
+
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"