[emerald] Fix rhbz #688138

[Hicham HAOUARI]

commit ccae1101a51453dde687ae6565f70b0a1327dd50
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Fri Mar 25 12:48:51 2011 +0000

    Fix rhbz #688138

 emerald-0.8.5-api-change.patch |   47 ++++++++++++++++++++++++++++++++++++++++
 emerald.spec                   |   18 ++++++++++++---
 2 files changed, 61 insertions(+), 4 deletions(-)
---
diff --git a/emerald-0.8.5-api-change.patch b/emerald-0.8.5-api-change.patch
new file mode 100644
index 0000000..966d3d4
--- /dev/null
+++ b/emerald-0.8.5-api-change.patch
@@ -0,0 +1,47 @@
+--- emerald-0.8.5/src/main.c	2010-11-05 03:18:55.000000000 +0000
++++ emerald-0.8.5/src/main.c.new	2011-03-25 11:39:03.000000000 +0000
+@@ -505,7 +505,7 @@ static void decor_update_window_property
+ 	maxextents = extents;
+ 
+     decor_quads_to_property(data, GDK_PIXMAP_XID(d->pixmap),
+-			    &extents, &maxextents, 0, 0, quads, nQuad);
++			    &extents, &maxextents, &maxextents, &maxextents, 0, 0, quads, nQuad);
+ 
+     gdk_error_trap_push();
+     XChangeProperty(xdisplay, d->prop_xid,
+@@ -1937,7 +1937,7 @@ static void decor_update_switcher_proper
+     nQuad = set_switcher_quads(quads, d->width, d->height, ws);
+ 
+     decor_quads_to_property(data, GDK_PIXMAP_XID(d->pixmap),
+-			    &extents, &extents, 0, 0, quads, nQuad);
++			    &extents, &extents, &extents, &extents, 0, 0, quads, nQuad);
+ 
+     style = gtk_widget_get_style (style_window);
+ 
+@@ -2364,7 +2364,7 @@ update_default_decorations(GdkScreen * s
+ 	nQuad = set_shadow_quads(quads, width, height, ws);
+ 
+ 	decor_quads_to_property(data, GDK_PIXMAP_XID(ws->shadow_pixmap),
+-				&ws->shadow_extents, &ws->shadow_extents, 0, 0,
++				&ws->shadow_extents, &ws->shadow_extents, &ws->shadow_extents, &ws->shadow_extents, 0, 0,
+ 				quads, nQuad);
+ 
+ 	XChangeProperty(xdisplay, xroot,
+@@ -2424,7 +2424,7 @@ update_default_decorations(GdkScreen * s
+ 	(*d.draw) (&d);
+ 
+ 	decor_quads_to_property(data, GDK_PIXMAP_XID(d.p_inactive),
+-				&extents, &extents, 0, 0, quads, nQuad);
++				&extents, &extents, &extents, &extents, 0, 0, quads, nQuad);
+ 
+ 	XChangeProperty(xdisplay, xroot,
+ 			normalAtom,
+@@ -2433,7 +2433,7 @@ update_default_decorations(GdkScreen * s
+ 			BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+ 
+ 	decor_quads_to_property(data, GDK_PIXMAP_XID(d.p_active),
+-				&extents, &extents, 0, 0, quads, nQuad);
++				&extents, &extents, &extents, &extents, 0, 0, quads, nQuad);
+ 
+ 	XChangeProperty(xdisplay, xroot,
+ 			activeAtom,
diff --git a/emerald.spec b/emerald.spec
index ccec885..6fbb87a 100644
--- a/emerald.spec
+++ b/emerald.spec
@@ -3,7 +3,7 @@ URL:            http://www.compiz.org/
 License:        GPLv2
 Group:          User Interface/Desktops
 Version:        0.8.5
-Release:        0.2.git90c9604441%{?dist}
+Release:        0.4.git90c9604441%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,13 +21,16 @@ Source1:        Makefile.in.in
 Patch0:         DSO.patch
 Patch2:         05_build_without_gtk_disable_deprecated.patch
 
+# two more parameters have been added to decor_quads_to_property
+# in compiz-0.9.4
+Patch3:         %{name}-%{version}-api-change.patch
+
 # compiz-devel is not available on these arches
 ExcludeArch:    s390 s390x
 
-Requires:       compiz >= %{version}
+Requires:       compiz >= 0.9.4
 
-BuildRequires:  compiz-devel >= %{version}
-BuildRequires:  gtk+-devel
+BuildRequires:  compiz-devel >= 0.9.4
 BuildRequires:  libwnck-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool 
@@ -58,6 +61,7 @@ for emerald, the themeable window decorator for Compiz.
 %setup -q -c emerald-0.8.5
 %patch0 -p1 -b .DSO
 %patch2 -p1 -b .05_build_without_gtk_disable_deprecated
+%patch3 -p1 -b .fix-api-change
 install -m 0644 %{SOURCE1} po/
 
 %build
@@ -110,6 +114,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Fri Mar 25 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.8.5-0.4.git90c9604441
+- Rebuilt for api change in compiz-0.9.4, fixes rhbz #688138
+
+* Wed Mar 16 2011 Leigh Scott <leigh123linux at googlemail.com> - 0.8.5-0.3.git90c9604441
+- rebuilt for new compiz version (Bz 688138)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-0.2.git90c9604441
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild