[emerald/f13/master] - add upstream patch to hopefully fix crash

[leigh123linux]

commit 542133eb278c81f946db8c731d8d5f2bbcb93f54
Author: leigh scott <leigh123linux at googlemail.com>
Date:   Fri Sep 10 10:17:03 2010 +0100

    - add upstream patch to hopefully fix crash

 ...-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch |   37 ++++++++++++++++++++
 emerald.spec                                       |    7 +++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch b/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch
new file mode 100644
index 0000000..2ea7ef8
--- /dev/null
+++ b/emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch
@@ -0,0 +1,37 @@
+From: Sam Spilsbury <smspillaz at gmail.com>
+Date: Fri, 12 Feb 2010 04:08:44 +0000 (+0800)
+Subject: Adjust for libdecoration changes
+X-Git-Url: http://gitweb.compiz.org/?p=fusion%2Fdecorators%2Femerald;a=commitdiff_plain;h=81775d407f775bad1e6f6ba3345b891b66bb5faf
+
+Adjust for libdecoration changes
+
+This works, however it is LEGACY and is NOT SUPPORTED. The code is approaching FOUR YEARS OLD and it HASNT BEEN TOUCHED.
+
+This will be available for those who want it however it is NOT part of the official 0.9 development.
+
+FIXME: Replace this kerbungle entirely
+---
+
+diff --git a/src/main.c b/src/main.c
+index 5acfe03..4ca64c1 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -5512,7 +5512,7 @@ int main(int argc, char *argv[])
+     gdkdisplay = gdk_display_get_default();
+     xdisplay = gdk_x11_display_get_xdisplay(gdkdisplay);
+ 
+-    frame_window_atom = XInternAtom(xdisplay, "_NET_FRAME_WINDOW", FALSE);
++    frame_window_atom = XInternAtom(xdisplay, DECOR_INPUT_FRAME_ATOM_NAME, FALSE);
+     win_decor_atom = XInternAtom(xdisplay, DECOR_WINDOW_ATOM_NAME, FALSE);
+     win_blur_decor_atom = XInternAtom (xdisplay, DECOR_BLUR_ATOM_NAME, FALSE);
+     wm_move_resize_atom = XInternAtom(xdisplay, "_NET_WM_MOVERESIZE", FALSE);
+@@ -5617,7 +5617,8 @@ int main(int argc, char *argv[])
+     update_window_extents(ws);
+     update_shadow(pfs);
+ 
+-    decor_set_dm_check_hint(xdisplay, DefaultScreen(xdisplay));
++    decor_set_dm_check_hint(xdisplay, DefaultScreen(xdisplay),
++    			    WINDOW_DECORATION_TYPE_PIXMAP);
+ 
+     update_settings(ws);
+ 
diff --git a/emerald.spec b/emerald.spec
index 5b256de..e944701 100644
--- a/emerald.spec
+++ b/emerald.spec
@@ -3,13 +3,14 @@ URL:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
 Version:        0.8.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         DSO.patch
 Patch1:         gtk.patch
+Patch2:         emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf.patch
 
 # compiz-devel is not available on these arches
 ExcludeArch:    s390 s390x
@@ -47,6 +48,7 @@ for emerald, the themeable window decorator for Compiz.
 %setup -q
 %patch0 -p1 -b .DSO
 %patch1 -p1 -b .gtk
+%patch1 -p0 -b .emerald-81775d407f775bad1e6f6ba3345b891b66bb5faf
 
 %build
 %configure --enable-librsvg --disable-mime-update
@@ -105,6 +107,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Fri Sep 10 2010 leigh scott <leigh123linux at googlemail.com> - 0.8.4-5
+- add upstream patch to hopefully fix crash
+
 * Sun May 16 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-4
 - apply the upstream  gtk deprecated fixes