Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
Added patch description
2022-07-20 23:26:18 +00:00 · 2022-01-26 12:02:57 +01:00 · 2022-01-26 11:59:20 +01:00 · 2022-01-19 23:41:59 +00:00 · 2021-07-21 19:54:38 +00:00 · 2021-07-21 14:56:15 +00:00
50 changed files with 269 additions and 46902 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1 @@
-clog
-compiz-*.tar.*
-compiz-*.src.rpm
-kde-desktop-effects-*.tar.*
-core-*.tar.*
-.build-*.log
-/i?86/
-/x86_64/
+compiz-core-*.tar.bz2
--- a/compiz-0.8.18-fedora-logo.patch
+++ b/compiz-0.8.18-fedora-logo.patch
@ -1,9 +1,10 @@
-diff -upNr compiz-0.8.2.orign/metadata/cube.xml.in compiz-0.8.2/metadata/cube.xml.in
--- compiz-0.8.2.orign/metadata/cube.xml.in	2009-02-15 10:10:23.000000000 +0100
-+++ compiz-0.8.2/metadata/cube.xml.in	2009-05-25 22:54:03.060114649 +0200
-@@ -92,9 +92,9 @@
- 		    <_short>Cube Color</_short>
- 		    <_long>Color of top and bottom sides of the cube</_long>
+diff --git a/metadata/cube.xml.in b/metadata/cube.xml.in
+index 5d2e7a7..2a20012 100644
+--- a/metadata/cube.xml.in
+++ b/metadata/cube.xml.in
+@@ -96,9 +96,9 @@
+ 		    <short>Cube Color</short>
+ 		    <long>Color of top and bottom sides of the cube</long>
 		    <default>
 -			<red>0xfefe</red>
 -			<green>0xffff</green>
@ -14,7 +15,7 @@ diff -upNr compiz-0.8.2.orign/metadata/cube.xml.in compiz-0.8.2/metadata/cube.xm
 		    </default>
 		</option>
 		<subgroup>
-@@ -110,7 +110,7 @@
+@@ -114,7 +114,7 @@
 			<type>string</type>
 			<hints>file;image;</hints>
 			<default>
--- a/compiz-0.8.18-rsvg2-2.52-fix.patch
+++ b/compiz-0.8.18-rsvg2-2.52-fix.patch
@ -0,0 +1,16 @@
+diff --git a/plugins/svg.c b/plugins/svg.c
+index a0eb715..39fed02 100644
+--- a/plugins/svg.c
+++ b/plugins/svg.c
+@@ -31,7 +31,10 @@
+ #ifndef RSVG_CAIRO_H
+ #include <librsvg/rsvg-cairo.h>
+ #endif
+-#ifndef LIBRSVG_FEATURES_H
+#if !defined(RSVG_FEATURES_H) && !defined(LIBRSVG_FEATURES_H)
+#include <librsvg/rsvg-features.h>
+#endif
+#if !defined(RSVG_FEATURES_H) && !defined(LIBRSVG_FEATURES_H)
+ #include <librsvg/librsvg-features.h>
+ #endif
+ 
--- a/compiz-0.8.6-new_unloadpluginfix.patch
+++ b/compiz-0.8.6-new_unloadpluginfix.patch
@ -1,11 +0,0 @@
-diff -upNr compiz-0.8.6.orign/include/compiz-core.h compiz-0.8.6/include/compiz-core.h
--- compiz-0.8.6.orign/include/compiz-core.h	2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6/include/compiz-core.h	2010-03-30 14:48:59.055172395 +0200
-@@ -27,6 +27,7 @@
- #define _COMPIZ_CORE_H
- 
- #include <compiz-plugin.h>
-+#include <dlfcn.h>
- 
- #define CORE_ABIVERSION 20091102
- 
--- a/compiz-0.8.6-wall.patch
+++ b/compiz-0.8.6-wall.patch
--- a/compiz-0.8.8_incorrect-fsf-address.patch
+++ b/compiz-0.8.8_incorrect-fsf-address.patch
@ -1,14 +0,0 @@
-diff -upr compiz-0.8.8-orig/plugins/place.c compiz-0.8.8/plugins/place.c
--- compiz-0.8.8-orig/plugins/place.c	2010-10-18 07:56:02.000000000 +0200
-+++ compiz-0.8.8/plugins/place.c	2012-09-26 11:19:31.056809174 +0200
-@@ -16,8 +16,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-+ * 02110-1301, USA.
-  */
- 
- #include <math.h>
--- a/compiz-aarch64.patch
+++ b/compiz-aarch64.patch
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-#!/bin/bash
-
-compiz=`ps ax | grep 'compiz --replace' | grep -v 'grep' | awk '{print $5}'`
-
-
-
-if [ "$compiz" = "compiz" ] ; then
-	emerald --replace &
-	echo "$compiz with Emerald windows-decorator"
-	else
-	exit 0
-fi
-
-exit 0
-
--- a/18
+++ b/18
@ -1,18 +0,0 @@
-#!/bin/bash
-
-compiz=`ps ax | grep 'compiz --replace' | grep -v 'grep' | awk '{print $5}'`
-
-theme=`gsettings get org.mate.Marco.general theme | cut -d\' -f2`
-
-
-
-if [ "$compiz" = "compiz" ] ; then
-	gtk-window-decorator --replace --marco-theme "$theme" &
-	echo "$compiz with GTK windows-decorator"
-	echo "GTK theme is $theme"
-	else
-	exit 0
-fi
-
-exit 0
-
--- a/compiz-fix-gtk-window-decorator-no-argb-crash.patch
+++ b/compiz-fix-gtk-window-decorator-no-argb-crash.patch
@ -1,49 +0,0 @@
-Author: Sebastien Bacher <seb128@canonical.com>
-Description: Fix decorator crash when ARGB isn't enabled
- Fix gtk-window-decorator crash when ARGB isn't enabled and only
- that, in this case window-decoration are invisible
-Origin: vendor, ubuntu (1:0.3.6-1ubuntu9)
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/94140
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/82205
--- a/gtk/window-decorator/gtk-window-decorator.c
-+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -1912,10 +1912,8 @@ meta_draw_window_decoration (decor_t *d)
- 
-     size = MAX (fgeom.top_height, fgeom.bottom_height);
- 
-    if (rect.width && size)
-+    if (rect.width && size && (pixmap = create_pixmap (rect.width, size)))
-     {
-	pixmap = create_pixmap (rect.width, size);
-
- 	cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
- 	gdk_cairo_set_source_color_alpha (cr, &bg_color, bg_alpha);
- 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-@@ -2014,10 +2012,8 @@ meta_draw_window_decoration (decor_t *d)
- 
-     size = MAX (fgeom.left_width, fgeom.right_width);
- 
-    if (size && rect.height)
-+    if (size && rect.height && (pixmap = create_pixmap (size, rect.height)))
-     {
-	pixmap = create_pixmap (size, rect.height);
-
- 	cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
- 	gdk_cairo_set_source_color_alpha (cr, &bg_color, bg_alpha);
- 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-@@ -3289,9 +3285,12 @@ update_window_decoration_icon (WnckWindo
- 	g_object_ref (G_OBJECT (d->icon_pixbuf));
- 
- 	d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf);
-	cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
-	d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
-	cairo_destroy (cr);
-+	if (d->icon_pixmap)
-+	{
-+	    cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
-+	    d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
-+	    cairo_destroy (cr);
-+	}
-     }
- }
- 
--- a/28
+++ b/28
@ -1,28 +0,0 @@
-#!/bin/bash
-
-function runCompiz() {
-    emerald --replace &
-    exec compiz --replace ccp $@
-}
-
-ISSW=`glxinfo | grep "Software Rasterizer" -c`
-
-# Try with direct rendering
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Try again with indirect rendering
-export LIBGL_ALWAYS_INDIRECT=1
-
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Fall back to openbox-lxde
-exec openbox-lxde $@
-
--- a/compiz-lxde-emerald.desktop
+++ b/compiz-lxde-emerald.desktop
@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Compiz LXDE Emerald
-Comment=start or restart Compiz Fusion with Emerald windows-decorator
-TryExec=compiz-lxde-emerald
-Exec=compiz-lxde-emerald
-Icon=fusion-icon
-NoDisplay=false
-StartupNotify=true
-Categories=Utility;
-OnlyShowIn=LXDE;
-Name[de_DE]=Compiz LXDE Emerald
--- a/28
+++ b/28
@ -1,28 +0,0 @@
-#!/bin/bash
-
-function runCompiz() {
-    emerald --replace &
-    exec compiz --replace ccp $@
-}
-
-ISSW=`glxinfo | grep "Software Rasterizer" -c`
-
-# Try with direct rendering
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Try again with indirect rendering
-export LIBGL_ALWAYS_INDIRECT=1
-
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Fall back to marco
-exec marco $@
-
--- a/compiz-mate-emerald.desktop
+++ b/compiz-mate-emerald.desktop
@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Compiz MATE Emerald
-Comment=start or restart Compiz Fusion with Emerald windows-decorator
-TryExec=compiz-mate-emerald
-Exec=compiz-mate-emerald
-Icon=fusion-icon
-NoDisplay=false
-StartupNotify=true
-Categories=Utility;
-OnlyShowIn=MATE;
-Name[de_DE]=Compiz MATE Emerald
--- a/32
+++ b/32
@ -1,32 +0,0 @@
-#!/bin/bash
-
-theme=`gsettings get org.mate.Marco.general theme | cut -d\' -f2`
-
-echo "$theme"
-
-function runCompiz() {
-	gtk-window-decorator --replace --marco-theme "$theme" &
-	exec compiz --replace ccp $@ 
-}
-
-ISSW=`glxinfo | grep "Software Rasterizer" -c`
-
-# Try with direct rendering
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Try again with indirect rendering
-export LIBGL_ALWAYS_INDIRECT=1
-
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Fall back to marco
-exec marco $@
-
--- a/compiz-mate-gtk.desktop
+++ b/compiz-mate-gtk.desktop
@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Compiz MATE GTK
-Comment=start or restart Compiz Fusion with GTK windows-decorator
-TryExec=compiz-mate-gtk
-Exec=compiz-mate-gtk
-Icon=fusion-icon
-NoDisplay=false
-StartupNotify=true
-Categories=Utility;
-OnlyShowIn=MATE;
-Name[de_DE]=Compiz MATE GTK
--- a/compiz-plugins-main_plugin-matecompat.svg
+++ b/compiz-plugins-main_plugin-matecompat.svg
@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3315"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   width="48"
-   height="48"
-   sodipodi:docname="mate.png">
-  <metadata
-     id="metadata3321">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3319" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3317"
-     showgrid="false"
-     inkscape:zoom="5.9375"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:window-x="587"
-     inkscape:window-y="157"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3315" />
-  <image
-     width="48"
-     height="48"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAEBpJREFU
-aIHVWnl0VOd1/73ve9vsWkYjabQgwBJIwGgxGBMIYDCW2GQIDpttuSdu2pwc97ht0rTnZOlxTp32
-pLWTc5L2tKnr2ITFdhxvGMwSL8hgwiokViGjXUgajWak2ect39c/QPYgi9VuUv/+ffPuvb937/fe
-vb87AuccX2aQP3UAnxdfegLiF2VoxebK2Yzz+yWJlosSvYuZvNg0WA4AQSAIEkL8AkGvobEjjLHX
-d29vPv1F+BU+zxlY9Uj1ZIGgQRCEb7qyrK7p1fkWh8NFbWoGbIoLqmwHB0NKiyOeiiChhTE4OKi3
-Nvfr8Ugqwhl+C+Df397adOGPSmDF5spCSRZ/rdqk+TNmF5IpReWKVXEhnhqFYeowmQHT1GGYOggh
-IAIFpRIoEaFKNlgUByKJYXT3t5rHPmhPMZP/zjTYP7y9teny/ykBd55DmLt06rcIFf51wfJpalnR
-HJrUoogmRpHSYxgcHERoKKbFIqlkPKqxZEyXAAiyKuoWmwSbQ1Fyi1xqdpYbqmyH3eKCJKq40HFM
-P/peu845/7kgCD9668WT5m0REASBABAAcACcT8CqdoOvRLVIr+ZPcpUvXnSfFYKAkegA/IEBdH8c
-SAz2jFJCyOlUSn8VQBeAbs7QTanACCEFhml6KSFlokQ3mgar8BQ69akVHrs7Mx+ZjnxwMHx48INE
-d9vw8URcW73/t2dGb4kAAAmACoACYACSAPR0ErUbfCWyQo/NW1aaWT55Lg1G+hGK9OPUR52xcCgR
-NHTzFwB27N7e3HsrTh9YPyuLUGGNJNGnM7Jtjpn3FNrcGYVwOwvRdKFRO3Ggw88Zlry9tantVgg4
-ALgBKAB0AEEAYc65CVypdyqSY4tWVeRM9dbQwVAHLrZeMtpaBjRm8qeoSJ65nZSnY+HK6ZIz0/Jt
-AD8u9eVZppVPlTwZJegZOs9+/8bJqJYy7977csvHNyOQA6Bg3gOl32462Pl8Mq53AxjinOsPrJ+V
-r1qkY4tXzcwryfNR/0gnDh9ojgX90SbTYI/s3t7cdSeBj0fdJp9Hkui+HK+ztObe6dbczMnoC1xk
-777Z1GsabNbu7c3hGxHIA1BYu3HWMQDBcDD594f3tW3hnGurG6ofBfDc8nXzZEEQcPhAcyw0FPu9
-rpsP7dnRYkwQyDSR0g2SQh80dNPLGbIAcIEgJEq0R0savzMZe2PPjpbW8feufLhKIVT4jdWhLF/4
-QJU9P+suNLce0po+7DpcXJq95Jc/2M+uRyD/KoGj06u86GwdSmhJ4wSAx3dvb764YnPleiqS/5Jk
-UTUNtpNzvml8yazYXDlbksX/VqxiWXmNVywumCrbLZmwqRkAgGgihHBsCN29ncnzJy8zPWV+qGlG
-w54dLf7xAa1uqH4lx+tcNXd+pSUvawr27N8Z7+sI/eStF08+fVMC85aVwtBN+HvDZl9HSAfwn8mE
-/kOrXRYN3bx/SoXntfQncd+DFardpTwnSnTt/fWzLVPyqwXdSEI3NOhGErqZgiAIkEQVsqhCogoE
-QnCmvVE/+E5rwjTY47u3N786QSaOlPryZsycMUu0Kg5se+G1mGmwybu3Nw9dj0BR7cZZR+YtK0V/
-VwgZ2TZICkV323Ai0B9Jmow9sWdHy/b0G+sfq8kA8G7JtJzy+xevsAiCgJGoH0Mj3Qj4R/hQfyQa
-9EcFANyd6yA5BQ5btjsDblcRXLYcxJNhvP3WnnhkJPl7XTMeTa/zuk0+j0hp21dXTnNO8VbhdOsR
-relg55adW5q+eVMCve1BAIDVLiMn34FU0sCFpv5YMq61coZvvL21qfkqgecz3NZHN6zfLEYTIQRG
-e3D4/dPRcCjh55zvNQ12hHHeRARBYpzPliS6AMASd77DNXeBz5blKIDN4sJHJ/bqZ472vvPmCyce
-TA9s1SPVT2bl2n7y1SWzrZmOfPzm+VcSyYTuG/9Wui4BSgWoVhmZOTY4nU4MXg7ws8d7UwC2mQb7
-OwCZkixuUW1SVUmZ23LuRF8CwI8mlbl/fr0DV7fJJ0oS/UdCyHfm3DdZLSkoFzId+dixY1s86I8+
-ll5OC1dOlzLc1u65S6fmlRbX4OzHR43j73f8dNe2U99Pt0muBEuEiRxyzhEZSWI4EESu1y3Ufu0e
-dVKZ+xEqki4qkmVFd2UtHA3Gv3mxZWCnljKrdm5pevZ6wQPAnh0txs4tTT9MpfT5Jxo7Bz/uOssT
-qQhW1ddZqUier9vk84z9tnHXBV3TjO9fOuePxZIjKC6YKlKRbBpvM72d5lcz8hkwkyMcDsNqU1BZ
-PUOZNiOuHD90/pmui4G/AfBnr//P8TXjnjQoIaAiwdVWBYZuYvf25jEiTSsfrlp2srHzWJ7Hqxa4
-yzC/rszy0d62LQDq0vy+4e8N/0c8NYpC93RQkXhrN/hK9r7c0nlNBm4VpmliNDYEWVRRu3ypbdGq
-ijKLVX6v/rGal1c3VOfe92CFUP9YDXILXFi6xod1m+uw7uFaLFo5A1keO1Y3VOOB9bMAALu2nTpD
-qPDMsY/OJEZjQ6i8a4koSvSrdZt808b87XvldJCK5NxQwI+kHkPprFxIEq1Pj+mOJrKkHkMkHoQ3
-u1TY+Ohay6y5RWs4Q7vdpfxL5VeKbctX1sKqOhGM9GEk6ofTlo01X6uH795iqBbpEzvBwdhTQX80
-MjTSDcZNlNd4KSXkmmwauvnS0OVwSjeSyCvIVggVZk9IgJIr6b5VcDDEkmFoegLVM78iP/RorTW3
-yPW9S2cHX2w+e8TmDwyg9XQPTh9vR1dPB7oHz6Jm5gJk5tiwYnMlgCt1TqjwwXBgBJqewKTiEkVW
-xXXpfkzGLkZHUynD1KHKdhAqFE9I4E5hmDoi8SAUyYLltSsxd3HFukvn/NHjH7Q/29cRyu7vCtHm
-j7ox0DeM4XAv7p4/DVT81K2WNBqHB6IJzUjCYc2CoZtF6fZFSi8n4hoYY2Nfdu8XSmAMSS2OaCKE
-3MzJ+PqGtaiaP+lJAJcJIW4tZaKrbRixZBjZjoJr7uMMxwIDUWYYGhxWNzhDZvp1xlifljREk2lQ
-ZCtMg7k/Q0AgECYaYm4XhBBQIiKaCKG3PWgIgvBdzvmgQABDNwEwUCKCp71oGWMJ02CfvP0457f1
-UL8QVYISEYpsBeccJ08fwvmTl6GnzAdNxvYAgCRRFJRkwaq4EIz0g9BP39ZUJHNy8h1cFGVE4gFQ
-kQTTbRNCCmRVNAgRkdLioCIJXHP98wavylbY1Az0+M/xl7e+gURM3ztn8RTfjDkFe1xZVtgcCiZP
-96BoajbcriK0nLwA0/g0BbIqLsjKtVllUUUkHgQVSV+6fcM0vRarLIhERiw5AgDXDP4iADCTC4Iw
-4TfsuqBEhtOWjXBsGAf274uNBuPtnCHq8TqfnFLoax129cLjzQAlIqyKC9muApzvOIK+jtA1h5gz
-LM7KcQiyZEFXd6eWSuivX+uHlNldikwpRVKLgpm8+zMEbi9wEXZLJigRcfjIh4n2c/6UoZt/ffS9
-9i01C0syD+9vi3VPDqBqdgUKc8oBzhGKDmDvvj0Y6B6BljLFvS9fGYbWPj77G6pFys3NnAwiULQ2
-9+uCILxxTYAS3ZjjdSqKZMNA33CKmfz4HREQBAEW1Q6bmoHuvkus6cOuFIDnDN38QVorHASAFZsr
-aV/HIRMAOAMIFWDoJplS4eG//MF+AwA2PTHPaxrsF/OWzrBmOnJxpuOAmUroJ3dtO3VmzOcD62dl
-ybJYkeP2QBZVXGwZgK6bb32GgCjRG9aPapWRmZGFWGIUB/ediaUSerOhm3++e3vz+bpNvnWrG6rn
-mQb78RiR3dubJxryPyn8hu8s8BgG2zW9Ol/2ZpcilhhF467zCdNgm9NvIFRY4yl0GlbFpQTCvWAm
-v5zeBwE3OcSSLCIn3wFFFdF0pDV+aM9FfyycbHjrxZPzAUTqH6vZZ3MoW4pLs58QJfpx7Qbf0hvZ
-A4CVD1fVjwTirYVTsipmVlSJNjUDu3ftjQP4q3RZZuHK6ZIsi09PrfDYbGoGunouGabBdoy3N2EJ
-EUFARrYNjgwV3R8HjK7WYZ1z/jNZFZ/euaUpAQCiRP/ZlWW9b926dWI0GURJ2aWcw/vb3lzdUP2u
-rpvvEEE4bnUoLcMDUaJYxUoAsxVFqrfY5flfuX+6rTCnHA5rFv7QsscYCcT/sHNL0wvpMTgzLd/O
-cFudnuwiEEJw6lCXbhjs1xMSEMinbbTdqcLuUhAOJXDh1OWYobGDum5+a3zqOOffHQ3G5zRdaCy5
-11enWGQnMtbm2bp6LtUP9UWWBgYjPBHVVKtdhsUuJ9x5duopcFknF5ch2+lFQovipVe2xkNDsROc
-8/Xptq+OlD+eMbvQmuXIR9O5gxrnfNtEGpEAIF+xiFOWrp3ReM/SqSQWTqLzYiAWD2tBxtjju7c3
-71/29Zk2SaJLplR4dqUPLPWP1TgEQXhJtUmLalcttOVmlSClxa8KvBoSqRgEQYBVdX4y1FMq4XzX
-IfP9naeTzOR/u2vbqV+NK7FPhnrfrEpRlWzY+vxrMcZuMNSPEcjxOk1/36humvyfElHt3xp3XdDr
-NvmWSxJ9gYrExUy+E8DG8bJK7QbfUlmhv8ry2HMr7i5Q87OnUoc164q8zjmSWhQjUT96+i/p5070
-JeOR1FnTYBsnEsZWN1S/4ilwrbp3QZUlxzUJ7+zdGe/vHrmhrOJRrdKURfXTPzI09m7HBf/32s8N
-neWcaysfrlpLqPDy/WtqJJFKONJ4Jn5V2Fp3HWFrriTRTaJEVxm6mctMbuGcg4okQUXSbxrsdV03
-Xzv+fsfRwEDkmt5rImHr5NkPtZbDPTcVtlySTL0VdxfUNB/uPg5gGMAI59yo2+TLk2Xx2JL6qvxi
-TwUdDHXgD40t8ZFA/LiuGQ/fTMx96C/vkf29Yd6464J+o9+lS4t3zyu3ejJK0DvUyt5769QtSYsy
-ACuuHGgGIA4gNdadrthcWUBFcnTxqpl5k/MryWCoA20X2422loEUZ3jKMM2fTZSNW8F4cbe8okxy
-u4rQ7T/H3n2z6ZbFXQFXpPWx/YA5vrWu3eArkhV6bH5dmbusaA4NRQfG5PVoOJQYZiZ/1jDNlyaS
-CifCRPJ6TkYxsp1enDh7QGs62Hnr8vpYrIIg3HAmWN1QXSwIwusFkzOnLVq42EaIiGCkD4HgADov
-BuIDXaNElMkJLWm8CaAHQLdp8p6bLTg82UXIsHtgMgMHDryf6OsI3d6C4w5XTD+dX1dmKZ80j8ZT
-o4glw0hqUQwODiLoj+rxqDa2YhJxnRWTVXXCplxZMZ1uO6yfONChA7izFdPtYtUj1V4qkudlVVxY
-MdtL7po0Q3Fa3YinRqHpqStLPmbAZBqAK623OLbkk+1QJAtGY0Po7m81TzR2/vGWfOOxYnPlJEEQ
-GggV/sKRoWZOq/IqLpdLtMh22CwuWBUXACCeGkVKTyCWHMFg/5De2tyvpxL6n27Neh0ydzPOl32p
-Ft3/H/Cl/6/El57A/wJ8cx0zQag27gAAAABJRU5ErkJggg==
-"
-     id="image3323"
-     x="0"
-     y="0" />
-</svg>
--- a/28
+++ b/28
@ -1,28 +0,0 @@
-#!/bin/bash
-
-function runCompiz() {
-    emerald --replace &
-    exec compiz --replace ccp $@
-}
-
-ISSW=`glxinfo | grep "Software Rasterizer" -c`
-
-# Try with direct rendering
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Try again with indirect rendering
-export LIBGL_ALWAYS_INDIRECT=1
-
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
-
-# Fall back to xfwm4
-exec xfwm4 $@
-
--- a/compiz-xfce-emerald.desktop
+++ b/compiz-xfce-emerald.desktop
@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Compiz XFCE Emerald
-Comment=start or restart Compiz Fusion with Emerald windows-decorator
-TryExec=compiz-xfce-emerald
-Exec=compiz-xfce-emerald
-Icon=fusion-icon
-NoDisplay=false
-StartupNotify=true
-Categories=Utility;
-OnlyShowIn=XFCE;
-Name[de_DE]=Compiz XFCE Emerald
--- a/compiz.spec
+++ b/compiz.spec
@ -1,84 +1,27 @@
-%global    core_plugins    blur clone cube decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall annotate svg matecompat
- 
-# List of plugins passed to ./configure.  The order is important
- 
-%global    plugins         core,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall,obs
+%global    core_plugins    blur clone cube decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher water wobbly zoom fs obs commands wall annotate svg matecompat

+# List of plugins passed to ./configure.  The order is important
+
+%global    plugins         core,dbus,decoration,fade,minimize,move,obs,place,png,resize,scale,screenshot,svg,switcher,wall

 Name:           compiz
-URL:            http://www.compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
-Group:          User Interface/Desktops
-Version:        0.8.8
-Release:        25%{?dist}
+Version:        0.8.18
+Release:        6%{?dist}
 Epoch:          1
 Summary:        OpenGL window and compositing manager
- 
-# libdrm is not available on these arches
-ExcludeArch:   s390 s390x
- 
-Source0:       http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
-Source1:       compiz-mate-gtk
-Source2:       compiz-mate-gtk.desktop
-Source3:       compiz-mate-emerald
-Source4:       compiz-mate-emerald.desktop
-Source5:       compiz-lxde-emerald
-Source6:       compiz-lxde-emerald.desktop
-Source7:       compiz-xfce-emerald
-Source8:       compiz-xfce-emerald.desktop
-Source9:       compiz-decorator-gtk
-Source10:      gtk-decorator.desktop
-Source11:      compiz-decorator-emerald
-Source12:      emerald-decorator.desktop
-Source13:      compiz-plugins-main_plugin-matecompat.svg
-Source14:      emerald-decorator.svg
-Source15:      gtk-decorator.svg

-# build for aarch64
-Patch0:        compiz-aarch64.patch 
-# usage of matecompat plugin and marco for gtk-windows-decorator
-Patch1:        compiz_new_mate.patch
-# Patches that are not upstream
-Patch2:        compiz_disable_gdk_disable_deprecated.patch
-Patch3:        compiz_composite-cube-logo.patch
-Patch4:        compiz_fedora-logo.patch
-Patch5:        compiz_redhat-logo.patch
-Patch6:        compiz-0.8.6-wall.patch
-Patch7:        compiz-0.8.6-new_unloadpluginfix.patch
-Patch8:        compiz-0.8.8_incorrect-fsf-address.patch
-Patch9:        compiz_new_add-cursor-theme-support.patch
-Patch10:       compiz-fix-gtk-window-decorator-no-argb-crash.patch
-Patch11:       compiz_fix-no-border-window-shadow.patch
-Patch12:       compiz_draw_dock_shadows_on_desktop.patch
-Patch13:       compiz_optional-fbo.patch
-Patch14:       compiz_call_glxwaitx_before_drawing.patch
-Patch15:       compiz_always_unredirect_screensaver_on_nvidia.patch
-Patch16:       compiz_fullscreen_stacking_fixes.patch
-Patch17:       compiz_damage-report-non-empty.patch
-Patch18:       compiz_stacking.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=909657
-Patch19:       compiz_primary-is-control.patch
-# those patches belongs together, removal of keybindings, mate-windows-settings
-# kde, gconf/mateconf, dbus, glib and old metacity checks
-Patch20:       compiz_remove_keybindings_and_mate-windows-settings_files.patch
-Patch21:       compiz_remove_kde.patch
-Patch22:       compiz_remove_mateconf_dbus_glib.patch
-Patch23:       compiz_clean_potfiles.patch
-Patch24:       compiz_remove_old_metacity_checks.patch
-# gtk-windows-decorator
-Patch25:       compiz_commandline_options_for_button_layout_and_titlebar_font.patch
-# usage of libmatewnck for gtk-windows-decorator
-Patch26:       compiz_libwnck_to_libmatewnck.patch
-Patch27:       compiz_matewnck_corrections.patch
-# new patch series
-Patch28:       compiz_get_smclient-id_from_DESKTOP-AUTOSTART-ID.patch
-# removing the rest of the gconf/mateconf code in gtk-windows-decorator
-Patch29:       compiz_removal_gconf.patch
-Patch30:       compiz_automake-1.13.patch
+URL:            https://gitlab.com/compiz/compiz-core
+Source0:        %{url}/-/archive/v%{version}/compiz-core-v%{version}.tar.bz2
+
+# fedora specific
+Patch0:        compiz-0.8.18-fedora-logo.patch
+# FTBFS fix, this can be dropped with compiz > 0.8.18
+Patch1:        compiz-0.8.18-rsvg2-2.52-fix.patch

 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
-BuildRequires: libmatewnck-devel
+BuildRequires: libXcursor-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libXrender-devel
@ -97,23 +40,28 @@ BuildRequires: mesa-libGLU-devel
 BuildRequires: fuse-devel
 BuildRequires: cairo-devel
 BuildRequires: libtool
+BuildRequires: libjpeg-turbo-devel
 BuildRequires: libxslt-devel
-BuildRequires: mate-window-manager-devel
+BuildRequires: marco-devel
+BuildRequires: glib2-devel
+BuildRequires: libwnck3-devel
+BuildRequires: libcompizconfig-devel
+BuildRequires: dbus-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: automake
+BuildRequires: make

-Requires:       system-logos
-Requires:       glx-utils
-# this is an inverse require which is needed for build without gtk-windows-decorator
-Requires:       emerald
-Requires:       hicolor-icon-theme
+Requires:      glx-utils
+
+# obsolete old subpackges
+Obsoletes: %{name}-xfce < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-lxde < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-mate < %{epoch}:%{version}-%{release}
+%if 0%{?fedora} < 25
+Provides:  compiz-mate = %{epoch}:%{version}-%{release}
+%endif

-# obsolete old compiz versions from f15/f16, rhbz (#997557)
-Obsoletes: %{name}-gconf < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-gnome < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-gtk < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-kde < %{epoch}:%{version}-%{release}

- 
- 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@ -121,206 +69,88 @@ compositing effects in window management, such as a minimization
 effect and a cube work space. Compiz is an OpenGL compositing manager
 that use Compiz use EXT_texture_from_pixmap OpenGL extension for
 binding redirected top-level windows to texture objects.
- 
+
 %package devel
 Summary: Development packages for compiz
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
 Requires: libXcomposite-devel libXfixes-devel libXdamage-devel libXrandr-devel
 Requires: libXinerama-devel libICE-devel libSM-devel libxml2-devel
 Requires: libxslt-devel startup-notification-devel
- 
+
 %description devel
 The compiz-devel package includes the header files,
 and developer docs for the compiz package.
 Install compiz-devel if you want to develop plugins for the compiz
 windows and compositing manager.

-%package mate
-Summary: Compiz mate integration bits
-Group: User Interface/Desktops
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
- 
-%description mate
-The compiz-mate package contains the matecompat plugin
-and start scripts to start Compiz with emerald and
-gtk-windows-decorator.

-%package xfce
-Summary: Compiz xfce integration bits
-Group: User Interface/Desktops
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
- 
-%description xfce
-The compiz-xfce package contains a start script to start
-Compiz with emerald.
-
-%package lxde
-Summary: Compiz lxde integration bits
-Group: User Interface/Desktops
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
- 
-%description lxde
-The compiz-lxde package contains a start script to start
-Compiz with emerald.
-
- 
 %prep
-%setup -q
-%patch0 -p1 -b .aarch64
-%patch1 -p1 -b .mate
-%patch2 -p1 -b .disable_deprecated
-%patch3 -p1 -b .composite-cube-logo
-%if 0%{?fedora}
-%patch4 -p1 -b .fedora-logo
-%else
-%patch5 -p1 -b .redhat-logo
-%endif
-%patch6 -p1 -b .wall
-%patch7 -p1 -b .unloadfix
-%patch8 -p1 -b .incorrect-fsf-address
-%patch9 -p1 -b .cursor-theme-support
-%patch10 -p1 -b .gtk-window-decorator-no-argb-crash
-%patch11 -p1 -b .no-border-window-shadow
-%patch12 -p1 -b .draw_dock_shadows
-%patch13 -p1 -b .fbo
-%patch14 -p1 -b .glxwaitx_before_drawing
-%patch15 -p1 -b .always_unredirect_screensaver
-%patch16 -p1 -b .fullscreen_stacking
-%patch17 -p1 -b .damage-report
-%patch18 -p1 -b .stacking
-%patch19 -p1 -b .primary-is-control
-%patch20 -p1 -b .remove_keybindings
-%patch21 -p1 -b .remove_kde
-%patch22 -p1 -b .remove_mateconf_dbus_glib
-%patch23 -p1 -b .potfiles
-%patch24 -p1 -b .old_metacity_checks
-%patch25 -p1 -b .commandline_options
-%patch26 -p1 -b .wnck_to_matewnck
-%patch27 -p1 -b .matewnck_corrections
-%patch28 -p1 -b .get_smclient-id
-%patch29 -p1 -b .gconf
-%patch30 -p1 -b .automake
- 
-%build
-autoreconf -f -i
+%setup -q -n compiz-core-v%{version}

+%patch0 -p1 -b .fedora-logo
+%patch1 -p1 -b .rsvg2-2.52-fix
+
+%build
+./autogen.sh
 %configure \
+    --with-gtk=3.0 \
    --enable-librsvg \
    --enable-gtk \
    --enable-marco \
-    --enable-mate \
+    --enable-menu-entries \
    --with-default-plugins=%{plugins}
- 
-make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
- 
- 
+
+make %{?_smp_mflags} V=1
+
+
 %install
-make DESTDIR=$RPM_BUILD_ROOT install || exit 1
+%{make_install}

-install %SOURCE1 $RPM_BUILD_ROOT%{_bindir}
-install %SOURCE3 $RPM_BUILD_ROOT%{_bindir}
-install %SOURCE5 $RPM_BUILD_ROOT%{_bindir}
-install %SOURCE7 $RPM_BUILD_ROOT%{_bindir}
-install %SOURCE9 $RPM_BUILD_ROOT%{_bindir}
-install %SOURCE11 $RPM_BUILD_ROOT%{_bindir}
+desktop-file-install                              \
+    --delete-original                             \
+    --dir=%{buildroot}%{_datadir}/applications \
+%{buildroot}%{_datadir}/applications/*.desktop

-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE2
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE4
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE6
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE8
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE10
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE12
-
-# matecompat icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
-cp -f %SOURCE13 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/plugin-matecompat.svg
-# emerald-decorator icon
-cp -f %SOURCE14 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/emerald-decorator.svg
-# gtk-decorator icon
-cp -f %SOURCE15 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gtk-decorator.svg
-
-rm $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop
- 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'

 %find_lang %{name}
- 
+
 cat %{name}.lang > core-files.txt
- 
+
 for f in %{core_plugins}; do
  echo %{_libdir}/compiz/lib$f.so
  echo %{_datadir}/compiz/$f.xml
 done >> core-files.txt
- 

-%post
-/sbin/ldconfig
-/bin/touch --no-create %{_datadir}/compiz &>/dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
- 
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/compiz &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/compiz &>/dev/null || :
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
+# placeholder for local icons
+mkdir -p %{buildroot}%{_datadir}/compiz/icons/hicolor/{scalable/{apps,\
+categories},22x22/{categories,devices,mimetypes}}

-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/compiz &>/dev/null || :
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%ldconfig_scriptlets

-%post mate -p /sbin/ldconfig
-
-%postun mate -p /sbin/ldconfig
-
- 
- 
 %files -f core-files.txt
-%doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL README TODO NEWS
+%doc AUTHORS COPYING.GPL COPYING.LGPL README.md TODO NEWS
 %{_bindir}/compiz
+%{_bindir}/compiz-decorator
+%{_bindir}/gtk-window-decorator
 %{_libdir}/libdecoration.so.*
 %dir %{_libdir}/compiz
+%{_libdir}/compiz/libdbus.so
+%{_libdir}/compiz/libglib.so
 %dir %{_datadir}/compiz
 %{_datadir}/compiz/*.png
+%{_datadir}/compiz/icons
 %{_datadir}/compiz/core.xml
+%{_datadir}/compiz/dbus.xml
+%{_datadir}/compiz/glib.xml
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/applications/compiz.desktop
+%{_datadir}/applications/compiz-start.desktop
+%{_datadir}/glib-2.0/schemas/org.compiz-0.gwd.gschema.xml

-%files mate
-%{_bindir}/gtk-window-decorator
-%{_bindir}/compiz-mate-emerald
-%{_bindir}/compiz-mate-gtk
-%{_bindir}/compiz-decorator-gtk
-%{_bindir}/compiz-decorator-emerald
-%{_datadir}/applications/compiz-mate-emerald.desktop
-%{_datadir}/applications/compiz-mate-gtk.desktop
-%{_datadir}/applications/gtk-decorator.desktop
-%{_datadir}/applications/emerald-decorator.desktop
-
-%files xfce
-%{_bindir}/compiz-xfce-emerald
-%{_datadir}/applications/compiz-xfce-emerald.desktop
-
-%files lxde
-%{_bindir}/compiz-lxde-emerald
-%{_datadir}/applications/compiz-lxde-emerald.desktop
- 
 %files devel
 %{_libdir}/pkgconfig/compiz.pc
 %{_libdir}/pkgconfig/libdecoration.pc
@ -331,6 +161,178 @@ fi


 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 26 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1:0.8.18-5
+- Fixed FTBFS with the librsvg2-2.52
+  Resolves: rhbz#2045273
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov  9 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1:0.8.18-1
+- New version
+  Resolves: rhbz#1891137
+
+* Fri Oct 23 2020 Wolfgang Ulbrich <fedora@raveit.de - 1:0.8.16.1-7
+- build with marco again
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.16.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.16.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.16.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 17 2019 Wolfgang Ulbrich <fedora@raveit.de - 1:0.8.16.1-3
+- build with marco-1.22.2
+- enable BR libcompizconfig-devel
+
+* Mon Jun 17 2019 Wolfgang Ulbrich <fedora@raveit.de - 1:0.8.16.1-2
+- build without marco, because of reverse dependencies to libcompizconfig
+- disable BR libcompizconfig-devel
+
+* Tue Apr  2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1:0.8.16.1-1
+- New version
+  Resolves: rhbz#1656467
+- New URL
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.8.14-4
+- Remove obsolete scriptlets
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Apr 20 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1:0.8.14-1
+- update to 0.8.14 release
+- Handle _NET_WM_MOVERESIZE ClientMessages.
+  Fixes the whisker menu resize bug.
+- Improve horizontal and vertical maximizing.
+- Remove the "Number of Desktops" option.
+- Fix a crash when displaying special characters in gtk-window-decorator.
+- Set rotate and wall default flip bindings to None.
+  Fixes a problem where edges of screen are unclickable by default.
+- Fix potential for skydome silently failing to render.
+- Don't fallback for exceeding max texture size.
+- Improve --button-layout behavior for gtk-window-decorator.
+- Update translations.
+- video plugin is dropped
+- modernize spec file
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.12.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun Nov 20 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12.3-5
+- enable BR libcompizconfig-devel again
+
+* Sun Nov 20 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12.3-4
+- disable BR libcompizconfig-devel for rebuilding libcompizconfig
+- for libprotobuf soname bump
+
+* Sat Jun 11 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12.3-3
+- bump version for rebuild with libcompizconfig-devel
+
+* Sat Jun 11 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12.3-2
+- switch to gtk3
+
+* Tue Apr 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12.3-1
+- update 0.8.12.3 release
+- remove ExcludeArch: s390 s390x, they have libdrm now
+- remove video from default plugins
+
+* Mon Mar 28 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12.2-1
+- update to 0.8.12.2 release
+
+* Sat Feb 13 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.12-1
+- update to 0.8.12
+- Move mate-window-decorator.py into gtk-window-decorator.
+- Add an optional libcompizconfig build dependency that makes it so
+- gtk-window-decorator honors ccsm shadow settings and MATE or
+- GNOME Flashback cursor theme settings.
+- changes with annotate plugin
+- Fix Desktop Wall settings of arrow and gradient thumbs colors.
+- implement native GSettings lookup for gwd
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.10-3
+- fix crash with gwd using close button, rhbz (#1300162, #1298016)
+
+* Sun Dec 20 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.10-2
+- fix runtime requires
+
+* Sat Dec 19 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.10-1
+- update to 0.8.10 release
+- use gtk3 for gwd decorator (mate-window-manager)
+- remove old start sripts + desktop files
+- use only one menuentry to start compiz
+- honor decorator changes in mate-control-center if mate-window-decorator is running
+- 'compiz' is now the gsettings key value to start compiz with session start
+- drop mate subpackage
+
+* Sun Nov 22 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.9-2
+- remove runtime requires fedora-logos, fix rhbz (#1284217)
+ 
+* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.9-1
+- update to 0.8.9
+- new upstream is at https://github.com/raveit65/compiz
+- remove upstreamed patches
+- move emerald scripts to emerald
+- no xfce/lxde subpackages anymore
+- remove runtime requires emerald and hicolors
+- use runtime require fedora-logos for the cube plugin
+- remove external matecompat logo, it's in the tarball now
+- remove mate gwd scripts, they are in the tarball now
+- remove old obsoletes for f15/16
+- some spec file cleanup
+- add desktop-file-install scriptlet
+- update build requires
+- move gtk-window-decorator to main package
+- update configure flags
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.8-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Mar 18 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-29
+- rebuild for f22
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.8-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.8-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Feb 16 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-26
+- change BR to marco-devel for f21
+- rework remove-keybindings-and-mate-windows-settings-files patch
+- rework remove-kde patch
+- rwork compiz_remove_mateconf_dbus_glib.patch
+- rework compiz_remove_old_metacity_checks.patch
+- compiz_cube-set-opacity-during-rotation-to-70-as-default.patch
+- switch to libwnck for f21
+
 * Thu Aug 15 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.8-25
 - obsolete old compiz versions from f15/f16, rhbz (#997557)

--- a/compiz_always_unredirect_screensaver_on_nvidia.patch
+++ b/compiz_always_unredirect_screensaver_on_nvidia.patch
@ -1,32 +0,0 @@
-Author: Travis Watkins <amaranth@ubuntu.com>
-Description: Always unredirect mate-screensaver when using nvidia
- Workaround for LP #160264 while still disabling unredirect fullscreen
- windows for nvidia users
-Origin: vendor, ubuntu (1:0.8.3+git20090917-0ubuntu4)
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/160264
--- a/src/paint.c
-+++ b/src/paint.c
-@@ -262,6 +262,7 @@ paintOutputRegion (CompScreen	       *sc
-     CompTransform vTransform;
-     int           offX, offY;
-     Region        clip = region;
-+    int           dontcare;
- 
-     if (!tmpRegion)
-     {
-@@ -341,8 +342,14 @@ paintOutputRegion (CompScreen	       *sc
- 		    XSubtractRegion (tmpRegion, w->region, tmpRegion);
- 
- 		/* unredirect top most fullscreen windows. */
-+		/* if the fullscreen window is mate-screensaver and we're
-+		   on nvidia we want to always unredirect even if this
-+		   option is disabled to work around LP #160264 */
- 		if (count == 0 &&
-		    screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b)
-+		    (screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b ||
-+		    (w->resName && !strcmp(w->resName, "mate-screensaver") &&
-+		    XQueryExtension (screen->display->display, "NV-GLX",
-+				     &dontcare, &dontcare, &dontcare))))
- 		{
- 		    if (XEqualRegion (w->region, &screen->region) &&
- 			!REGION_NOT_EMPTY (tmpRegion))
--- a/compiz_automake-1.13.patch
+++ b/compiz_automake-1.13.patch
@ -1,49 +0,0 @@
-diff -uprN compiz-0.8.8-orig/gtk/window-decorator/Makefile.am compiz-0.8.8/gtk/window-decorator/Makefile.am
--- compiz-0.8.8-orig/gtk/window-decorator/Makefile.am	2013-05-26 00:46:26.115813000 +0200
-+++ compiz-0.8.8/gtk/window-decorator/Makefile.am	2013-05-26 00:48:40.157154237 +0200
-@@ -16,7 +16,7 @@ gtk_window_decorator_SOURCES	  = \
- gtk_window_decorator_program = gtk-window-decorator
- endif
- 
-INCLUDES = \
-+AM_CPPFLAGS = \
- 	-I$(top_srcdir)/include            \
- 	@GTK_WINDOW_DECORATOR_CFLAGS@      \
- 	@MARCO_CFLAGS@                  \
-diff -uprN compiz-0.8.8-orig/libdecoration/Makefile.am compiz-0.8.8/libdecoration/Makefile.am
--- compiz-0.8.8-orig/libdecoration/Makefile.am	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/libdecoration/Makefile.am	2013-05-26 00:49:02.710379771 +0200
-@@ -4,9 +4,9 @@ libdecoration_la_LIBADD  = @DECORATION_L
- libdecoration_la_LDFLAGS = -no-undefined
- libdecoration_la_SOURCES = decoration.c
- 
-INCLUDES = @DECORATION_CFLAGS@ -I$(top_srcdir)/include
-+AM_CPPFLAGS = @DECORATION_CFLAGS@ -I$(top_srcdir)/include
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libdecoration.pc
- 
-EXTRA_DIST = libdecoration.pc.in
-\ Kein Zeilenumbruch am Dateiende.
-+EXTRA_DIST = libdecoration.pc.in
-diff -uprN compiz-0.8.8-orig/plugins/Makefile.am compiz-0.8.8/plugins/Makefile.am
--- compiz-0.8.8-orig/plugins/Makefile.am	2013-05-26 00:46:26.118813000 +0200
-+++ compiz-0.8.8/plugins/Makefile.am	2013-05-26 00:49:31.336666036 +0200
-@@ -107,7 +107,7 @@ libfs_la_SOURCES = fuse.c
- libfs_module = libfs.la
- endif
- 
-INCLUDES =					\
-+AM_CPPFLAGS =					\
- 	@COMPIZ_CFLAGS@				\
- 	@LIBPNG_CFLAGS@				\
- 	@LIBRSVG_CFLAGS@			\
-diff -uprN compiz-0.8.8-orig/src/Makefile.am compiz-0.8.8/src/Makefile.am
--- compiz-0.8.8-orig/src/Makefile.am	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/src/Makefile.am	2013-05-26 00:49:56.542918101 +0200
-@@ -1,4 +1,4 @@
-INCLUDES =			     \
-+AM_CPPFLAGS =			     \
- 	@COMPIZ_CFLAGS@		     \
- 	@GL_CFLAGS@		     \
- 	-I$(top_srcdir)/include	     \
--- a/compiz_call_glxwaitx_before_drawing.patch
+++ b/compiz_call_glxwaitx_before_drawing.patch
@ -1,17 +0,0 @@
-Author: Travis Watkins <amaranth@ubuntu.com>
-Description: Call glXWaitX before we start drawing
- Call glXWaitX before we start drawing to make sure X is done
- handling rendering calls. Suggested by Michel Dänzer to ensure
- we don't have any rendering glitches.
-Origin: vendor, ubuntu (1:0.8.3+git20090917-0ubuntu3)
--- a/src/display.c
-+++ b/src/display.c
-@@ -1537,6 +1537,8 @@ eventLoop (void)
- 			    timeDiff = 0;
- 
- 			makeScreenCurrent (s);
-+			/* make sure X is ready for us to draw */
-+			glXWaitX ();
- 
- 			if (s->slowAnimations)
- 			{
--- a/compiz_clean_potfiles.patch
+++ b/compiz_clean_potfiles.patch
@ -1,30 +0,0 @@
-diff -uprN compiz-0.8.8-orig/po/POTFILES.in compiz-0.8.8/po/POTFILES.in
--- compiz-0.8.8-orig/po/POTFILES.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/po/POTFILES.in	2013-04-18 09:59:41.902123875 +0200
-@@ -1,9 +1,4 @@
-gtk/mate/50-compiz-desktop-key.xml.in
-gtk/mate/50-compiz-key.xml.in
- gtk/mate/compiz.desktop.in
-gtk/mate/compiz-window-manager.c
-gtk/mate/compiz-wm.desktop.in
-gtk/window-decorator/gwd.schemas.in
- gtk/window-decorator/gtk-window-decorator.c
- metadata/annotate.xml.in
- metadata/blur.xml.in
-@@ -11,16 +6,12 @@ metadata/clone.xml.in
- metadata/commands.xml.in
- metadata/core.xml.in.in
- metadata/cube.xml.in
-metadata/dbus.xml.in
- metadata/decoration.xml.in
- metadata/fade.xml.in
- metadata/fs.xml.in
-metadata/mateconf.xml.in
-metadata/glib.xml.in
- metadata/matecompat.xml.in
- metadata/ini.xml.in
- metadata/inotify.xml.in
-metadata/kconfig.xml.in
- metadata/minimize.xml.in
- metadata/move.xml.in
- metadata/obs.xml.in
--- a/compiz_commandline_options_for_button_layout_and_titlebar_font.patch
+++ b/compiz_commandline_options_for_button_layout_and_titlebar_font.patch
@ -1,60 +0,0 @@
-diff -uprN compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c	2013-04-18 20:00:33.060716000 +0200
-+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c	2013-04-18 20:12:32.808023855 +0200
-@@ -6883,6 +6883,7 @@ main (int argc, char *argv[])
- 
- #ifdef USE_MARCO
-     char       *meta_theme = NULL;
-+	char       *marco_button_layout = "menu:minimize,maximize,close"; 
- #endif
- 
-     program_name = argv[0];
-@@ -6914,6 +6915,11 @@ main (int argc, char *argv[])
- 	    }
- 	    cmdline_options |= CMDLINE_BLUR;
- 	}
-+ 	else if (strcmp (argv[i], "--titlebar-font") == 0)
-+	{
-+		if (argc > ++i)
-+		titlebar_font = pango_font_description_from_string (argv[i]);
-+	} 
- 
- #ifdef USE_MARCO
- 	else if (strcmp (argv[i], "--opacity") == 0)
-@@ -6944,6 +6950,11 @@ main (int argc, char *argv[])
- 		meta_theme = argv[i];
- 	    cmdline_options |= CMDLINE_THEME;
- 	}
-+	else if (strcmp (argv[i], "--button-layout") == 0)
-+	{
-+		if (argc > ++i)
-+		marco_button_layout = argv[i];
-+	} 
- #endif
- 
- 	else if (strcmp (argv[i], "--help") == 0)
-@@ -6952,6 +6963,7 @@ main (int argc, char *argv[])
- 		     "[--minimal] "
- 		     "[--replace] "
- 		     "[--blur none|titlebar|all] "
-+			 "[--titlebar-font FONT] " 
- 
- #ifdef USE_MARCO
- 		     "[--opacity OPACITY] "
-@@ -6959,6 +6971,7 @@ main (int argc, char *argv[])
- 		     "[--active-opacity OPACITY] "
- 		     "[--no-active-opacity-shade] "
- 		     "[--marco-theme THEME] "
-+			 "[--button-layout LAYOUT] "
- #endif
- 
- 		     "[--help]"
-@@ -6985,6 +6998,8 @@ main (int argc, char *argv[])
- 	    theme_update_border_extents	    = meta_update_border_extents;
- 	    theme_get_event_window_position = meta_get_event_window_position;
- 	    theme_get_button_position	    = meta_get_button_position;
-+		meta_update_button_layout(marco_button_layout);
-+		meta_button_layout_set = TRUE; 
- 	}
-     }
- #endif
--- a/compiz_composite-cube-logo.patch
+++ b/compiz_composite-cube-logo.patch
@ -1,31 +0,0 @@
-diff -up compiz-0ec3ec/plugins/cube.c~ compiz-0ec3ec/plugins/cube.c
--- compiz-0ec3ec/plugins/cube.c~	2007-07-23 16:20:42.000000000 -0400
-+++ compiz-0ec3ec/plugins/cube.c	2007-08-15 17:45:18.000000000 -0400
-@@ -1272,11 +1272,27 @@ cubePaintTop (CompScreen	      *s,
- 
-     if (cs->invert == 1 && size == 4 && cs->texture.name)
-     {
-+	glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-+
-+	glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-+
-+	glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS);
-+	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-+
- 	enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD);
- 	glTexCoordPointer (2, GL_FLOAT, 0, cs->tc);
- 	glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nVertices >> 1);
- 	disableTexture (s, &cs->texture);
- 	glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-+
-+	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-     }
-     else
-     {
--- a/compiz_damage-report-non-empty.patch
+++ b/compiz_damage-report-non-empty.patch
@ -1,83 +0,0 @@
-Author: Michael Vogt <michael.vogt@ubuntu.com>
-Description: Workaround for problems with damage extension and refresh
- Add workaround patch by Aaron Plattner to fix problems with the damage
- extension and refresh (LP: #269904)
-Origin: vendor, ubuntu (1:0.7.8-0ubuntu4)
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/269904
--- a/src/event.c
-+++ b/src/event.c
-@@ -2315,32 +2315,50 @@ handleEvent (CompDisplay *d,
- 
- 	    if (w)
- 	    {
-+		XserverRegion parts = XFixesCreateRegion(de->display, NULL, 0);
-+		XRectangle *rects;
-+		int nRects;
-+
- 		w->texture->oldMipmaps = TRUE;
- 
-+		// Get the damage region
-+		XDamageSubtract(de->display, de->damage, None, parts);
-+		rects = XFixesFetchRegion(de->display, parts, &nRects);
-+		XFixesDestroyRegion(de->display, parts);
-+
- 		if (w->syncWait)
- 		{
-		    if (w->nDamage == w->sizeDamage)
-+		    int i;
-+
-+		    if (w->nDamage + nRects - 1 >= w->sizeDamage)
- 		    {
- 			w->damageRects = realloc (w->damageRects,
-						  (w->sizeDamage + 1) *
-+						  (w->sizeDamage + nRects) *
- 						  sizeof (XRectangle));
-			w->sizeDamage += 1;
-+			w->sizeDamage += nRects;
- 		    }
- 
-		    w->damageRects[w->nDamage].x      = de->area.x;
-		    w->damageRects[w->nDamage].y      = de->area.y;
-		    w->damageRects[w->nDamage].width  = de->area.width;
-		    w->damageRects[w->nDamage].height = de->area.height;
-		    w->nDamage++;
-+		    for (i = 0; i < nRects; i++)
-+		    {
-+			w->damageRects[w->nDamage] = rects[i];
-+			w->nDamage++;
-+		    }
- 		}
- 		else
- 		{
-		    handleWindowDamageRect (w,
-					    de->area.x,
-					    de->area.y,
-					    de->area.width,
-					    de->area.height);
-+		    int i;
-+
-+		    for (i = 0; i < nRects; i++)
-+		    {
-+			handleWindowDamageRect (w,
-+						rects[i].x,
-+						rects[i].y,
-+						rects[i].width,
-+						rects[i].height);
-+		    }
- 		}
-+
-+		XFree(rects);
- 	    }
- 	}
- 	else if (d->shapeExtension &&
--- a/src/window.c
-+++ b/src/window.c
-@@ -2207,7 +2207,7 @@ addWindow (CompScreen *screen,
- 	XUnionRegion (&rect, w->region, w->region);
- 
- 	w->damage = XDamageCreate (d->display, id,
-				   XDamageReportRawRectangles);
-+				   XDamageReportNonEmpty);
- 
- 	/* need to check for DisplayModal state on all windows */
- 	w->state = getWindowState (d, w->id);
--- a/compiz_disable_gdk_disable_deprecated.patch
+++ b/compiz_disable_gdk_disable_deprecated.patch
@ -1,18 +0,0 @@
-Stop breaking on deprecated GTK_WIDGET_VISIBLE.
--- a/gtk/window-decorator/gtk-window-decorator.c
-+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -31,14 +31,6 @@
- #include <X11/extensions/Xrender.h>
- #include <X11/Xregion.h>
- 
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATED
-#endif
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_DISABLE_DEPRECATED
-#endif
-
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>
--- a/compiz_draw_dock_shadows_on_desktop.patch
+++ b/compiz_draw_dock_shadows_on_desktop.patch
@ -1,85 +0,0 @@
-Author: Travis Watkins <amaranth@ubuntu.com>
-Description: Change decoration plugin dock shadow drawing behavior
- change decoration plugin to draw dock shadows only on the
- desktop window instead of on top of all other windows
-Origin: vendor, ubuntu (1:0.8.2-0ubuntu16)
--- a/plugins/decoration.c
-+++ b/plugins/decoration.c
-@@ -190,6 +190,11 @@ decorDrawWindow (CompWindow	      *w,
-     status = (*w->screen->drawWindow) (w, transform, attrib, region, mask);
-     WRAP (ds, w->screen, drawWindow, decorDrawWindow);
- 
-+    /* we wait to draw dock shadows until we get to the lowest
-+       desktop window in the stack */
-+    if (w->type & CompWindowTypeDockMask)
-+	return status;
-+
-     if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
- 	region = &infiniteRegion;
- 
-@@ -226,6 +231,65 @@ decorDrawWindow (CompWindow	      *w,
- 					     attrib, mask);
-     }
- 
-+    if (w->type & CompWindowTypeDesktopMask)
-+    {
-+	/* we only want to draw on the lowest desktop window, find it and see
-+	   if we the window we have is it */
-+	CompWindow *window = w->screen->windows;
-+	for (window = w->screen->windows; window; window = window->next)
-+	{
-+	    if (window->type & CompWindowTypeDesktopMask)
-+	    {
-+		if (window == w)
-+		    break;
-+		else
-+		    return status;
-+	    }
-+	}
-+
-+	/* drawing dock shadows now */
-+	for (window = w->screen->windows; window; window = window->next)
-+	{
-+	    if (window->type & CompWindowTypeDockMask && !window->destroyed && !window->invisible)
-+	    {
-+		DECOR_WINDOW (window);
-+
-+		if (dw->wd && region->numRects)
-+		{
-+		    WindowDecoration *wd = dw->wd;
-+		    REGION	     box;
-+		    int		     i;
-+
-+		    mask |= PAINT_WINDOW_BLEND_MASK;
-+
-+		    box.rects	 = &box.extents;
-+		    box.numRects = 1;
-+
-+		    window->vCount = window->indexCount = 0;
-+
-+		    for (i = 0; i < wd->nQuad; i++)
-+		    {
-+			box.extents = wd->quad[i].box;
-+
-+			if (box.extents.x1 < box.extents.x2 &&
-+			    box.extents.y1 < box.extents.y2)
-+			{
-+			    (*window->screen->addWindowGeometry) (window,
-+								  &wd->quad[i].matrix, 1,
-+								  &box,
-+								  region);
-+			}
-+		    }
-+
-+		    if (window->vCount)
-+			(*window->screen->drawWindowTexture) (window,
-+							      &wd->decor->texture->texture,
-+							      attrib, mask);
-+		}
-+	    }
-+	}
-+    }
-+
-     return status;
- }
- 
--- a/compiz_fix-no-border-window-shadow.patch
+++ b/compiz_fix-no-border-window-shadow.patch
@ -1,21 +0,0 @@
-From abf9d0b9c431f56e3fe88cb5a22b2f5e7b41e92e Mon Sep 17 00:00:00 2001
-From: Nicolas Bruguier <gandalfn@mithrandir.(none)>
-Date: Tue, 12 Dec 2006 22:59:22 +0100
-Subject: [PATCH] Fix no border window shadow
---
- libdecoration/decoration.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
--- a/libdecoration/decoration.c
-+++ b/libdecoration/decoration.c
-@@ -1243,7 +1243,9 @@ decor_shadow_create (Display		    *xdisp
-     }
- 
-     /* create pixmap for temporary decorations */
-    d_pixmap = XCreatePixmap (xdisplay, xroot, d_width, d_height, 32);
-+    d_pixmap = XCreatePixmap (xdisplay, xroot, 
-+                              (d_width % 32) ? d_width : d_width + 1, 
-+                              d_height, 32);
-     if (!d_pixmap)
-     {
- 	XFreePixmap (xdisplay, pixmap);
--- a/compiz_fullscreen_stacking_fixes.patch
+++ b/compiz_fullscreen_stacking_fixes.patch
@ -1,17 +0,0 @@
-Author: Travis Watkins <amaranth@ubuntu.com>
-Description: keep window on top of fullscreen windows during move
-Origin: vendor, ubuntu (1:0.7.2-0ubuntu2)
--- a/plugins/move.c
-+++ b/plugins/move.c
-@@ -124,6 +124,11 @@ moveInitiate (CompDisplay     *d,
-     xid = getIntOptionNamed (option, nOption, "window", 0);
- 
-     w = findWindowAtDisplay (d, xid);
-+
-+    /* make window stay above fullscreen windows while moving */
-+    if (w)
-+	updateWindowAttributes (w, CompStackingUpdateModeAboveFullscreen);
-+
-     if (w && (w->actions & CompWindowActionMoveMask))
-     {
- 	XRectangle   workArea;
--- a/compiz_get_smclient-id_from_DESKTOP-AUTOSTART-ID.patch
+++ b/compiz_get_smclient-id_from_DESKTOP-AUTOSTART-ID.patch
@ -1,16 +0,0 @@
-diff -upr compiz-0.8.8-orig/src/main.c compiz-0.8.8/src/main.c
--- compiz-0.8.8-orig/src/main.c	2013-05-09 19:35:11.326618000 +0200
-+++ compiz-0.8.8/src/main.c	2013-05-09 19:50:49.446073959 +0200
-@@ -394,6 +394,12 @@ main (int argc, char **argv)
- 	}
-     }
- 
-+    if (!clientId)
-+    {
-+      clientId = getenv ("DESKTOP_AUTOSTART_ID");
-+    }
-+ 
-+
-     if (refreshRateArg)
-     {
- 	ctx.refreshRateData = malloc (strlen (refreshRateArg) + 256);
--- a/compiz_libwnck_to_libmatewnck.patch
+++ b/compiz_libwnck_to_libmatewnck.patch
--- a/compiz_matewnck_corrections.patch
+++ b/compiz_matewnck_corrections.patch
@ -1,404 +0,0 @@
-diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
--- compiz-0.8.8-orig/configure.ac	2013-04-19 10:34:23.593756000 +0200
-+++ compiz-0.8.8/configure.ac	2013-04-19 10:36:57.465302146 +0200
-@@ -243,20 +243,6 @@ if test "x$use_gtk" = "xyes"; then
- 		    pangocairo,
- 		    [use_gtk=yes], [use_gtk=no])
-   if test "x$use_gtk" = "xyes"; then
-    save_CFLAGS="$CFLAGS"
-    save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $GTK_WINDOW_DECORATOR_CFLAGS"
-    LIBS="$LIBS $GTK_WINDOW_DECORATOR_LIBS"
-    AC_CHECK_FUNCS(matewnck_window_has_name)
-    CFLAGS="$save_CFLAGS"
-    LIBS="$save_LIBS"
-
-    PKG_CHECK_EXISTS(libmatewnck-1.0 >= 2.18.1,
-		     [have_libmatewnck_2_18_1=yes], [have_libmatewnck_2_18_1=no])
-
-	PKG_CHECK_EXISTS(libmatewnck-1.0 >= 2.19.4,
-		     [have_libmatewnck_2_19_4=yes], [have_libmatewnck_2_19_4=no])
-
-     if test "x$use_marco" = "xyes"; then
-       PKG_CHECK_MODULES(MARCO, libmarco-private,
- 			[use_marco=yes], [use_marco=no])
-@@ -273,14 +259,6 @@ fi
- AM_CONDITIONAL(USE_GTK, test "x$use_gtk" = "xyes")
- if test "$use_gtk" = yes; then
-   AC_DEFINE(USE_GTK, 1, [Build gtk window decorator])
-  if test "$have_libmatewnck_2_18_1" = yes; then
-    AC_DEFINE(HAVE_LIBMATEWNCK_2_18_1, 1,
-	      [Define to 1 if libmatewnck version >= 2_18_1])
-  fi
-  if test "$have_libmatewnck_2_19_4" = yes; then
-    AC_DEFINE(HAVE_LIBMATEWNCK_2_19_4, 1,
-	      [Define to 1 if libmatewnck version >= 2_19_4])
-  fi
- fi
- 
- AM_CONDITIONAL(USE_MARCO, test "x$use_marco" = "xyes")
-diff -uprN compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c	2013-04-19 10:34:23.596756000 +0200
-+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c	2013-04-19 10:54:42.299020150 +0200
-@@ -36,14 +36,9 @@
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>
- 
-#define MATEWNCK_I_KNOW_THIS_IS_UNSTABLE
- #include <libmatewnck/libmatewnck.h>
- #include <libmatewnck/window-action-menu.h>
- 
-#ifndef HAVE_LIBMATEWNCK_2_19_4
-#define matewnck_window_get_client_window_geometry matewnck_window_get_geometry
-#endif
-
- #include <cairo.h>
- #include <cairo-xlib.h>
- 
-@@ -3068,21 +3056,11 @@ update_event_windows (MatewnckWindow *wi
- 	    MATEWNCK_WINDOW_ACTION_MINIMIZE,
- 	    0,
- 	    MATEWNCK_WINDOW_ACTION_SHADE,
-
-#ifdef HAVE_LIBMATEWNCK_2_18_1
- 	    MATEWNCK_WINDOW_ACTION_ABOVE,
- 	    MATEWNCK_WINDOW_ACTION_STICK,
- 	    MATEWNCK_WINDOW_ACTION_UNSHADE,
- 	    MATEWNCK_WINDOW_ACTION_ABOVE,
- 	    MATEWNCK_WINDOW_ACTION_UNSTICK
-#else
-	    0,
-	    0,
-	    0,
-	    0,
-	    0
-#endif
-
- 	};
- 
- 	if (button_actions[i] && !(actions & button_actions[i]))
-@@ -3106,14 +3084,11 @@ update_event_windows (MatewnckWindow *wi
-     gdk_error_trap_pop ();
- }
- 
-#ifdef HAVE_MATEWNCK_WINDOW_HAS_NAME
- static const char *
-matewnck_window_get_real_name (MatewnckWindow *win)
-+wnck_window_get_real_name (MatewnckWindow *win)
- {
-     return matewnck_window_has_name (win) ? matewnck_window_get_name (win) : NULL;
- }
-#define matewnck_window_get_name matewnck_window_get_real_name
-#endif
- 
- static gint
- max_window_name_width (MatewnckWindow *win)
-@@ -3131,7 +3106,7 @@ max_window_name_width (MatewnckWindow *w
- 	pango_layout_set_wrap (d->layout, PANGO_WRAP_CHAR);
-     }
- 
-    name = matewnck_window_get_name (win);
-+    name = wnck_window_get_real_name (win);
-     if (!name)
- 	return 0;
- 
-@@ -3160,7 +3135,7 @@ update_window_decoration_name (MatewnckW
- 	d->name = NULL;
-     }
- 
-    name = matewnck_window_get_name (win);
-+    name = wnck_window_get_real_name (win);
-     if (name && (name_length = strlen (name)))
-     {
- 	gint w;
-@@ -3603,7 +3578,7 @@ update_switcher_window (MatewnckWindow *
- 	    d->name = NULL;
- 	}
- 
-	name = matewnck_window_get_name (selected_win);
-+	name = wnck_window_get_real_name (selected_win);
- 	if (name && (name_length = strlen (name)))
- 	{
- 	    if (!d->layout)
-@@ -4478,11 +4453,6 @@ action_menu_map (MatewnckWindow *win,
- 	return;
-     case MATEWNCK_WINDOW_NORMAL:
-     case MATEWNCK_WINDOW_DIALOG:
-
-#ifndef HAVE_LIBMATEWNCK_2_19_4
-    case MATEWNCK_WINDOW_MODAL_DIALOG:
-#endif
-
-     case MATEWNCK_WINDOW_TOOLBAR:
-     case MATEWNCK_WINDOW_MENU:
-     case MATEWNCK_WINDOW_UTILITY:
-@@ -4572,11 +4542,6 @@ above_button_event (MatewnckWindow *win,
- 	{
- 	    if (state == BUTTON_EVENT_ACTION_STATE)
- 	    {
-
-#ifdef HAVE_LIBMATEWNCK_2_18_1
-		matewnck_window_make_above (win);
-#endif
-
- 	    }
- 	}
- 	break;
-@@ -4638,11 +4603,7 @@ unabove_button_event (MatewnckWindow *wi
- 	{
- 	    if (state == BUTTON_EVENT_ACTION_STATE)
- 	    {
-
-#ifdef HAVE_LIBMATEWNCK_2_18_1
- 		matewnck_window_unmake_above (win);
-#endif
-
- 	    }
- 	}
- 	break;
-@@ -5006,7 +4967,7 @@ show_force_quit_dialog (MatewnckWindow *
-     if (d->force_quit_dialog)
- 	return;
- 
-    tmp = g_markup_escape_text (matewnck_window_get_name (win), -1);
-+    tmp = g_markup_escape_text (wnck_window_get_real_name (win), -1);
-     str = g_strdup_printf (_("The window \"%s\" is not responding."), tmp);
- 
-     g_free (tmp);
-@@ -6534,139 +6495,6 @@ value_changed (MateConfClient *client,
-     if (changed)
- 	decorations_changed (data);
- }
-
-#elif USE_DBUS_GLIB
-
-static DBusHandlerResult
-dbus_handle_message (DBusConnection *connection,
-		     DBusMessage    *message,
-		     void           *user_data)
-{
-    MatewnckScreen	      *screen = user_data;
-    char	      **path;
-    const char        *interface, *member;
-    DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-    interface = dbus_message_get_interface (message);
-    member    = dbus_message_get_member (message);
-
-    (void) connection;
-
-    if (!interface || !member)
-	return result;
-
-    if (!dbus_message_is_signal (message, interface, member))
-	return result;
-
-    if (strcmp (member, "changed"))
-	return result;
-
-    if (!dbus_message_get_path_decomposed (message, &path))
-	return result;
-
-    if (!path[0] || !path[1] || !path[2] || !path[3] || !path[4] || !path[5])
-    {
-	dbus_free_string_array (path);
-	return result;
-    }
-
-    if (!strcmp (path[0], "org")	 &&
-	!strcmp (path[1], "freedesktop") &&
-	!strcmp (path[2], "compiz")      &&
-	!strcmp (path[3], "decoration")  &&
-	!strcmp (path[4], "allscreens"))
-    {
-	result = DBUS_HANDLER_RESULT_HANDLED;
-
-	if (strcmp (path[5], "shadow_radius") == 0)
-	{
-	    dbus_message_get_args (message, NULL,
-				   DBUS_TYPE_DOUBLE, &shadow_radius,
-				   DBUS_TYPE_INVALID);
-	}
-	else if (strcmp (path[5], "shadow_opacity") == 0)
-	{
-	    dbus_message_get_args (message, NULL,
-				   DBUS_TYPE_DOUBLE, &shadow_opacity,
-				   DBUS_TYPE_INVALID);
-	}
-	else if (strcmp (path[5], "shadow_color") == 0)
-	{
-	    DBusError error;
-	    char      *str;
-
-	    dbus_error_init (&error);
-
-	    dbus_message_get_args (message, &error,
-				   DBUS_TYPE_STRING, &str,
-				   DBUS_TYPE_INVALID);
-
-	    if (!dbus_error_is_set (&error))
-	    {
-		int c[4];
-
-		if (sscanf (str, "#%2x%2x%2x%2x",
-			    &c[0], &c[1], &c[2], &c[3]) == 4)
-		{
-		    shadow_color[0] = c[0] << 8 | c[0];
-		    shadow_color[1] = c[1] << 8 | c[1];
-		    shadow_color[2] = c[2] << 8 | c[2];
-		}
-	    }
-
-	    dbus_error_free (&error);
-	}
-	else if (strcmp (path[5], "shadow_x_offset") == 0)
-	{
-	    dbus_message_get_args (message, NULL,
-				   DBUS_TYPE_INT32, &shadow_offset_x,
-				   DBUS_TYPE_INVALID);
-	}
-	else if (strcmp (path[5], "shadow_y_offset") == 0)
-	{
-	    dbus_message_get_args (message, NULL,
-				   DBUS_TYPE_INT32, &shadow_offset_y,
-				   DBUS_TYPE_INVALID);
-	}
-
-	decorations_changed (screen);
-    }
-
-    dbus_free_string_array (path);
-
-    return result;
-}
-
-static DBusMessage *
-send_and_block_for_shadow_option_reply (DBusConnection *connection,
-					char	       *path)
-{
-    DBusMessage *message;
-
-    message = dbus_message_new_method_call (NULL,
-					    path,
-					    DBUS_INTERFACE,
-					    DBUS_METHOD_GET);
-    if (message)
-    {
-	DBusMessage *reply;
-	DBusError   error;
-
-	dbus_message_set_destination (message, DBUS_DEST);
-
-	dbus_error_init (&error);
-	reply = dbus_connection_send_with_reply_and_block (connection,
-							   message, -1,
-							   &error);
-	dbus_message_unref (message);
-
-	if (!dbus_error_is_set (&error))
-	    return reply;
-    }
-
-    return NULL;
-}
-
- #endif
- 
- static gboolean
-@@ -6708,96 +6536,6 @@ init_settings (MatewnckScreen *screen)
- 		      screen);
- 
-     cursor_theme_changed(mateconf);
-
-#elif USE_DBUS_GLIB
-    DBusConnection *connection;
-    DBusMessage	   *reply;
-    DBusError	   error;
-
-    dbus_error_init (&error);
-
-    connection = dbus_bus_get (DBUS_BUS_SESSION, &error);
-    if (!dbus_error_is_set (&error))
-    {
-	dbus_bus_add_match (connection, "type='signal'", &error);
-
-	dbus_connection_add_filter (connection,
-				    dbus_handle_message,
-				    screen, NULL);
-
-	dbus_connection_setup_with_g_main (connection, NULL);
-    }
-
-    reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
-						    "/shadow_radius");
-    if (reply)
-    {
-	dbus_message_get_args (reply, NULL,
-			       DBUS_TYPE_DOUBLE, &shadow_radius,
-			       DBUS_TYPE_INVALID);
-
-	dbus_message_unref (reply);
-    }
-
-    reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
-						    "/shadow_opacity");
-    if (reply)
-    {
-	dbus_message_get_args (reply, NULL,
-			       DBUS_TYPE_DOUBLE, &shadow_opacity,
-			       DBUS_TYPE_INVALID);
-	dbus_message_unref (reply);
-    }
-
-    reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
-						    "/shadow_color");
-    if (reply)
-    {
-	DBusError error;
-	char      *str;
-
-	dbus_error_init (&error);
-
-	dbus_message_get_args (reply, &error,
-			       DBUS_TYPE_STRING, &str,
-			       DBUS_TYPE_INVALID);
-
-	if (!dbus_error_is_set (&error))
-	{
-	    int c[4];
-
-	    if (sscanf (str, "#%2x%2x%2x%2x", &c[0], &c[1], &c[2], &c[3]) == 4)
-	    {
-		shadow_color[0] = c[0] << 8 | c[0];
-		shadow_color[1] = c[1] << 8 | c[1];
-		shadow_color[2] = c[2] << 8 | c[2];
-	    }
-	}
-
-	dbus_error_free (&error);
-
-	dbus_message_unref (reply);
-    }
-
-    reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
-						    "/shadow_x_offset");
-    if (reply)
-    {
-	dbus_message_get_args (reply, NULL,
-			       DBUS_TYPE_INT32, &shadow_offset_x,
-			       DBUS_TYPE_INVALID);
-	dbus_message_unref (reply);
-    }
-
-    reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
-						    "/shadow_y_offset");
-    if (reply)
-    {
-	dbus_message_get_args (reply, NULL,
-			       DBUS_TYPE_INT32, &shadow_offset_y,
-			       DBUS_TYPE_INVALID);
-	dbus_message_unref (reply);
-    }
- #endif
- 
-     style_window = gtk_window_new (GTK_WINDOW_POPUP);
--- a/compiz_new_add-cursor-theme-support.patch
+++ b/compiz_new_add-cursor-theme-support.patch
@ -1,257 +0,0 @@
-Author: Sebastien Bacher <seb128@canonical.com>
-Description: add cursor theme and size support
-Origin: vendor, ubuntu (1:0.3.6-1ubuntu4)
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/86184
-
-Author: Jasmine Hassan <jasmine.aura@gmail.com>
-Description: Updated to migrate to Mate Desktop
-Origin: <other>, build for LMDE/Debian Testing
-Last-Updated: 2012-10-09
-
--- a/configure.ac
-+++ b/configure.ac
-@@ -125,6 +125,7 @@ COMPIZ_REQUIRES="x11        \
- 		 xdamage    \
- 		 xrandr	    \
- 		 xinerama   \
-+		 xcursor    \
- 		 ice	    \
- 		 sm	    \
- 		 libxml-2.0 \
-@@ -301,6 +302,7 @@ AC_ARG_ENABLE(mate-keybindings,
- if test "x$use_gtk" = "xyes"; then
-   PKG_CHECK_MODULES(GTK_WINDOW_DECORATOR,
- 		    xrender >= 0.8.4  \
-+		    xcursor \
- 		    gtk+-2.0 >= 2.8.0 \
- 		    libwnck-1.0	      \
- 		    pangocairo,
--- a/gtk/window-decorator/gtk-window-decorator.c
-+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -30,6 +30,7 @@
- #include <X11/cursorfont.h>
- #include <X11/extensions/Xrender.h>
- #include <X11/Xregion.h>
-+#include <X11/Xcursor/Xcursor.h>
- 
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
-@@ -75,6 +76,14 @@
- #include <marco-private/theme.h>
- #endif
- 
-+#define MATE_MOUSE_DIR "/desktop/mate/peripherals/mouse"
-+
-+#define MATE_CURSOR_THEME_KEY		\
-+    MATE_MOUSE_DIR "/cursor_theme"
-+
-+#define MATE_CURSOR_SIZE_KEY		\
-+    MATE_MOUSE_DIR "/cursor_size"
-+
- #define MARCO_MATECONF_DIR "/apps/marco/general"
- 
- #define COMPIZ_USE_SYSTEM_FONT_KEY		    \
-@@ -138,6 +147,13 @@
- #define WHEEL_ACTION_KEY   \
-     MATECONF_DIR "/mouse_wheel_action"
- 
-+#define COMPIZ_MATECONF_DIR2 "/apps/compiz/general/allscreens/options"
-+#define COMPIZ_CURSOR_THEME_KEY          \
-+    COMPIZ_MATECONF_DIR2 "/cursor_theme"
-+
-+#define COMPIZ_CURSOR_SIZE_KEY           \
-+    COMPIZ_MATECONF_DIR2 "/cursor_size"
-+
- #define DBUS_DEST       "org.freedesktop.compiz"
- #define DBUS_PATH       "/org/freedesktop/compiz/decoration/allscreens"
- #define DBUS_INTERFACE  "org.freedesktop.compiz"
-@@ -6462,6 +6478,44 @@ button_layout_changed (MateConfClient *c
- }
- 
- static void
-+cursor_theme_changed (MateConfClient *client)
-+{
-+    gchar *theme;
-+    gint size;
-+
-+    theme = mateconf_client_get_string(client, MATE_CURSOR_THEME_KEY, NULL);
-+    size = mateconf_client_get_int(client, MATE_CURSOR_SIZE_KEY, NULL);
-+
-+    mateconf_client_set_string(client, COMPIZ_CURSOR_THEME_KEY, theme, NULL);
-+
-+    mateconf_client_set_int(client, COMPIZ_CURSOR_SIZE_KEY, size, NULL);
-+
-+    if (theme && strlen(theme))
-+    {
-+	gint i, j;
-+	GdkDisplay *gdkdisplay = gdk_display_get_default ();
-+	Display *xdisplay   = gdk_x11_display_get_xdisplay (gdkdisplay);
-+
-+
-+	XcursorSetTheme (xdisplay, theme);
-+	XcursorSetDefaultSize (xdisplay, size);
-+
-+	for (i = 0; i < 3; i++)
-+	{
-+	    for (j = 0; j < 3; j++)
-+	    {
-+		if (cursor[i][j].shape != XC_left_ptr)
-+		{
-+		    XFreeCursor (xdisplay, cursor[i][j].cursor);
-+		    cursor[i][j].cursor =
-+			XCreateFontCursor (xdisplay, cursor[i][j].shape);
-+		}
-+	    }
-+	}
-+    }
-+}
-+
-+static void
- value_changed (MateConfClient *client,
- 	       const gchar *key,
- 	       MateConfValue  *value,
-@@ -6539,6 +6593,11 @@ value_changed (MateConfClient *client,
- 	if (theme_opacity_changed (client))
- 	    changed = TRUE;
-     }
-+    else if (strcmp (key, MATE_CURSOR_THEME_KEY) == 0 ||
-+	     strcmp (key, MATE_CURSOR_SIZE_KEY) == 0)
-+    {
-+	cursor_theme_changed (client);
-+    }
- 
-     if (changed)
- 	decorations_changed (data);
-@@ -6702,6 +6761,11 @@ init_settings (WnckScreen *screen)
- 			  NULL);
- 
-     mateconf_client_add_dir (mateconf,
-+			  MATE_MOUSE_DIR,
-+			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-+			  NULL);
-+
-+    mateconf_client_add_dir (mateconf,
- 			  COMPIZ_MATECONF_DIR1,
- 			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
- 			  NULL);
-@@ -6710,6 +6774,9 @@ init_settings (WnckScreen *screen)
- 		      "value_changed",
- 		      G_CALLBACK (value_changed),
- 		      screen);
-+
-+    cursor_theme_changed(mateconf);
-+
- #elif USE_DBUS_GLIB
-     DBusConnection *connection;
-     DBusMessage	   *reply;
--- a/metadata/core.xml.in.in
-+++ b/metadata/core.xml.in.in
-@@ -35,6 +35,18 @@
- 		<min>0</min>
- 		<max>10000</max>
- 	    </option>
-+	    <option name="cursor_theme" type="string">
-+		<_short>Cursor theme</_short>
-+		<_long>Cursor theme name</_long>
-+		<default></default>
-+	    </option>
-+	    <option name="cursor_size" type="int">
-+		<_short>Cursor size</_short>
-+		<_long>Size of the cursor</_long>
-+		<default>18</default>
-+		<min>8</min>
-+		<max>128</max>
-+	    </option>
- 	    <option name="ping_delay" type="int">
- 		<_short>Ping Delay</_short>
- 		<_long>Interval between ping messages</_long>
--- a/src/display.c
-+++ b/src/display.c
-@@ -41,6 +41,8 @@
- #include <X11/extensions/Xcomposite.h>
- #include <X11/extensions/Xrandr.h>
- #include <X11/extensions/shape.h>
-+#include <X11/Xcursor/Xcursor.h>
-+#include <X11/cursorfont.h>
- 
- #include <compiz-core.h>
- 
-@@ -474,6 +476,32 @@ shade (CompDisplay     *d,
-     return TRUE;
- }
- 
-+static void
-+compDisplaySetCursorTheme (CompDisplay *display)
-+{
-+    char *theme = display->opt[COMP_DISPLAY_OPTION_CURSOR_THEME].value.s;
-+    int size = display->opt[COMP_DISPLAY_OPTION_CURSOR_SIZE].value.i;
-+
-+    if (theme && strlen(theme))
-+    {
-+	CompScreen *s;
-+
-+	XcursorSetTheme (display->display, theme);
-+	XcursorSetDefaultSize (display->display, size);
-+	for (s = display->screens; s; s = s->next)
-+	{
-+	    XFreeCursor (display->display, s->normalCursor);
-+	    s->busyCursor = XCreateFontCursor (display->display, XC_watch);
-+	    XFlush (display->display);
-+
-+	    XFreeCursor (display->display, s->normalCursor);
-+	    s->normalCursor = XCreateFontCursor (display->display, XC_left_ptr);
-+	    XDefineCursor (display->display, s->root, s->normalCursor);
-+	    XFlush (display->display);
-+	}
-+    }
-+}
-+
- const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = {
-     { "abi", "int", 0, 0, 0 },
-     { "active_plugins", "list", "<type>string</type>", 0, 0 },
-@@ -510,7 +538,9 @@ const CompMetadataOptionInfo coreDisplay
-     { "toggle_window_shaded_key", "key", 0, shade, 0 },
-     { "ignore_hints_when_maximized", "bool", 0, 0, 0 },
-     { "ping_delay", "int", "<min>1000</min>", 0, 0 },
-    { "edge_delay", "int", "<min>0</min>", 0, 0 }
-+    { "edge_delay", "int", "<min>0</min>", 0, 0 },
-+    { "cursor_theme", "string", 0, 0, 0 },
-+    { "cursor_size", "int", 0, 0, 0 }
- };
- 
- CompOption *
-@@ -661,6 +691,20 @@ setDisplayOption (CompPlugin	  *plugin,
- 	    return TRUE;
- 	}
- 	break;
-+    case COMP_DISPLAY_OPTION_CURSOR_THEME:
-+	if (compSetStringOption(o, value))
-+	{
-+	    compDisplaySetCursorTheme(display);
-+	    return TRUE;
-+	}
-+	break;
-+    case COMP_DISPLAY_OPTION_CURSOR_SIZE:
-+	if (compSetIntOption(o, value))
-+	{
-+	    compDisplaySetCursorTheme(display);
-+	    return TRUE;
-+	}
-+	break;
-     default:
- 	if (compSetDisplayOption (display, o, value))
- 	    return TRUE;
--- a/include/compiz-core.h
-+++ b/include/compiz-core.h
-@@ -776,7 +776,10 @@ removeFileWatch (CompFileWatchHandle han
- #define COMP_DISPLAY_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED      31
- #define COMP_DISPLAY_OPTION_PING_DELAY			     32
- #define COMP_DISPLAY_OPTION_EDGE_DELAY                       33
-#define COMP_DISPLAY_OPTION_NUM				     34
-+#define COMP_DISPLAY_OPTION_CURSOR_THEME                     34
-+#define COMP_DISPLAY_OPTION_CURSOR_SIZE                      35
-+#define COMP_DISPLAY_OPTION_NUM				     36
-+
- 
- typedef void (*HandleEventProc) (CompDisplay *display,
- 				 XEvent	     *event);
--- a/compiz_new_mate.patch
+++ b/compiz_new_mate.patch
--- a/compiz_optional-fbo.patch
+++ b/compiz_optional-fbo.patch
@ -1,55 +0,0 @@
-Author: David Nusinow <dnusinow@debian.org>
-Description: Add a command-line option for disabling the use of FBOs
-  This is to work around buggy drivers. Add the --no-fbo option to
-  command-line to compiz.
-Origin: vendor, debian (0.3.6-1)
--- a/include/compiz-core.h
-+++ b/include/compiz-core.h
-@@ -219,6 +219,7 @@ extern Bool       useCow;
- extern Bool       noDetection;
- extern Bool	  useDesktopHints;
- extern Bool       onlyCurrentScreen;
-+extern Bool       noFBO;
- 
- extern char	**initialPlugins;
- extern int 	nInitialPlugins;
--- a/src/main.c
-+++ b/src/main.c
-@@ -66,6 +66,7 @@ Bool strictBinding = TRUE;
- Bool noDetection = FALSE;
- Bool useDesktopHints = FALSE;
- Bool onlyCurrentScreen = FALSE;
-+Bool noFBO = FALSE;
- static Bool debugOutput = FALSE;
- 
- #ifdef USE_COW
-@@ -87,6 +88,7 @@ usage (void)
- 	    "[--keep-desktop-hints] "
- 	    "[--loose-binding] "
- 	    "[--replace]\n       "
-+	    "[--no-fbo] "
- 	    "[--sm-disable] "
- 	    "[--sm-client-id ID] "
- 	    "[--only-current-screen]\n      "
-@@ -346,6 +348,10 @@ main (int argc, char **argv)
- 	{
- 	    onlyCurrentScreen = TRUE;
- 	}
-+	else if (!strcmp (argv[i], "--no-fbo"))
-+	{
-+		noFBO = TRUE;
-+	}
- 
- #ifdef USE_COW
- 	else if (!strcmp (argv[i], "--use-root-window"))
--- a/src/screen.c
-+++ b/src/screen.c
-@@ -2183,7 +2183,7 @@ addScreen (CompDisplay *display,
-     s->generateMipmap         = NULL;
- 
-     s->fbo = 0;
-    if (strstr (glExtensions, "GL_EXT_framebuffer_object"))
-+    if (!noFBO && strstr (glExtensions, "GL_EXT_framebuffer_object"))
-     {
- 	s->genFramebuffers = (GLGenFramebuffersProc)
- 	    getProcAddress (s, "glGenFramebuffersEXT");
--- a/compiz_primary-is-control.patch
+++ b/compiz_primary-is-control.patch
@ -1,162 +0,0 @@
-diff -upr compiz-0.8.8-orig/metadata/core.xml.in compiz-0.8.8/metadata/core.xml.in
--- compiz-0.8.8-orig/metadata/core.xml.in	2011-03-30 11:41:22.000000000 +0200
-+++ compiz-0.8.8/metadata/core.xml.in	2013-02-10 22:26:48.439117129 +0100
-@@ -108,7 +108,7 @@
- 		<option name="raise_window_button" type="button">
- 		    <_short>Raise Window</_short>
- 		    <_long>Raise window above other windows</_long>
-		    <default>&lt;Control&gt;Button6</default>
-+		    <default>&lt;Primary&gt;Button6</default>
- 		</option>
- 		<option name="lower_window_key" type="key">
- 		    <_short>Lower Window</_short>
-@@ -159,7 +159,7 @@
- 		<option name="show_desktop_key" type="key">
- 		    <_short>Show Desktop</_short>
- 		    <_long>Hide all windows and focus desktop</_long>
-		    <default>&lt;Control&gt;&lt;Alt&gt;d</default>
-+		    <default>&lt;Primary&gt;&lt;Alt&gt;d</default>
- 		</option>
- 		<option name="show_desktop_edge" type="edge">
- 		    <_short>Show Desktop</_short>
-@@ -185,7 +185,7 @@
- 		<option name="toggle_window_shaded_key" type="key">
- 		    <_short>Toggle Window Shaded</_short>
- 		    <_long>Toggle active window shaded</_long>
-		    <default>&lt;Control&gt;&lt;Alt&gt;s</default>
-+		    <default>&lt;Primary&gt;&lt;Alt&gt;s</default>
- 		</option>
- 		<option name="slow_animations_key" type="key">
- 		    <_short>Slow Animations</_short>
-diff -upr compiz-0.8.8-orig/metadata/core.xml.in.in compiz-0.8.8/metadata/core.xml.in.in
--- compiz-0.8.8-orig/metadata/core.xml.in.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/metadata/core.xml.in.in	2013-02-10 23:22:41.956567990 +0100
-@@ -108,7 +120,7 @@
- 		<option name="raise_window_button" type="button">
- 		    <_short>Raise Window</_short>
- 		    <_long>Raise window above other windows</_long>
-		    <default>&lt;Control&gt;Button6</default>
-+		    <default>&lt;Primary&gt;Button6</default>
- 		</option>
- 		<option name="lower_window_key" type="key">
- 		    <_short>Lower Window</_short>
-@@ -159,7 +171,7 @@
- 		<option name="show_desktop_key" type="key">
- 		    <_short>Show Desktop</_short>
- 		    <_long>Hide all windows and focus desktop</_long>
-		    <default>&lt;Control&gt;&lt;Alt&gt;d</default>
-+		    <default>&lt;Primary&gt;&lt;Alt&gt;d</default>
- 		</option>
- 		<option name="show_desktop_edge" type="edge">
- 		    <_short>Show Desktop</_short>
-@@ -185,7 +197,7 @@
- 		<option name="toggle_window_shaded_key" type="key">
- 		    <_short>Toggle Window Shaded</_short>
- 		    <_long>Toggle active window shaded</_long>
-		    <default>&lt;Control&gt;&lt;Alt&gt;s</default>
-+		    <default>&lt;Primary&gt;&lt;Alt&gt;s</default>
- 		</option>
- 		<option name="slow_animations_key" type="key">
- 		    <_short>Slow Animations</_short>
-diff -upr compiz-0.8.8-orig/metadata/cube.xml.in compiz-0.8.8/metadata/cube.xml.in
--- compiz-0.8.8-orig/metadata/cube.xml.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/metadata/cube.xml.in	2013-02-10 22:27:17.001397970 +0100
-@@ -16,7 +16,7 @@
- 	    <option name="unfold_key" type="key">
- 		<_short>Unfold</_short>
- 		<_long>Unfold cube</_long>
-		<default>&lt;Control&gt;&lt;Alt&gt;Down</default>
-+		<default>&lt;Primary&gt;&lt;Alt&gt;Down</default>
- 	    </option>
- 	    <option name="next_slide_key" type="key">
- 		<_short>Next Slide</_short>
-diff -upr compiz-0.8.8-orig/metadata/rotate.xml.in compiz-0.8.8/metadata/rotate.xml.in
--- compiz-0.8.8-orig/metadata/rotate.xml.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/metadata/rotate.xml.in	2013-02-10 22:30:15.244159968 +0100
-@@ -46,12 +46,12 @@
- 		    <option name="initiate_button" type="button">
- 			<_short>Initiate</_short>
- 			<_long>Start Rotation</_long>
-			<default>&lt;Control&gt;&lt;Alt&gt;Button1</default>
-+			<default>&lt;Primary&gt;&lt;Alt&gt;Button1</default>
- 		    </option>
- 		    <option name="rotate_left_key" type="key">
- 			<_short>Rotate Left</_short>
- 			<_long>Rotate left</_long>
-			<default>&lt;Control&gt;&lt;Alt&gt;Left</default>
-+			<default>&lt;Primary&gt;&lt;Alt&gt;Left</default>
- 		    </option>
- 		    <option name="rotate_left_button" type="button">
- 			<_short>Rotate Left</_short>
-@@ -60,7 +60,7 @@
- 		    <option name="rotate_right_key" type="key">
- 			<_short>Rotate Right</_short>
- 			<_long>Rotate right</_long>
-			<default>&lt;Control&gt;&lt;Alt&gt;Right</default>
-+			<default>&lt;Primary&gt;&lt;Alt&gt;Right</default>
- 		    </option>
- 		    <option name="rotate_right_button" type="button">
- 			<_short>Rotate Right</_short>
-@@ -69,7 +69,7 @@
- 		    <option name="rotate_left_window_key" type="key">
- 			<_short>Rotate Left with Window</_short>
- 			<_long>Rotate left and bring active window along</_long>
-			<default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Left</default>
-+			<default>&lt;Primary&gt;&lt;Alt&gt;&lt;Shift&gt;Left</default>
- 		    </option>
- 		    <option name="rotate_left_window_button" type="button">
- 			<_short>Rotate Left with Window</_short>
-@@ -78,7 +78,7 @@
- 		    <option name="rotate_right_window_key" type="key">
- 			<_short>Rotate Right with Window</_short>
- 			<_long>Rotate right and bring active window along</_long>
-			<default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Right</default>
-+			<default>&lt;Primary&gt;&lt;Alt&gt;&lt;Shift&gt;Right</default>
- 		    </option>
- 		    <option name="rotate_right_window_button" type="button">
- 			<_short>Rotate Right with Window</_short>
-diff -upr compiz-0.8.8-orig/metadata/switcher.xml.in compiz-0.8.8/metadata/switcher.xml.in
--- compiz-0.8.8-orig/metadata/switcher.xml.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/metadata/switcher.xml.in	2013-02-10 22:31:03.864642625 +0100
-@@ -31,7 +31,7 @@
- 		<option name="next_all_key" type="key">
- 		    <_short>Next window (All windows)</_short>
- 		    <_long>Popup switcher if not visible and select next window out of all windows</_long>
-		    <default>&lt;Control&gt;&lt;Alt&gt;Tab</default>
-+		    <default>&lt;Primary&gt;&lt;Alt&gt;Tab</default>
- 		</option>
- 		<option name="prev_all_button" type="button">
- 		    <_short>Prev window (All windows)</_short>
-@@ -40,7 +40,7 @@
- 		<option name="prev_all_key" type="key">
- 		    <_short>Prev window (All windows)</_short>
- 		    <_long>Popup switcher if not visible and select previous window out of all windows</_long>
-		    <default>&lt;Shift&gt;&lt;Control&gt;&lt;Alt&gt;Tab</default>
-+		    <default>&lt;Shift&gt;&lt;Primary&gt;&lt;Alt&gt;Tab</default>
- 		</option>
- 		<option name="next_no_popup_button" type="button">
- 		    <_short>Next window (No popup)</_short>
-diff -upr compiz-0.8.8-orig/metadata/water.xml.in compiz-0.8.8/metadata/water.xml.in
--- compiz-0.8.8-orig/metadata/water.xml.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/metadata/water.xml.in	2013-02-10 22:31:20.369806613 +0100
-@@ -13,7 +13,7 @@
- 	    <option name="initiate_key" type="key">
- 		<_short>Initiate</_short>
- 		<_long>Enable pointer water effects</_long>
-		<default>&lt;Control&gt;&lt;Super&gt;</default>
-+		<default>&lt;Primary&gt;&lt;Super&gt;</default>
- 	    </option>
- 	    <option name="toggle_rain_key" type="key">
- 		<_short>Toggle rain</_short>
-diff -upr compiz-0.8.8-orig/src/option.c compiz-0.8.8/src/option.c
--- compiz-0.8.8-orig/src/option.c	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/src/option.c	2013-02-10 17:54:28.257428457 +0100
-@@ -36,7 +36,7 @@ struct _Modifier {
-     int  modifier;
- } modifiers[] = {
-     { "<Shift>",      ShiftMask		 },
-    { "<Control>",    ControlMask	 },
-+    { "<Primary>",    ControlMask	 },
-     { "<Mod1>",	      Mod1Mask		 },
-     { "<Mod2>",	      Mod2Mask		 },
-     { "<Mod3>",	      Mod3Mask		 },
--- a/compiz_redhat-logo.patch
+++ b/compiz_redhat-logo.patch
@ -1,25 +0,0 @@
-diff -upr compiz-0.8.8-orig/metadata/cube.xml.in compiz-0.8.8/metadata/cube.xml.in
--- compiz-0.8.8-orig/metadata/cube.xml.in	2010-05-21 13:18:14.000000000 +0200
-+++ compiz-0.8.8/metadata/cube.xml.in	2012-05-16 12:13:09.000000000 +0200
-@@ -92,9 +92,9 @@
- 		    <_short>Cube Color</_short>
- 		    <_long>Color of top and bottom sides of the cube</_long>
- 		    <default>
-			<red>0xfefe</red>
-			<green>0xffff</green>
-			<blue>0xc7c7</blue>
-+			<red>0x8888</red>
-+			<green>0x0000</green>
-+			<blue>0x0000</blue>
- 		    </default>
- 		</option>
- 		<subgroup>
-@@ -110,7 +110,7 @@
- 			<type>string</type>
- 			<hints>file;image;</hints>
- 			<default>
-			    <value>freedesktop</value>
-+			    <value>/usr/share/pixmaps/redhat/shadowman-transparent</value>
- 			</default>
- 		    </option>
- 		    <option name="adjust_image" type="bool">
--- a/compiz_removal_gconf.patch
+++ b/compiz_removal_gconf.patch
@ -1,570 +0,0 @@
-diff -upr compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c	2013-05-25 13:46:27.717322000 +0200
-+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c	2013-05-25 13:53:44.084731952 +0200
-@@ -5607,82 +5607,6 @@ get_titlebar_font (void)
- 	return titlebar_font;
- }
- 
-#ifdef USE_MATECONF
-static void
-titlebar_font_changed (MateConfClient *client)
-{
-    gchar *str;
-
-    str = mateconf_client_get_string (client,
-				   COMPIZ_TITLEBAR_FONT_KEY,
-				   NULL);
-    if (!str)
-	str = g_strdup ("Sans Bold 12");
-
-    if (titlebar_font)
-	pango_font_description_free (titlebar_font);
-
-    titlebar_font = pango_font_description_from_string (str);
-
-    g_free (str);
-}
-
-static void
-titlebar_click_action_changed (MateConfClient *client,
-			       const gchar *key,
-			       int         *action_value,
-			       int          default_value)
-{
-    gchar *action;
-
-    *action_value = default_value;
-
-    action = mateconf_client_get_string (client, key, NULL);
-    if (action)
-    {
-	if (strcmp (action, "toggle_shade") == 0)
-	    *action_value = CLICK_ACTION_SHADE;
-	else if (strcmp (action, "toggle_maximize") == 0)
-	    *action_value = CLICK_ACTION_MAXIMIZE;
-	else if (strcmp (action, "toggle_maximize_horizontally") == 0)
-	    *action_value = CLICK_ACTION_MAXIMIZE_HORZ;
-	else if (strcmp (action, "toggle_maximize_vertically") == 0)
-	    *action_value = CLICK_ACTION_MAXIMIZE_VERT;
-	else if (strcmp (action, "minimize") == 0)
-	    *action_value = CLICK_ACTION_MINIMIZE;
-	else if (strcmp (action, "raise") == 0)
-	    *action_value = CLICK_ACTION_RAISE;
-	else if (strcmp (action, "lower") == 0)
-	    *action_value = CLICK_ACTION_LOWER;
-	else if (strcmp (action, "menu") == 0)
-	    *action_value = CLICK_ACTION_MENU;
-	else if (strcmp (action, "none") == 0)
-	    *action_value = CLICK_ACTION_NONE;
-
-	g_free (action);
-    }
-}
-
-static void
-wheel_action_changed (MateConfClient *client)
-{
-    gchar *action;
-
-    wheel_action = WHEEL_ACTION_DEFAULT;
-
-    action = mateconf_client_get_string (client, WHEEL_ACTION_KEY, NULL);
-    if (action)
-    {
-	if (strcmp (action, "shade") == 0)
-	    wheel_action = WHEEL_ACTION_SHADE;
-	else if (strcmp (action, "none") == 0)
-	    wheel_action = WHEEL_ACTION_NONE;
-
-	g_free (action);
-    }
-}
-#endif
-
- #ifdef USE_MARCO
- static MetaButtonFunction
- meta_button_function_from_string (const char *str)
-@@ -6039,401 +5963,6 @@ style_changed (GtkWidget *widget)
-     decorations_changed (screen);
- }
- 
-#ifdef USE_MATECONF
-static gboolean
-shadow_settings_changed (MateConfClient *client)
-{
-    double   radius, opacity;
-    int      offset;
-    gchar    *color;
-    gboolean changed = FALSE;
-
-    radius = mateconf_client_get_float (client,
-				     COMPIZ_SHADOW_RADIUS_KEY,
-				     NULL);
-    radius = MAX (0.0, MIN (radius, 48.0));
-    if (shadow_radius != radius)
-    {
-	shadow_radius = radius;
-	changed = TRUE;
-    }
-
-    opacity = mateconf_client_get_float (client,
-				      COMPIZ_SHADOW_OPACITY_KEY,
-				      NULL);
-    opacity = MAX (0.0, MIN (opacity, 6.0));
-    if (shadow_opacity != opacity)
-    {
-	shadow_opacity = opacity;
-	changed = TRUE;
-    }
-
-    color = mateconf_client_get_string (client,
-				     COMPIZ_SHADOW_COLOR_KEY,
-				     NULL);
-    if (color)
-    {
-	int c[4];
-
-	if (sscanf (color, "#%2x%2x%2x%2x", &c[0], &c[1], &c[2], &c[3]) == 4)
-	{
-	    shadow_color[0] = c[0] << 8 | c[0];
-	    shadow_color[1] = c[1] << 8 | c[1];
-	    shadow_color[2] = c[2] << 8 | c[2];
-	    changed = TRUE;
-	}
-
-	g_free (color);
-    }
-
-    offset = mateconf_client_get_int (client,
-				   COMPIZ_SHADOW_OFFSET_X_KEY,
-				   NULL);
-    offset = MAX (-16, MIN (offset, 16));
-    if (shadow_offset_x != offset)
-    {
-	shadow_offset_x = offset;
-	changed = TRUE;
-    }
-
-    offset = mateconf_client_get_int (client,
-				   COMPIZ_SHADOW_OFFSET_Y_KEY,
-				   NULL);
-    offset = MAX (-16, MIN (offset, 16));
-    if (shadow_offset_y != offset)
-    {
-	shadow_offset_y = offset;
-	changed = TRUE;
-    }
-
-    return changed;
-}
-
-static gboolean
-blur_settings_changed (MateConfClient *client)
-{
-    gchar *type;
-    int   new_type = blur_type;
-
-    if (cmdline_options & CMDLINE_BLUR)
-	return FALSE;
-
-    type = mateconf_client_get_string (client,
-				    BLUR_TYPE_KEY,
-				    NULL);
-
-    if (type)
-    {
-	if (strcmp (type, "titlebar") == 0)
-	    new_type = BLUR_TYPE_TITLEBAR;
-	else if (strcmp (type, "all") == 0)
-	    new_type = BLUR_TYPE_ALL;
-	else if (strcmp (type, "none") == 0)
-	    new_type = BLUR_TYPE_NONE;
-
-	g_free (type);
-    }
-
-    if (new_type != blur_type)
-    {
-	blur_type = new_type;
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-static gboolean
-theme_changed (MateConfClient *client)
-{
-
-#ifdef USE_MARCO
-    gboolean use_meta_theme;
-
-    if (cmdline_options & CMDLINE_THEME)
-	return FALSE;
-
-    use_meta_theme = mateconf_client_get_bool (client,
-					    USE_META_THEME_KEY,
-					    NULL);
-
-    if (use_meta_theme)
-    {
-	gchar *theme;
-
-	theme = mateconf_client_get_string (client,
-					 META_THEME_KEY,
-					 NULL);
-
-	if (theme)
-	{
-	    meta_theme_set_current (theme, TRUE);
-	    if (!meta_theme_get_current ())
-		use_meta_theme = FALSE;
-
-	    g_free (theme);
-	}
-	else
-	{
-	    use_meta_theme = FALSE;
-	}
-    }
-
-    if (use_meta_theme)
-    {
-	theme_draw_window_decoration	= meta_draw_window_decoration;
-	theme_calc_decoration_size	= meta_calc_decoration_size;
-	theme_update_border_extents	= meta_update_border_extents;
-	theme_get_event_window_position = meta_get_event_window_position;
-	theme_get_button_position	= meta_get_button_position;
-    }
-    else
-    {
-	theme_draw_window_decoration	= draw_window_decoration;
-	theme_calc_decoration_size	= calc_decoration_size;
-	theme_update_border_extents	= update_border_extents;
-	theme_get_event_window_position = get_event_window_position;
-	theme_get_button_position	= get_button_position;
-    }
-
-    return TRUE;
-#else
-    theme_draw_window_decoration    = draw_window_decoration;
-    theme_calc_decoration_size	    = calc_decoration_size;
-    theme_update_border_extents	    = update_border_extents;
-    theme_get_event_window_position = get_event_window_position;
-    theme_get_button_position	    = get_button_position;
-
-    return FALSE;
-#endif
-
-}
-
-static gboolean
-theme_opacity_changed (MateConfClient *client)
-{
-
-#ifdef USE_MARCO
-    gboolean shade_opacity, changed = FALSE;
-    gdouble  opacity;
-
-    opacity = mateconf_client_get_float (client,
-				      META_THEME_OPACITY_KEY,
-				      NULL);
-
-    if (!(cmdline_options & CMDLINE_OPACITY) &&
-	opacity != meta_opacity)
-    {
-	meta_opacity = opacity;
-	changed = TRUE;
-    }
-
-    if (opacity < 1.0)
-    {
-	shade_opacity = mateconf_client_get_bool (client,
-					       META_THEME_SHADE_OPACITY_KEY,
-					       NULL);
-
-	if (!(cmdline_options & CMDLINE_OPACITY_SHADE) &&
-	    shade_opacity != meta_shade_opacity)
-	{
-	    meta_shade_opacity = shade_opacity;
-	    changed = TRUE;
-	}
-    }
-
-    opacity = mateconf_client_get_float (client,
-				      META_THEME_ACTIVE_OPACITY_KEY,
-				      NULL);
-
-    if (!(cmdline_options & CMDLINE_ACTIVE_OPACITY) &&
-	opacity != meta_active_opacity)
-    {
-	meta_active_opacity = opacity;
-	changed = TRUE;
-    }
-
-    if (opacity < 1.0)
-    {
-	shade_opacity =
-	    mateconf_client_get_bool (client,
-				   META_THEME_ACTIVE_SHADE_OPACITY_KEY,
-				   NULL);
-
-	if (!(cmdline_options & CMDLINE_ACTIVE_OPACITY_SHADE) &&
-	    shade_opacity != meta_active_shade_opacity)
-	{
-	    meta_active_shade_opacity = shade_opacity;
-	    changed = TRUE;
-	}
-    }
-
-    return changed;
-#else
-    return FALSE;
-#endif
-
-}
-
-static gboolean
-button_layout_changed (MateConfClient *client)
-{
-
-#ifdef USE_MARCO
-    gchar *button_layout;
-
-    button_layout = mateconf_client_get_string (client,
-					     META_BUTTON_LAYOUT_KEY,
-					     NULL);
-
-    if (button_layout)
-    {
-	meta_update_button_layout (button_layout);
-
-	meta_button_layout_set = TRUE;
-
-	g_free (button_layout);
-
-	return TRUE;
-    }
-
-    if (meta_button_layout_set)
-    {
-	meta_button_layout_set = FALSE;
-	return TRUE;
-    }
-#endif
-
-    return FALSE;
-}
-
-static void
-cursor_theme_changed (MateConfClient *client)
-{
-    gchar *theme;
-    gint size;
-
-    theme = mateconf_client_get_string(client, MATE_CURSOR_THEME_KEY, NULL);
-    size = mateconf_client_get_int(client, MATE_CURSOR_SIZE_KEY, NULL);
-
-    mateconf_client_set_string(client, COMPIZ_CURSOR_THEME_KEY, theme, NULL);
-
-    mateconf_client_set_int(client, COMPIZ_CURSOR_SIZE_KEY, size, NULL);
-
-    if (theme && strlen(theme))
-    {
-	gint i, j;
-	GdkDisplay *gdkdisplay = gdk_display_get_default ();
-	Display *xdisplay   = gdk_x11_display_get_xdisplay (gdkdisplay);
-
-
-	XcursorSetTheme (xdisplay, theme);
-	XcursorSetDefaultSize (xdisplay, size);
-
-	for (i = 0; i < 3; i++)
-	{
-	    for (j = 0; j < 3; j++)
-	    {
-		if (cursor[i][j].shape != XC_left_ptr)
-		{
-		    XFreeCursor (xdisplay, cursor[i][j].cursor);
-		    cursor[i][j].cursor =
-			XCreateFontCursor (xdisplay, cursor[i][j].shape);
-		}
-	    }
-	}
-    }
-}
-
-static void
-value_changed (MateConfClient *client,
-	       const gchar *key,
-	       MateConfValue  *value,
-	       void        *data)
-{
-    gboolean changed = FALSE;
-
-    if (strcmp (key, COMPIZ_USE_SYSTEM_FONT_KEY) == 0)
-    {
-	if (mateconf_client_get_bool (client,
-				   COMPIZ_USE_SYSTEM_FONT_KEY,
-				   NULL) != use_system_font)
-	{
-	    use_system_font = !use_system_font;
-	    changed = TRUE;
-	}
-    }
-    else if (strcmp (key, COMPIZ_TITLEBAR_FONT_KEY) == 0)
-    {
-	titlebar_font_changed (client);
-	changed = !use_system_font;
-    }
-    else if (strcmp (key, COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY) == 0)
-    {
-	titlebar_click_action_changed (client, key,
-				       &double_click_action,
-				       DOUBLE_CLICK_ACTION_DEFAULT);
-    }
-    else if (strcmp (key, COMPIZ_MIDDLE_CLICK_TITLEBAR_KEY) == 0)
-    {
-	titlebar_click_action_changed (client, key,
-				       &middle_click_action,
-				       MIDDLE_CLICK_ACTION_DEFAULT);
-    }
-    else if (strcmp (key, COMPIZ_RIGHT_CLICK_TITLEBAR_KEY) == 0)
-    {
-	titlebar_click_action_changed (client, key,
-				       &right_click_action,
-				       RIGHT_CLICK_ACTION_DEFAULT);
-    }
-    else if (strcmp (key, WHEEL_ACTION_KEY) == 0)
-    {
-	wheel_action_changed (client);
-    }
-    else if (strcmp (key, COMPIZ_SHADOW_RADIUS_KEY)   == 0 ||
-	     strcmp (key, COMPIZ_SHADOW_OPACITY_KEY)  == 0 ||
-	     strcmp (key, COMPIZ_SHADOW_OFFSET_X_KEY) == 0 ||
-	     strcmp (key, COMPIZ_SHADOW_OFFSET_Y_KEY) == 0 ||
-	     strcmp (key, COMPIZ_SHADOW_COLOR_KEY) == 0)
-    {
-	if (shadow_settings_changed (client))
-	    changed = TRUE;
-    }
-    else if (strcmp (key, BLUR_TYPE_KEY) == 0)
-    {
-	if (blur_settings_changed (client))
-	    changed = TRUE;
-    }
-    else if (strcmp (key, USE_META_THEME_KEY) == 0 ||
-	     strcmp (key, META_THEME_KEY) == 0)
-    {
-	if (theme_changed (client))
-	    changed = TRUE;
-    }
-    else if (strcmp (key, META_BUTTON_LAYOUT_KEY) == 0)
-    {
-	if (button_layout_changed (client))
-	    changed = TRUE;
-    }
-    else if (strcmp (key, META_THEME_OPACITY_KEY)	       == 0 ||
-	     strcmp (key, META_THEME_SHADE_OPACITY_KEY)	       == 0 ||
-	     strcmp (key, META_THEME_ACTIVE_OPACITY_KEY)       == 0 ||
-	     strcmp (key, META_THEME_ACTIVE_SHADE_OPACITY_KEY) == 0)
-    {
-	if (theme_opacity_changed (client))
-	    changed = TRUE;
-    }
-    else if (strcmp (key, MATE_CURSOR_THEME_KEY) == 0 ||
-	     strcmp (key, MATE_CURSOR_SIZE_KEY) == 0)
-    {
-	cursor_theme_changed (client);
-    }
-
-    if (changed)
-	decorations_changed (data);
-}
-#endif
-
- static gboolean
- init_settings (MatewnckScreen *screen)
- {
-@@ -6442,39 +5971,6 @@ init_settings (MatewnckScreen *screen)
-     GdkColormap	   *colormap;
-     AtkObject	   *switcher_label_obj;
- 
-#ifdef USE_MATECONF
-    MateConfClient	   *mateconf;
-
-    mateconf = mateconf_client_get_default ();
-
-    mateconf_client_add_dir (mateconf,
-			  MATECONF_DIR,
-			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-			  NULL);
-
-    mateconf_client_add_dir (mateconf,
-			  MARCO_MATECONF_DIR,
-			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-			  NULL);
-
-    mateconf_client_add_dir (mateconf,
-			  MATE_MOUSE_DIR,
-			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-			  NULL);
-
-    mateconf_client_add_dir (mateconf,
-			  COMPIZ_MATECONF_DIR1,
-			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-			  NULL);
-
-    g_signal_connect (G_OBJECT (mateconf),
-		      "value_changed",
-		      G_CALLBACK (value_changed),
-		      screen);
-
-    cursor_theme_changed(mateconf);
-#endif
-
-     style_window = gtk_window_new (GTK_WINDOW_POPUP);
- 
-     gdkscreen = gdk_display_get_default_screen (gdk_display_get_default ());
-@@ -6504,41 +6000,10 @@ init_settings (MatewnckScreen *screen)
- 
-     pango_context = gtk_widget_create_pango_context (style_window);
- 
-#ifdef USE_MATECONF
-    use_system_font = mateconf_client_get_bool (mateconf,
-					     COMPIZ_USE_SYSTEM_FONT_KEY,
-					     NULL);
-    theme_changed (mateconf);
-    theme_opacity_changed (mateconf);
-    button_layout_changed (mateconf);
-#endif
-
-     update_style (style_window);
- 
-#ifdef USE_MATECONF
-    titlebar_font_changed (mateconf);
-#endif
-
-     update_titlebar_font ();
- 
-#ifdef USE_MATECONF
-    titlebar_click_action_changed (mateconf,
-				   COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
-				   &double_click_action,
-				   DOUBLE_CLICK_ACTION_DEFAULT);
-    titlebar_click_action_changed (mateconf,
-				   COMPIZ_MIDDLE_CLICK_TITLEBAR_KEY,
-				   &middle_click_action,
-				   MIDDLE_CLICK_ACTION_DEFAULT);
-    titlebar_click_action_changed (mateconf,
-				   COMPIZ_RIGHT_CLICK_TITLEBAR_KEY,
-				   &right_click_action,
-				   RIGHT_CLICK_ACTION_DEFAULT);
-    wheel_action_changed (mateconf);
-    shadow_settings_changed (mateconf);
-    blur_settings_changed (mateconf);
-#endif
-
-     (*theme_update_border_extents) (text_height);
- 
-     update_shadow ();
--- a/compiz_remove_kde.patch
+++ b/compiz_remove_kde.patch
--- a/compiz_remove_keybindings_and_mate-windows-settings_files.patch
+++ b/compiz_remove_keybindings_and_mate-windows-settings_files.patch
@ -1,779 +0,0 @@
-diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in
--- compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in	2013-04-18 16:34:54.580781000 +0200
-+++ compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
-
-	<KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_key"/>
-
-	<KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/main_menu_key"/>
-
-	<KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_screenshot_key"/>
-
-	<KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_window_screenshot_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
-
-	<KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_terminal_key"/>
-
-</KeyListEntries>
-diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-key.xml.in
--- compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in	2013-04-18 16:34:54.580781000 +0200
-+++ compiz-0.8.8/gtk/mate/50-compiz-key.xml.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries _name="Window Management" wm_name="compiz" package="compiz">
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/close_window_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/raise_window_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/lower_window_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/maximize_window_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/unmaximize_window_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_horizontally_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_vertically_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_shaded_key"/>
-
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/window_menu_key"/>
-
-	<KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
-</KeyListEntries>
-diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c
--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c	2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,559 +0,0 @@
-/*
- * Copyright © 2005 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <davidr@novell.com>
- */
-
-#include <config.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <mateconf/mateconf-client.h>
-#include <glib/gi18n.h>
-
-#include "compiz-window-manager.h"
-
-#define COMPIZ_CLICK_TO_FOCUS_KEY			     \
-    "/apps/compiz/general/allscreens/options/click_to_focus"
-
-#define COMPIZ_AUTORAISE_KEY				\
-    "/apps/compiz/general/allscreens/options/autoraise"
-
-#define COMPIZ_AUTORAISE_DELAY_KEY			      \
-    "/apps/compiz/general/allscreens/options/autoraise_delay"
-
-#define COMPIZ_MOUSE_MOVE_KEY				 \
-    "/apps/compiz/plugins/move/allscreens/options/initiate_button"
-
-#define MATECONF_DIR "/apps/marco/general"
-
-#define COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY      \
-    MATECONF_DIR "/action_double_click_titlebar"
-
-#define COMPIZ_USE_SYSTEM_FONT_KEY         \
-    MATECONF_DIR "/titlebar_uses_system_font"
-
-#define COMPIZ_TITLEBAR_FONT_KEY \
-    MATECONF_DIR "/titlebar_font"
-
-#define COMPIZ_THEME_KEY \
-    MATECONF_DIR "/theme"
-
-enum {
-    DOUBLE_CLICK_NONE,
-    DOUBLE_CLICK_SHADE,
-    DOUBLE_CLICK_MAXIMIZE,
-    DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY,
-    DOUBLE_CLICK_MAXIMIZE_VERTICALLY,
-    DOUBLE_CLICK_MINIMIZE,
-    DOUBLE_CLICK_RAISE,
-    DOUBLE_CLICK_LOWER,
-    DOUBLE_CLICK_MENU
-};
-
-static const struct {
-    unsigned int action;
-    const char   *value;
-} double_click_actions [] = {
-    { DOUBLE_CLICK_NONE,                  "none" },
-    { DOUBLE_CLICK_SHADE,                 "toggle_shade" },
-    { DOUBLE_CLICK_MAXIMIZE,              "toggle_maximize" },
-    { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, "toggle_maximize_horizontally" },
-    { DOUBLE_CLICK_MAXIMIZE_VERTICALLY,   "toggle_maximize_vertically" },
-    { DOUBLE_CLICK_MINIMIZE,              "minimize" },
-    { DOUBLE_CLICK_RAISE,                 "raise" },
-    { DOUBLE_CLICK_LOWER,                 "lower" },
-    { DOUBLE_CLICK_MENU,                  "menu" }
-};
-
-static MateWindowManagerClass *parent_class;
-
-struct _CompizWindowManagerPrivate {
-    MateConfClient *mateconf;
-    gchar	*font;
-    gchar	*theme;
-    gchar	*mouse_modifier;
-};
-
-static void
-value_changed (MateConfClient *client,
-	       const gchar *key,
-	       MateConfValue  *value,
-	       void        *data)
-{
-    CompizWindowManager *wm;
-
-    wm = COMPIZ_WINDOW_MANAGER (data);
-
-    mate_window_manager_settings_changed (MATE_WINDOW_MANAGER (wm));
-}
-
-/* this function is called when the shared lib is loaded */
-GObject *
-window_manager_new (int expected_interface_version)
-{
-    GObject *wm;
-
-    if (expected_interface_version != MATE_WINDOW_MANAGER_INTERFACE_VERSION)
-    {
-	g_warning ("Compiz window manager module wasn't compiled with the "
-		   "current version of mate-control-center");
-	return NULL;
-    }
-
-    wm = g_object_new (compiz_window_manager_get_type (), NULL);
-
-    return wm;
-}
-
-static void
-compiz_change_settings (MateWindowManager    *wm,
-			const MateWMSettings *settings)
-{
-    CompizWindowManager *cwm;
-
-    cwm = COMPIZ_WINDOW_MANAGER (wm);
-
-    if (settings->flags & MATE_WM_SETTING_FONT)
-	mateconf_client_set_string (cwm->p->mateconf,
-				 COMPIZ_TITLEBAR_FONT_KEY,
-				 settings->font, NULL);
-
-    if (settings->flags & MATE_WM_SETTING_MOUSE_FOCUS)
-	mateconf_client_set_bool (cwm->p->mateconf,
-			       COMPIZ_CLICK_TO_FOCUS_KEY,
-			       settings->focus_follows_mouse == FALSE,
-			       NULL);
-
-     if (settings->flags & MATE_WM_SETTING_AUTORAISE)
-	mateconf_client_set_bool (cwm->p->mateconf,
-			       COMPIZ_AUTORAISE_KEY,
-			       settings->autoraise, NULL);
-
-     if (settings->flags & MATE_WM_SETTING_AUTORAISE_DELAY)
-	mateconf_client_set_int (cwm->p->mateconf,
-			      COMPIZ_AUTORAISE_DELAY_KEY,
-			      settings->autoraise_delay, NULL);
-
-    if (settings->flags & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER)
-    {
-	char *value;
-
-	value = g_strdup_printf ("<%s>Button1", settings->mouse_move_modifier);
-	mateconf_client_set_string (cwm->p->mateconf,
-				 COMPIZ_MOUSE_MOVE_KEY,
-				 value, NULL);
-	g_free (value);
-    }
-
-    if (settings->flags & MATE_WM_SETTING_THEME)
-	mateconf_client_set_string (cwm->p->mateconf,
-				 COMPIZ_THEME_KEY,
-				 settings->theme, NULL);
-
-    if (settings->flags & MATE_WM_SETTING_DOUBLE_CLICK_ACTION)
-    {
-	const char   *action = NULL;
-	unsigned int i;
-
-	for (i = 0; i < G_N_ELEMENTS (double_click_actions); i++)
-	{
-	    if (settings->double_click_action ==
-		double_click_actions[i].action)
-	    {
-		action = double_click_actions[i].value;
-		break;
-	    }
-	}
-
-	if (action)
-	    mateconf_client_set_string (cwm->p->mateconf,
-				     COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
-				     action, NULL);
-    }
-}
-
-static void
-compiz_get_settings (MateWindowManager *wm,
-		     MateWMSettings    *settings)
-{
-    CompizWindowManager *cwm;
-    int			to_get;
-
-    cwm = COMPIZ_WINDOW_MANAGER (wm);
-
-    to_get = settings->flags;
-    settings->flags = 0;
-
-    if (to_get & MATE_WM_SETTING_FONT)
-    {
-	char *str;
-
-	str = mateconf_client_get_string (cwm->p->mateconf,
-				       COMPIZ_TITLEBAR_FONT_KEY,
-				       NULL);
-
-	if (!str)
-	    str = g_strdup ("Sans Bold 12");
-
-	if (cwm->p->font)
-	    g_free (cwm->p->font);
-
-	cwm->p->font = str;
-
-	settings->font = cwm->p->font;
-
-	settings->flags |= MATE_WM_SETTING_FONT;
-    }
-
-    if (to_get & MATE_WM_SETTING_MOUSE_FOCUS)
-    {
-	settings->focus_follows_mouse =
-	    mateconf_client_get_bool (cwm->p->mateconf,
-				   COMPIZ_CLICK_TO_FOCUS_KEY, NULL) == FALSE;
-
-	settings->flags |= MATE_WM_SETTING_MOUSE_FOCUS;
-    }
-
-    if (to_get & MATE_WM_SETTING_AUTORAISE)
-    {
-	settings->autoraise = mateconf_client_get_bool (cwm->p->mateconf,
-						     COMPIZ_AUTORAISE_KEY,
-						     NULL);
-
-	settings->flags |= MATE_WM_SETTING_AUTORAISE;
-    }
-
-    if (to_get & MATE_WM_SETTING_AUTORAISE_DELAY)
-    {
-	settings->autoraise_delay =
-	    mateconf_client_get_int (cwm->p->mateconf,
-				  COMPIZ_AUTORAISE_DELAY_KEY,
-				  NULL);
-
-	settings->flags |= MATE_WM_SETTING_AUTORAISE_DELAY;
-    }
-
-    if (to_get & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER)
-    {
-	const char *new;
-	char	   *str;
-
-	str = mateconf_client_get_string (cwm->p->mateconf,
-				       COMPIZ_MOUSE_MOVE_KEY,
-				       NULL);
-
-	if (str == NULL)
-	    str = g_strdup ("<Super>");
-
-	if (strncmp (str, "<Super>", 7) == 0)
-	    new = "Super";
-	else if (strncmp (str, "<Alt>", 5) == 0)
-	    new = "Alt";
-	else if (strncmp (str, "<Meta>", 6) == 0)
-	    new = "Meta";
-	else if (strncmp (str, "<Hyper>", 7) == 0)
-	    new = "Hyper";
-	else if (strncmp (str, "<Control>", 9) == 0)
-	    new = "Control";
-	else
-	    new = NULL;
-
-	if (cwm->p->mouse_modifier)
-	    g_free (cwm->p->mouse_modifier);
-
-	cwm->p->mouse_modifier = g_strdup (new ? new : "");
-
-	g_free (str);
-
-	settings->mouse_move_modifier = cwm->p->mouse_modifier;
-
-	settings->flags |= MATE_WM_SETTING_MOUSE_MOVE_MODIFIER;
-    }
-
-    if (to_get & MATE_WM_SETTING_THEME)
-    {
-	char *str;
-
-	str = mateconf_client_get_string (cwm->p->mateconf,
-				       COMPIZ_THEME_KEY,
-				       NULL);
-
-	if (str == NULL)
-	    str = g_strdup ("Atlanta");
-
-	g_free (cwm->p->theme);
-	cwm->p->theme = str;
-	settings->theme = cwm->p->theme;
-
-	settings->flags |= MATE_WM_SETTING_THEME;
-    }
-
-    if (to_get & MATE_WM_SETTING_DOUBLE_CLICK_ACTION)
-    {
-	char *str;
-
-	settings->double_click_action = DOUBLE_CLICK_MAXIMIZE;
-
-	str = mateconf_client_get_string (cwm->p->mateconf,
-				       COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
-				       NULL);
-
-	if (str)
-	{
-	    unsigned int i;
-
-	    for (i = 0; i < G_N_ELEMENTS (double_click_actions); i++)
-	    {
-		if (strcmp (str, double_click_actions[i].value) == 0)
-		{
-		    settings->double_click_action =
-			double_click_actions[i].action;
-		    break;
-		}
-	    }
-	}
-
-	settings->flags |= MATE_WM_SETTING_DOUBLE_CLICK_ACTION;
-    }
-}
-
-static int
-compiz_get_settings_mask (MateWindowManager *wm)
-{
-    return MATE_WM_SETTING_MASK;
-}
-
-static GList *
-add_themes_from_dir (GList	*current_list,
-		     const char *path)
-{
-    DIR		  *theme_dir;
-    struct dirent *entry;
-    char	  *theme_file_path;
-    GList	  *node;
-    gboolean	  found = FALSE;
-
-    if (!(g_file_test (path, G_FILE_TEST_EXISTS) &&
-	  g_file_test (path, G_FILE_TEST_IS_DIR)))
-    {
-	return current_list;
-    }
-
-    theme_dir = opendir (path);
-
-    /* If this is NULL, then we couldn't open ~/.themes.  The test above
-     * only checks existence, not wether we can really read it.*/
-    if (theme_dir == NULL)
-	return current_list;
-
-    for (entry = readdir (theme_dir); entry; entry = readdir (theme_dir))
-    {
-	theme_file_path =
-	    g_build_filename (path, entry->d_name,
-			      "metacity-1/metacity-theme-1.xml", NULL);
-
-	if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS))
-	{
-
-	    for (node = current_list; node && !found; node = node->next)
-		found = strcmp (node->data, entry->d_name) == 0;
-
-	    if (!found)
-		current_list = g_list_prepend (current_list,
-					       g_strdup (entry->d_name));
-	}
-
-	found = FALSE;
-
-	g_free (theme_file_path);
-    }
-
-    closedir (theme_dir);
-
-    return current_list;
-}
-
-static GList *
-compiz_get_theme_list (MateWindowManager *wm)
-{
-    GList *themes = NULL;
-    char  *home_dir_themes;
-
-    home_dir_themes = g_build_filename (g_get_home_dir (), ".themes", NULL);
-
-    themes = add_themes_from_dir (themes, MARCO_THEME_DIR);
-    themes = add_themes_from_dir (themes, "/usr/share/themes");
-    themes = add_themes_from_dir (themes, home_dir_themes);
-
-    g_free (home_dir_themes);
-
-    return themes;
-}
-
-static char *
-compiz_get_user_theme_folder (MateWindowManager *wm)
-{
-    return g_build_filename (g_get_home_dir (), ".themes", NULL);
-}
-
-static void
-compiz_get_double_click_actions (MateWindowManager             *wm,
-				 const MateWMDoubleClickAction **actions_p,
-				 int                            *n_actions_p)
-{
-    static gboolean initialized = FALSE;
-    static MateWMDoubleClickAction actions[] = {
-	{ DOUBLE_CLICK_NONE,		      N_("None")		  },
-	{ DOUBLE_CLICK_SHADE,		      N_("Shade")		  },
-	{ DOUBLE_CLICK_MAXIMIZE,	      N_("Maximize")		  },
-	{ DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, N_("Maximize Horizontally") },
-	{ DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, N_("Maximize Vertically")   },
-	{ DOUBLE_CLICK_MINIMIZE,	      N_("Minimize")		  },
-	{ DOUBLE_CLICK_RAISE,		      N_("Raise")		  },
-	{ DOUBLE_CLICK_LOWER,		      N_("Lower")		  },
-	{ DOUBLE_CLICK_MENU,		      N_("Window Menu")	          }
-    };
-
-    if (!initialized)
-    {
-	unsigned int i;
-
-	for (i = 0; i < G_N_ELEMENTS (actions); i++)
-	    actions[i].human_readable_name = _(actions[i].human_readable_name);
-
-	initialized = TRUE;
-    }
-
-    *actions_p   = actions;
-    *n_actions_p = (int) G_N_ELEMENTS (actions);
-}
-
-static void
-compiz_window_manager_init (CompizWindowManager	     *cwm,
-			    CompizWindowManagerClass *class)
-{
-    cwm->p		   = g_new0 (CompizWindowManagerPrivate, 1);
-    cwm->p->mateconf	   = mateconf_client_get_default ();
-    cwm->p->mouse_modifier = NULL;
-    cwm->p->font	   = NULL;
-    cwm->p->theme	   = NULL;
-
-    mateconf_client_add_dir (cwm->p->mateconf,
-			  "/apps/compiz",
-			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-			  NULL);
-
-    mateconf_client_add_dir (cwm->p->mateconf,
-			  MATECONF_DIR,
-			  MATECONF_CLIENT_PRELOAD_ONELEVEL,
-			  NULL);
-
-
-    g_signal_connect (G_OBJECT (cwm->p->mateconf),
-		      "value_changed",
-		      G_CALLBACK (value_changed),
-		      cwm);
-}
-
-static void
-compiz_window_manager_finalize (GObject *object)
-{
-    CompizWindowManager *cwm;
-
-    g_return_if_fail (object != NULL);
-    g_return_if_fail (IS_COMPIZ_WINDOW_MANAGER (object));
-
-    cwm = COMPIZ_WINDOW_MANAGER (object);
-
-    g_signal_handlers_disconnect_by_func (G_OBJECT (cwm->p->mateconf),
-					  G_CALLBACK (value_changed),
-					  cwm);
-
-    if (cwm->p->mouse_modifier)
-	g_free (cwm->p->mouse_modifier);
-
-    if (cwm->p->font)
-	g_free (cwm->p->font);
-
-    if (cwm->p->theme)
-	g_free (cwm->p->theme);
-
-    g_object_unref (G_OBJECT (cwm->p->mateconf));
-    g_free (cwm->p);
-
-    G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-compiz_window_manager_class_init (CompizWindowManagerClass *class)
-{
-    GObjectClass	    *object_class;
-    MateWindowManagerClass *wm_class;
-
-    bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-    textdomain (GETTEXT_PACKAGE);
-
-    object_class = G_OBJECT_CLASS (class);
-    wm_class	 = MATE_WINDOW_MANAGER_CLASS (class);
-
-    object_class->finalize = compiz_window_manager_finalize;
-
-    wm_class->change_settings	       = compiz_change_settings;
-    wm_class->get_settings	       = compiz_get_settings;
-    wm_class->get_settings_mask	       = compiz_get_settings_mask;
-    wm_class->get_user_theme_folder    = compiz_get_user_theme_folder;
-    wm_class->get_theme_list	       = compiz_get_theme_list;
-    wm_class->get_double_click_actions = compiz_get_double_click_actions;
-
-    parent_class = g_type_class_peek_parent (class);
-}
-
-GType
-compiz_window_manager_get_type (void)
-{
-    static GType compiz_window_manager_type = 0;
-
-    if (!compiz_window_manager_type)
-    {
-	static GTypeInfo compiz_window_manager_info = {
-	    sizeof (CompizWindowManagerClass),
-	    NULL,
-	    NULL,
-	    (GClassInitFunc) compiz_window_manager_class_init,
-	    NULL,
-	    NULL,
-	    sizeof (CompizWindowManager),
-	    0,
-	    (GInstanceInitFunc) compiz_window_manager_init,
-	    NULL
-	};
-
-	compiz_window_manager_type =
-	    g_type_register_static (mate_window_manager_get_type (),
-				    "CompizWindowManager",
-				    &compiz_window_manager_info, 0);
-    }
-
-    return compiz_window_manager_type;
-}
-diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h compiz-0.8.8/gtk/mate/compiz-window-manager.h
--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h	2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/compiz-window-manager.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,39 +0,0 @@
-#ifndef COMPIZ_WINDOW_MANAGER_H
-#define COMPIZ_WINDOW_MANAGER_H
-
-#include <glib-object.h>
-
-#include "mate-window-manager.h"
-
-#define COMPIZ_WINDOW_MANAGER(obj)					\
-    G_TYPE_CHECK_INSTANCE_CAST (obj, compiz_window_manager_get_type (), \
-				CompizWindowManager)
-
-#define COMPIZ_WINDOW_MANAGER_CLASS(klass)			       \
-    G_TYPE_CHECK_CLASS_CAST (klass, compiz_window_manager_get_type (), \
-			     MarcoWindowManagerClass)
-
-#define IS_COMPIZ_WINDOW_MANAGER(obj)					\
-    G_TYPE_CHECK_INSTANCE_TYPE (obj, compiz_window_manager_get_type ())
-
-
-typedef struct _CompizWindowManager	   CompizWindowManager;
-typedef struct _CompizWindowManagerClass   CompizWindowManagerClass;
-typedef struct _CompizWindowManagerPrivate CompizWindowManagerPrivate;
-
-struct _CompizWindowManager {
-    MateWindowManager	       parent;
-    CompizWindowManagerPrivate *p;
-};
-
-struct _CompizWindowManagerClass {
-    MateWindowManagerClass klass;
-};
-
-GType
-compiz_window_manager_get_type (void);
-
-GObject *
-window_manager_new (int expected_interface_version);
-
-#endif
-diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in compiz-0.8.8/gtk/mate/compiz-wm.desktop.in
--- compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in	2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/compiz-wm.desktop.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-_Name=Compiz
-Exec=compiz
-# name of loadable control center module
-X-MATE-WMSettingsModule=compiz
-# autostart phase
-X-MATE-Autostart-Phase=WindowManager
-X-MATE-Provides=windowmanager
-# name we put on the WM spec check window
-X-MATE-WMName=compiz
-# back compat only 
-X-MateWMSettingsLibrary=compiz
-
-[Window Manager]
-SessionManaged=false
-diff -uprN compiz-0.8.8-orig/gtk/mate/Makefile.am compiz-0.8.8/gtk/mate/Makefile.am
--- compiz-0.8.8-orig/gtk/mate/Makefile.am	2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/Makefile.am	2013-04-18 16:42:02.755120789 +0200
-@@ -1,97 +1,27 @@
-moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
-
-if USE_MATE
-libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
-libcompiz_la_LIBADD  = @MATE_WINDOW_SETTINGS_LIBS@
-libcompiz_la_SOURCES = 		\
-	compiz-window-manager.c	\
-	compiz-window-manager.h
-libcompiz_module     = libcompiz.la
-
- desktopfilesdir	      = $(DESTDIR)$(datadir)/applications
- desktopfiles_in_files = compiz.desktop.in
- desktopfiles_files    = $(desktopfiles_in_files:.desktop.in=.desktop)
- 
-wmpropertiesdir	      = $(DESTDIR)$(windowsettingsdatadir)/mate/wm-properties
-wmproperties_in_files = compiz-wm.desktop.in
-wmproperties_files    = $(wmproperties_in_files:.desktop.in=.desktop)
-
- @INTLTOOL_DESKTOP_RULE@
- 
-if USE_MATE_KEYBINDINGS
-
-xmldir       = $(DESTDIR)$(keybindingsdir)
-xml_in_files = 50-compiz-desktop-key.xml.in 50-compiz-key.xml.in
-xml_files    = $(xml_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-endif
-
-install-exec-local:
-	if mkdir -p $(moduledir) && test -w $(moduledir); then ( \
-		$(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \
-		$(moduledir) \
-		); \
-	fi
-
- install-data-local:
- 	if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \
- 		$(INSTALL) -m 644 $(desktopfiles_files) \
- 		$(desktopfilesdir) \
- 		); \
- 	fi
-	if mkdir -p $(wmpropertiesdir) && test -w $(wmpropertiesdir); then ( \
-		$(INSTALL) -m 644 $(wmproperties_files) \
-		$(wmpropertiesdir) \
-		); \
-	fi
-
-if USE_MATE_KEYBINDINGS
-	if mkdir -p $(xmldir) && test -w $(xmldir); then ( \
-		$(INSTALL) -m 644 $(xml_files) \
-		$(xmldir) \
-		); \
-	fi
-endif
- 
- uninstall-local:
-	if test -w $(moduledir); then ( \
-		rm -f $(moduledir)/libcompiz.* \
-		); \
-	fi
- 	if test -w $(desktopfilesdir); then ( \
- 		rm -f $(desktopfilesdir)/compiz.desktop \
- 		); \
- 	fi
-	if test -w $(wmpropertiesdir); then ( \
-		rm -f $(wmpropertiesdir)/compiz-wm.desktop \
-		); \
-	fi
-if USE_MATE_KEYBINDINGS
-	if test -w $(xmldir); then ( \
-		rm -f $(xmldir)/50-compiz*key.xml \
-		); \
-	fi
-endif
-endif
-
-INCLUDES = @MATE_WINDOW_SETTINGS_CFLAGS@			   \
-	-DMARCO_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
-	-DLOCALEDIR="\"@datadir@/locale"\"
-
-noinst_LTLIBRARIES = \
-	$(libcompiz_module)
- 
- noinst_DATA =		      \
-	$(desktopfiles_files) \
-	$(wmproperties_files) \
-	$(xml_files)
-+	$(desktopfiles_files)
- 
- EXTRA_DIST =			 \
-	$(desktopfiles_in_files) \
-	$(wmproperties_in_files) \
-	$(xml_in_files)
-+	$(desktopfiles_in_files)
- 
- DISTCLEANFILES = \
- 	$(noinst_DATA)
--- a/compiz_remove_mateconf_dbus_glib.patch
+++ b/compiz_remove_mateconf_dbus_glib.patch
--- a/compiz_remove_old_metacity_checks.patch
+++ b/compiz_remove_old_metacity_checks.patch
@ -1,286 +0,0 @@
-diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
--- compiz-0.8.8-orig/configure.ac	2013-04-19 14:12:09.341857000 +0200
-+++ compiz-0.8.8/configure.ac	2013-04-19 14:19:14.618100294 +0200
-@@ -231,7 +231,7 @@ AC_ARG_ENABLE(marco,
-   [use_marco=$enableval], [use_marco=yes])
- 
- AC_ARG_ENABLE(mate,
-  [  --disable-mate         Disable mate settings module],
-+  [  --disable-mate         Disable mate compatibility plugin],
-   [use_mate=$enableval], [use_mate=yes])
- 
- if test "x$use_gtk" = "xyes"; then
-@@ -260,12 +260,6 @@ if test "x$use_gtk" = "xyes"; then
-     if test "x$use_marco" = "xyes"; then
-       PKG_CHECK_MODULES(MARCO, libmarco-private,
- 			[use_marco=yes], [use_marco=no])
-      PKG_CHECK_EXISTS(libmarco-private >= 2.15.21,
-		       [have_marco_2_15_21=yes], [have_marco_2_15_21=no])
-      PKG_CHECK_EXISTS(libmarco-private >= 2.17.0,
-		       [have_marco_2_17_0=yes], [have_marco_2_17_0=no])
-      PKG_CHECK_EXISTS(libmarco-private >= 2.23.2,
-		       [have_marco_2_23_2=yes], [have_marco_2_23_2=no])
-     fi
-   else
-     use_marco="no"
-@@ -292,18 +286,6 @@ fi
- AM_CONDITIONAL(USE_MARCO, test "x$use_marco" = "xyes")
- if test "$use_marco" = yes; then
-   AC_DEFINE(USE_MARCO, 1, [Build marco theme support])
-  if test "$have_marco_2_15_21" = yes; then
-    AC_DEFINE(HAVE_MARCO_2_15_21, 1,
-	      [Define to 1 if marco version >= 2.15.21])
-  fi
-  if test "$have_marco_2_17_0" = yes; then
-    AC_DEFINE(HAVE_MARCO_2_17_0, 1,
-	      [Define to 1 if marco version >= 2.17.0])
-  fi
-  if test "$have_marco_2_23_2" = yes; then
-    AC_DEFINE(HAVE_MARCO_2_23_2, 1,
-	      [Define to 1 if marco version >= 2.23.2])
-  fi
- fi
- 
- AM_CONDITIONAL(USE_MATE, test "x$use_mate" = "xyes")
-diff -uprN compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c	2013-04-19 14:12:09.342857000 +0200
-+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c	2013-04-19 14:28:30.521589122 +0200
-@@ -1327,19 +1327,10 @@ meta_get_corner_radius (const MetaFrameG
- 			int		        *bottom_left_radius,
- 			int			*bottom_right_radius)
- {
-
-#ifdef HAVE_MARCO_2_17_0
-     *top_left_radius     = fgeom->top_left_corner_rounded_radius;
-     *top_right_radius    = fgeom->top_right_corner_rounded_radius;
-     *bottom_left_radius  = fgeom->bottom_left_corner_rounded_radius;
-     *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius;
-#else
-    *top_left_radius     = fgeom->top_left_corner_rounded ? 5 : 0;
-    *top_right_radius    = fgeom->top_right_corner_rounded ? 5 : 0;
-    *bottom_left_radius  = fgeom->bottom_left_corner_rounded ? 5 : 0;
-    *bottom_right_radius = fgeom->bottom_right_corner_rounded ? 5 : 0;
-#endif
-
- }
- 
- static int
-@@ -1548,8 +1539,6 @@ meta_function_to_type (MetaButtonFunctio
- 	return META_BUTTON_TYPE_MAXIMIZE;
-     case META_BUTTON_FUNCTION_CLOSE:
- 	return META_BUTTON_TYPE_CLOSE;
-
-#ifdef HAVE_MARCO_2_17_0
-     case META_BUTTON_FUNCTION_SHADE:
- 	return META_BUTTON_TYPE_SHADE;
-     case META_BUTTON_FUNCTION_ABOVE:
-@@ -1562,7 +1551,6 @@ meta_function_to_type (MetaButtonFunctio
- 	return META_BUTTON_TYPE_UNABOVE;
-     case META_BUTTON_FUNCTION_UNSTICK:
- 	return META_BUTTON_TYPE_UNSTICK;
-#endif
- 
-     default:
- 	break;
-@@ -1606,8 +1594,6 @@ meta_button_state_for_button_type (decor
- 	return meta_button_state (d->button_states[BUTTON_MIN]);
-     case META_BUTTON_TYPE_MENU:
- 	return meta_button_state (d->button_states[BUTTON_MENU]);
-
-#ifdef HAVE_MARCO_2_17_0
-     case META_BUTTON_TYPE_SHADE:
- 	return meta_button_state (d->button_states[BUTTON_SHADE]);
-     case META_BUTTON_TYPE_ABOVE:
-@@ -1620,7 +1606,6 @@ meta_button_state_for_button_type (decor
- 	return meta_button_state (d->button_states[BUTTON_UNABOVE]);
-     case META_BUTTON_TYPE_UNSTICK:
- 	return meta_button_state (d->button_states[BUTTON_UNSTICK]);
-#endif
- 
-     default:
- 	break;
-@@ -1708,10 +1693,8 @@ meta_get_decoration_geometry (decor_t		*
-     if (d->state & WNCK_WINDOW_STATE_SHADED)
- 	*flags |= META_FRAME_SHADED;
- 
-#ifdef HAVE_MARCO_2_17_0
-     if (d->state & WNCK_WINDOW_STATE_ABOVE)
- 	*flags |= META_FRAME_ABOVE;
-#endif
- 
-     meta_theme_get_frame_borders (theme,
- 				  META_FRAME_TYPE_NORMAL,
-@@ -1808,7 +1791,6 @@ meta_draw_window_decoration (decor_t *d)
-     bg_color = style->bg[GTK_STATE_NORMAL];
-     bg_alpha = 1.0;
- 
-#ifdef HAVE_MARCO_2_17_0
-     if (frame_style->window_background_color)
-     {
- 	meta_color_spec_render (frame_style->window_background_color,
-@@ -1817,7 +1799,6 @@ meta_draw_window_decoration (decor_t *d)
- 
- 	bg_alpha = frame_style->window_background_alpha / 255.0;
-     }
-#endif
- 
-     cairo_destroy (cr);
- 
-@@ -2844,12 +2825,7 @@ meta_get_button_position (decor_t *d,
-     MetaFrameFlags    flags;
-     MetaTheme	      *theme;
-     GdkRectangle      clip;
-
-#ifdef HAVE_MARCO_2_15_21
-     MetaButtonSpace   *space;
-#else
-    GdkRectangle      *space;
-#endif
- 
-     if (!d->context)
-     {
-@@ -2890,7 +2866,6 @@ meta_get_button_position (decor_t *d,
- 	space = &fgeom.close_rect;
- 	break;
- 
-#if defined (HAVE_MARCO_2_17_0) && defined (HAVE_LIBWNCK_2_18_1)
-     case BUTTON_SHADE:
- 	if (!meta_button_present (&button_layout, META_BUTTON_FUNCTION_SHADE))
- 	    return FALSE;
-@@ -2927,13 +2902,11 @@ meta_get_button_position (decor_t *d,
- 
- 	space = &fgeom.unstick_rect;
- 	break;
-#endif
- 
-     default:
- 	return FALSE;
-     }
- 
-#ifdef HAVE_MARCO_2_15_21
-     if (!space->clickable.width && !space->clickable.height)
- 	return FALSE;
- 
-@@ -2941,15 +2914,6 @@ meta_get_button_position (decor_t *d,
-     *y = space->clickable.y;
-     *w = space->clickable.width;
-     *h = space->clickable.height;
-#else
-    if (!space->width && !space->height)
-	return FALSE;
-
-    *x = space->x;
-    *y = space->y;
-    *w = space->width;
-    *h = space->height;
-#endif
- 
-     return TRUE;
- }
-@@ -5763,8 +5727,6 @@ meta_button_function_from_string (const
- 	return META_BUTTON_FUNCTION_MAXIMIZE;
-     else if (strcmp (str, "close") == 0)
- 	return META_BUTTON_FUNCTION_CLOSE;
-
-#ifdef HAVE_MARCO_2_17_0
-     else if (strcmp (str, "shade") == 0)
- 	return META_BUTTON_FUNCTION_SHADE;
-     else if (strcmp (str, "above") == 0)
-@@ -5777,8 +5739,6 @@ meta_button_function_from_string (const
- 	return META_BUTTON_FUNCTION_UNABOVE;
-     else if (strcmp (str, "unstick") == 0)
- 	return META_BUTTON_FUNCTION_UNSTICK;
-#endif
-
-     else
- 	return META_BUTTON_FUNCTION_LAST;
- }
-@@ -5788,7 +5748,6 @@ meta_button_opposite_function (MetaButto
- {
-     switch (ofwhat)
-     {
-#ifdef HAVE_MARCO_2_17_0
-     case META_BUTTON_FUNCTION_SHADE:
- 	return META_BUTTON_FUNCTION_UNSHADE;
-     case META_BUTTON_FUNCTION_UNSHADE:
-@@ -5803,7 +5762,6 @@ meta_button_opposite_function (MetaButto
- 	return META_BUTTON_FUNCTION_UNSTICK;
-     case META_BUTTON_FUNCTION_UNSTICK:
- 	return META_BUTTON_FUNCTION_STICK;
-#endif
- 
-     default:
- 	return META_BUTTON_FUNCTION_LAST;
-@@ -5819,10 +5777,8 @@ meta_initialize_button_layout (MetaButto
-     {
- 	layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
- 	layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
-#ifdef HAVE_MARCO_2_23_2
- 	layout->left_buttons_has_spacer[i] = FALSE;
- 	layout->right_buttons_has_spacer[i] = FALSE;
-#endif
-     }
- }
- 
-@@ -5853,7 +5809,6 @@ meta_update_button_layout (const char *v
- 	while (buttons[b] != NULL)
- 	{
- 	    f = meta_button_function_from_string (buttons[b]);
-#ifdef HAVE_MARCO_2_23_2
- 	    if (i > 0 && strcmp("spacer", buttons[b]) == 0)
-             {
- 	       new_layout.left_buttons_has_spacer[i - 1] = TRUE;
-@@ -5863,7 +5818,6 @@ meta_update_button_layout (const char *v
-                   new_layout.left_buttons_has_spacer[i - 2] = TRUE;
-             }
- 	    else
-#endif
- 	    {
- 	       if (f != META_BUTTON_FUNCTION_LAST && !used[f])
- 	       {
-@@ -5900,7 +5854,6 @@ meta_update_button_layout (const char *v
- 	    while (buttons[b] != NULL)
- 	    {
- 	       f = meta_button_function_from_string (buttons[b]);
-#ifdef HAVE_MARCO_2_23_2
- 	       if (i > 0 && strcmp("spacer", buttons[b]) == 0)
- 	       {
- 		  new_layout.right_buttons_has_spacer[i - 1] = TRUE;
-@@ -5909,7 +5862,6 @@ meta_update_button_layout (const char *v
- 		     new_layout.right_buttons_has_spacer[i - 2] = TRUE;
- 	       }
- 	       else
-#endif
- 	       {
- 		   if (f != META_BUTTON_FUNCTION_LAST && !used[f])
- 		   {
-@@ -5953,14 +5905,12 @@ meta_update_button_layout (const char *v
- 	for (j = 0; j < i; j++)
- 	{
- 	    rtl_layout.right_buttons[j] = new_layout.left_buttons[i - j - 1];
-#ifdef HAVE_MARCO_2_23_2
- 	    if (j == 0)
- 		rtl_layout.right_buttons_has_spacer[i - 1] =
- 		    new_layout.left_buttons_has_spacer[i - j - 1];
- 	    else
- 		rtl_layout.right_buttons_has_spacer[j - 1] =
- 		    new_layout.left_buttons_has_spacer[i - j - 1];
-#endif
- 	}
- 
- 	i = 0;
-@@ -5970,14 +5920,12 @@ meta_update_button_layout (const char *v
- 	for (j = 0; j < i; j++)
- 	{
- 	    rtl_layout.left_buttons[j] = new_layout.right_buttons[i - j - 1];
-#ifdef HAVE_MARCO_2_23_2
- 	    if (j == 0)
- 		rtl_layout.left_buttons_has_spacer[i - 1] =
- 		    new_layout.right_buttons_has_spacer[i - j - 1];
- 	    else
- 		rtl_layout.left_buttons_has_spacer[j - 1] =
- 		    new_layout.right_buttons_has_spacer[i - j - 1];
-#endif
- 	}
- 
- 	new_layout = rtl_layout;
--- a/compiz_stacking.patch
+++ b/compiz_stacking.patch
@ -1,16 +0,0 @@
-Author: Michael Vogt <michael.vogt@ubuntu.com>
-Description: map windows with focus_on_map=FALSE in the background 
- map windows with focus_on_map=FALSE in the background (just like metacity)
-Origin: vendor, ubuntu (1:0.8.2-0ubuntu6)
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/333284
--- a/src/event.c
-+++ b/src/event.c
-@@ -2075,7 +2075,7 @@ handleEvent (CompDisplay *d,
- 		focus = allowWindowFocus (w, NO_FOCUS_MASK,
- 					  w->screen->x, w->screen->y, 0);
- 
-		if (focus == CompFocusDenied)
-+		if ((focus == CompFocusDenied || focus == CompFocusPrevent) && (w->type & ~NO_FOCUS_MASK))
- 		    stackingMode = CompStackingUpdateModeInitialMapDeniedFocus;
- 		else
- 		    stackingMode = CompStackingUpdateModeInitialMap;
--- a/emerald-decorator.desktop
+++ b/emerald-decorator.desktop
@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Emerald Decorator
-Comment=switch to Emerald windows-decorator if compiz is running
-TryExec=compiz-decorator-emerald
-Exec=compiz-decorator-emerald
-Icon=emerald-decorator
-NoDisplay=false
-StartupNotify=true
-Categories=Utility;
-OnlyShowIn=MATE;
-Name[de_DE]=Emerald Decorator
-X-Desktop-File-Install-Version=0.21
--- a/emerald-decorator.svg
+++ b/emerald-decorator.svg
@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg7791"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="drawing-3.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs7793">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3811"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="radialGradient3809"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6395458,-3.1274409e-8,4.5258909e-8,2.3726765,10.88246,-16.619703)"
-       cx="-17.015919"
-       cy="11.77772"
-       fx="-17.015919"
-       fy="11.77772"
-       r="3.6158471" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3807"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3799"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3240">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3242" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3244" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240"
-       id="linearGradient3795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-33.587572,4.065864)"
-       x1="7.5625"
-       y1="3.15625"
-       x2="18.875"
-       y2="19.5625" />
-    <filter
-       inkscape:collect="always"
-       x="-0.1311318"
-       width="1.2622637"
-       y="-0.13487843"
-       height="1.2697568"
-       id="filter3718">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.29504654"
-         id="feGaussianBlur3720" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3314"
-       id="radialGradient3324"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9722222,0,0.2447917)"
-       cx="12.75"
-       cy="8.8125"
-       fx="12.75"
-       fy="8.8125"
-       r="2.25" />
-    <filter
-       inkscape:collect="always"
-       x="-0.31996158"
-       width="1.6399232"
-       y="-0.32910335"
-       height="1.6582067"
-       id="filter3630">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.71991356"
-         id="feGaussianBlur3632" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3314">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3316" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3318" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3314"
-       id="radialGradient3320"
-       cx="12.75"
-       cy="8.8125"
-       fx="12.75"
-       fy="8.8125"
-       r="2.25"
-       gradientTransform="matrix(1,0,0,0.9722222,0,0.2447917)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3187">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3189" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3191" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3187"
-       id="linearGradient3283"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4221371,0,0,1.4221682,22.714903,22.483659)"
-       x1="-4.4592619"
-       y1="-3.721009"
-       x2="12.767767"
-       y2="18.097141" />
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#488906;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#5daa11;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="linearGradient3281"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3742513,0,0,1.4221682,9.7737523,20.095301)"
-       x1="17.875"
-       y1="22.5625"
-       x2="4.625"
-       y2="-1.8125" />
-    <linearGradient
-       id="linearGradient3161">
-      <stop
-         style="stop-color:#4f9707;stop-opacity:1;"
-         offset="0"
-         id="stop3163" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1;"
-         offset="1"
-         id="stop3165" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3161"
-       id="linearGradient3279"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3742513,0,0,1.4221682,9.7737523,20.095301)"
-       x1="17.875"
-       y1="22.5625"
-       x2="4.625"
-       y2="-1.8125" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3293">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3295" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3297" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="radialGradient3299"
-       cx="10.606602"
-       cy="18.950602"
-       fx="10.606602"
-       fy="18.950602"
-       r="10.429825"
-       gradientTransform="matrix(1,0,0,0.2669491,0,13.891755)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="641"
-     inkscape:window-height="690"
-     inkscape:window-x="115"
-     inkscape:window-y="248" />
-  <metadata
-     id="metadata7796">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.75531915;fill:url(#radialGradient3299);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3290"
-       sodipodi:cx="10.606602"
-       sodipodi:cy="18.950602"
-       sodipodi:rx="10.429825"
-       sodipodi:ry="2.7842329"
-       d="M 21.036427,18.950602 A 10.429825,2.7842329 0 1 1 0.17677689,18.950602 A 10.429825,2.7842329 0 1 1 21.036427,18.950602 z"
-       transform="matrix(2.3010933,0,0,3.1244044,-0.4067801,-19.908412)" />
-    <g
-       id="g3275"
-       transform="matrix(1.5522785,0,0,1.5522884,-13.951499,-32.495236)">
-      <path
-         id="path2188"
-         d="M 9.9455343,48.894208 L 19.479402,24.628463 L 24.632844,21.695239 L 30.21574,24.717348 L 37.774123,34.050326 L 38.804811,43.205534 L 35.626854,47.294268 L 9.9455343,48.894208 z"
-         style="fill:url(#linearGradient3279);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3281);stroke-width:0.64424914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path3181"
-         d="M 10.731182,48.294672 L 20.011621,25.10665 L 24.656574,22.395271 L 29.755931,25.156134 L 37.261241,34.183671 L 38.16024,42.916666 L 35.224254,46.640699 L 10.731182,48.294672 z"
-         style="opacity:0.84042556;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3283);stroke-width:0.64424914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.84042556;fill:url(#radialGradient3320);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3630)"
-       id="path3301"
-       sodipodi:cx="12.75"
-       sodipodi:cy="8.8125"
-       sodipodi:rx="2.25"
-       sodipodi:ry="2.1875"
-       d="M 15,8.8125 A 2.25,2.1875 0 1 1 10.5,8.8125 A 2.25,2.1875 0 1 1 15,8.8125 z"
-       transform="matrix(2.2075528,0,0,2.2076152,-0.8278331,-4.4002501)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.57978725;fill:url(#radialGradient3324);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3718)"
-       id="path3322"
-       sodipodi:cx="12.75"
-       sodipodi:cy="8.8125"
-       sodipodi:rx="2.25"
-       sodipodi:ry="2.1875"
-       d="M 15,8.8125 A 2.25,2.1875 0 1 1 10.5,8.8125 A 2.25,2.1875 0 1 1 15,8.8125 z"
-       transform="matrix(2.2075528,0,0,2.2076152,-12.760384,3.6052247)" />
-    <g
-       id="g3775"
-       transform="matrix(2.2075528,0,0,2.2076152,73.549138,-9.8479227)">
-      <path
-         id="path3777"
-         d="M -32.17521,23.688909 L -25.914629,14.469984 L -26.596011,9.5378354 L -32.17521,23.688909 z"
-         style="opacity:1;fill:url(#linearGradient3795);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cccc" />
-      <path
-         id="path3779"
-         d="M -30.833848,22.913148 L -25.720919,15.412824 L -21.88658,20.739874 L -30.833848,22.913148 z"
-         style="opacity:0.59042556;fill:url(#linearGradient3797);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cccc" />
-      <path
-         id="path3781"
-         d="M -32.3965,23.907818 L -21.307737,21.134775 L -18.868822,23.012584 L -32.3965,23.907818 z"
-         style="opacity:1;fill:url(#linearGradient3799);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cccc" />
-      <path
-         id="path3783"
-         d="M -17.150072,22.780344 L -20.628048,20.940864 L -17.734411,16.81446 L -15.268763,17.905442 L -15.962572,22.597114 L -17.150072,22.780344 z"
-         style="opacity:0.71276592;fill:url(#linearGradient3801);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         id="path3785"
-         d="M -21.166765,20.372149 L -25.253048,15.076879 L -21.056322,12.065864 L -18.400072,16.628364 L -21.166765,20.372149 z"
-         style="opacity:0.55319148;fill:url(#linearGradient3803);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3787"
-         d="M -25.283419,14.188821 L -21.272512,11.309649 L -20.791531,7.9911612 L -26.429536,8.3403691 L -25.283419,14.188821 z"
-         style="opacity:0.87765958;fill:url(#linearGradient3805);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path3789"
-         d="M -26.113934,7.7689837 L -23.86029,6.253364 L -22.267797,5.252932 L -19.531471,6.753364 L -18.595614,7.3685606 L -20.470155,7.315864 L -26.113934,7.7689837 z"
-         style="opacity:1;fill:url(#linearGradient3807);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path3791"
-         d="M -18.030929,8.2207465 L -14.354265,12.495698 L -14.32408,14.115578 L -15.275072,16.998002 L -17.835786,15.995527 L -20.482262,11.318339 L -20.23846,8.0161299 L -18.030929,8.2207465 z"
-         style="opacity:0.73999999;fill:url(#radialGradient3809);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3793"
-         d="M -13.40779,13.69214 L -13.150072,20.065864 L -15.380528,22.793834 L -14.625568,17.41141 L -13.40779,13.69214 z"
-         style="opacity:0.79787239;fill:url(#linearGradient3811);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
--- a/gtk-decorator.desktop
+++ b/gtk-decorator.desktop
@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GTK Decorator
-Comment=switch to GTK windows-decorator if compiz is running
-TryExec=compiz-decorator-gtk
-Exec=compiz-decorator-gtk
-Icon=gtk-decorator
-NoDisplay=false
-StartupNotify=true
-Categories=Utility;
-OnlyShowIn=MATE;
-Name[de_DE]=GTK Decorator
-X-Desktop-File-Install-Version=0.21
--- a/gtk-decorator.svg
+++ b/gtk-decorator.svg
@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="96"
-   height="96"
-   id="svg2408">
-  <defs
-     id="defs2410">
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)">
-      <stop
-         id="stop3750"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3737">
-      <stop
-         id="stop3739"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3741"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3174">
-      <feGaussianBlur
-         id="feGaussianBlur3176"
-         stdDeviation="1.71" />
-    </filter>
-    <linearGradient
-       x1="36.357143"
-       y1="6"
-       x2="36.357143"
-       y2="63.893143"
-       id="linearGradient3188"
-       xlink:href="#linearGradient3737"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       x="-0.192"
-       y="-0.192"
-       width="1.3839999"
-       height="1.3839999"
-       color-interpolation-filters="sRGB"
-       id="filter3794">
-      <feGaussianBlur
-         id="feGaussianBlur3796"
-         stdDeviation="5.28" />
-    </filter>
-    <linearGradient
-       x1="48"
-       y1="20.220806"
-       x2="48"
-       y2="138.66119"
-       id="linearGradient3613"
-       xlink:href="#linearGradient3737"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="48"
-       cy="90.171875"
-       r="42"
-       fx="48"
-       fy="90.171875"
-       id="radialGradient3619"
-       xlink:href="#linearGradient3737"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" />
-    <clipPath
-       id="clipPath3613">
-      <rect
-         width="84"
-         height="84"
-         rx="6"
-         ry="6"
-         x="6"
-         y="6"
-         id="rect3615"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </clipPath>
-    <linearGradient
-       x1="48"
-       y1="90"
-       x2="48"
-       y2="5.9877172"
-       id="linearGradient3617"
-       xlink:href="#ButtonColor"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="58.650177"
-       y1="122"
-       x2="58.650177"
-       y2="5.4252338"
-       id="ButtonColor"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0172414,0,0,1.0172414,-1.1034483,-1.1034483)">
-      <stop
-         id="stop3189"
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3191"
-         style="stop-color:#505050;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3319">
-      <stop
-         id="stop3321"
-         style="stop-color:#fdb377;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3323"
-         style="stop-color:#fdb377;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3387">
-      <stop
-         id="stop3389"
-         style="stop-color:#fdb377;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3391"
-         style="stop-color:#fdb377;stop-opacity:0.46875"
-         offset="0.82258064" />
-      <stop
-         id="stop3393"
-         style="stop-color:#fdb377;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.94442"
-       cy="67.783485"
-       r="14.491941"
-       fx="99.94442"
-       fy="67.783485"
-       id="radialGradient3744"
-       xlink:href="#linearGradient3387"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6034483,0,26.879657)" />
-    <filter
-       x="-0.096449763"
-       y="-0.10544351"
-       width="1.1928995"
-       height="1.210887"
-       color-interpolation-filters="sRGB"
-       id="filter3790">
-      <feGaussianBlur
-         id="feGaussianBlur3792"
-         stdDeviation="2.2552138" />
-    </filter>
-    <filter
-       x="-0.12014347"
-       y="-0.1054435"
-       width="1.2402869"
-       height="1.210887"
-       color-interpolation-filters="sRGB"
-       id="filter3795">
-      <feGaussianBlur
-         id="feGaussianBlur3797"
-         stdDeviation="2.2552138" />
-    </filter>
-    <linearGradient
-       x1="28.274937"
-       y1="31.704529"
-       x2="30.996277"
-       y2="5.8127055"
-       id="linearGradient2916"
-       xlink:href="#linearGradient3319"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
-    <linearGradient
-       x1="68.954239"
-       y1="64.098991"
-       x2="66.271294"
-       y2="89.625511"
-       id="linearGradient2918"
-       xlink:href="#linearGradient3319"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
-    <clipPath
-       id="clipPath2920">
-      <path
-         d="M 34.3125,6 C 31.4369,6.00634 28.50536,6.026275 25.5,6.0625 0.817792,34.559394 25.31767,52.904713 45.9375,57.34375 24.11376,43.193251 41.87467,16.803992 60.1875,6.03125 51.17102,6.0755435 42.93929,5.9809865 34.3125,6 z m 16.59375,32.46875 c 21.82374,14.150496 2.495,41.958775 -25.34375,51.3125 12.02197,-0.05906 37.91608,0.0824 49.9375,-0.0625 16.88827,-29.738529 -3.97392,-46.810961 -24.59375,-51.25 z"
-         inkscape:connector-curvature="0"
-         id="path2922"
-         style="fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    </clipPath>
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3721"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-97)" />
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)">
-      <stop
-         id="stop3750-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-5"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3725"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3772"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient3780-7"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-    <linearGradient
-       x1="32.251034"
-       y1="6.1317081"
-       x2="32.251034"
-       y2="90.238609"
-       id="linearGradient2969"
-       xlink:href="#ButtonShadow-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />
-  </defs>
-  <metadata
-     id="metadata2413">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer2"
-     style="display:none">
-    <rect
-       width="86"
-       height="85"
-       rx="6"
-       ry="6"
-       x="5"
-       y="7"
-       id="rect3745"
-       style="opacity:0.9;fill:url(#ButtonShadow);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)" />
-  </g>
-  <g
-     id="layer4"
-     style="display:inline">
-    <path
-       d="m 12,-95.03125 c -5.5110903,0 -10.03125,4.52016 -10.03125,10.03125 l 0,71 c 0,5.5110902 4.5201598,10.03125 10.03125,10.03125 l 72,0 c 5.51109,0 10.03125,-4.5201597 10.03125,-10.03125 l 0,-71 c 0,-5.51109 -4.52016,-10.03125 -10.03125,-10.03125 l -72,0 z"
-       transform="scale(1,-1)"
-       id="path3786"
-       style="opacity:0.07999998;fill:url(#linearGradient2969);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    <path
-       d="m 12,-94.03125 c -4.971633,0 -9.03125,4.059617 -9.03125,9.03125 l 0,71 c 0,4.9716329 4.0596171,9.03125 9.03125,9.03125 l 72,0 c 4.971633,0 9.03125,-4.059617 9.03125,-9.03125 l 0,-71 c 0,-4.971633 -4.059617,-9.03125 -9.03125,-9.03125 l -72,0 z"
-       transform="scale(1,-1)"
-       id="path3778"
-       style="opacity:0.1;fill:url(#linearGradient3780-7);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    <path
-       d="m 12,-93 c -4.4091333,0 -8,3.590867 -8,8 l 0,71 c 0,4.4091333 3.5908667,8 8,8 l 72,0 c 4.409133,0 8,-3.5908667 8,-8 l 0,-71 c 0,-4.409133 -3.590867,-8 -8,-8 l -72,0 z"
-       transform="scale(1,-1)"
-       id="path3770"
-       style="opacity:0.2;fill:url(#linearGradient3772);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    <rect
-       width="86"
-       height="85"
-       rx="7"
-       ry="7"
-       x="5"
-       y="-92"
-       transform="scale(1,-1)"
-       id="rect3723"
-       style="opacity:0.3;fill:url(#linearGradient3725);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    <rect
-       width="84"
-       height="84"
-       rx="6"
-       ry="6"
-       x="6"
-       y="-91"
-       transform="scale(1,-1)"
-       id="rect3716"
-       style="opacity:0.45;fill:url(#linearGradient3721);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-  </g>
-  <g
-     id="layer1">
-    <rect
-       width="84"
-       height="84"
-       rx="6"
-       ry="6"
-       x="6"
-       y="6"
-       id="rect2419"
-       style="fill:url(#linearGradient3617);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 12.53125,6 C 8.920699,6 6,8.920699 6,12.53125 l 0,36.9375 c 4.869569,-2.841757 8.574151,-3.084487 12.46875,1.03125 2.08904,2.207658 6.657708,1.523014 9.75,-0.15625 5.833155,-1.553824 5.662928,-1.456263 10.3125,0.71875 2.750239,1.430501 3.554628,0.728377 4.28125,-0.8125 2.610228,-0.202045 12.545241,6.501777 13.53125,3.03125 1.254988,-3.108028 2.243723,-1.655129 4.8125,-0.375 4.401208,3.064233 12.078556,-0.841574 17.59375,1.34375 3.87103,2.221575 9.42347,0.03455 11.21875,-4.8125 C 89.98285,49.41498 89.9859,49.39754 90,49.375 L 90,12.53125 C 90,8.920699 87.07929,6 83.46875,6 l -70.9375,0 z"
-       inkscape:connector-curvature="0"
-       id="path3449"
-       style="opacity:0.1;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-  </g>
-  <g
-     id="layer3">
-    <path
-       d="m 50.804251,37.858747 c -0.238861,0.04576 -0.428904,0.244023 -0.476561,0.488057 -0.04766,0.244034 0.05664,0.484835 0.259942,0.621163 5.347945,3.467602 8.111974,7.70269 8.90302,12.267974 0.791047,4.565283 -0.399313,9.519796 -3.140968,14.375492 -5.48331,9.711394 -17.184302,18.947904 -30.976445,23.582016 -0.239511,0.09727 -0.381379,0.34066 -0.368251,0.598978 l 51.143627,0 C 84.523536,74.897823 83.546223,62.937566 77.773253,54.253019 71.968965,45.521363 61.463399,40.102152 51.042531,37.858747 c -0.07861,-0.01645 -0.159666,-0.01645 -0.23828,0 z"
-       inkscape:connector-curvature="0"
-       id="path3427"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="M 24.701722,6.0241312 C 18.693287,13.064266 15.61913,19.545872 14.758933,25.391113 c -0.875827,5.95145 0.565448,11.223562 3.444234,15.684372 5.75757,8.921621 17.166627,14.636836 27.597196,16.882329 0.28575,0.04394 0.563316,-0.124927 0.671518,-0.399319 0.108201,-0.27439 0.01878,-0.582661 -0.216619,-0.754269 -5.349467,-3.468591 -8.1943,-7.625914 -9.271272,-12.090499 -1.076971,-4.464586 -0.36054,-9.277617 1.602977,-14.042726 3.927034,-9.530219 12.85906,-18.773743 21.90013,-24.0922598 0.199582,-0.1142074 0.323343,-0.3287572 0.324928,-0.55461 l -36.110303,0 z"
-       inkscape:connector-curvature="0"
-       id="path3309"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="M 25.50321,6.0685 C 0.82100177,34.565394 25.310502,52.897614 45.930334,57.336651 24.106591,43.186152 41.870999,16.796873 60.183831,6.0241312 48.161863,6.0831892 37.524633,5.9236007 25.50321,6.0685 z"
-       inkscape:connector-curvature="0"
-       id="path3299"
-       style="fill:#e72121;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="m 114.43636,67.783485 a 14.491941,8.7451372 0 1 1 -28.983882,0 14.491941,8.7451372 0 1 1 28.983882,0 z"
-       transform="matrix(0.49015172,0.50197571,-0.49015172,0.50197571,32.614386,-36.287054)"
-       id="path3301"
-       style="fill:#ee0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.42553663;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-    <path
-       d="M 41.85783,51.701108 C 29.010244,41.69733 43.762082,15.95959 58.636196,9.1823118 37.040381,24.560994 33.598802,44.247846 41.85783,51.701108 z"
-       inkscape:connector-curvature="0"
-       id="path3351"
-       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="m 49.144784,39.346826 c -9.443994,-5.454719 -11.289616,-1.282267 -9.85882,5.769513 -0.371674,-3.64606 -0.04749,-9.276373 9.85882,-5.769513 z"
-       inkscape:connector-curvature="0"
-       id="path3353"
-       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="m 47.672556,56.412797 c 9.443994,5.454719 11.289616,1.282268 9.85882,-5.769513 0.371674,3.64606 0.04748,9.276373 -9.85882,5.769513 z"
-       inkscape:connector-curvature="0"
-       id="path3355"
-       style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="M 31.959289,53.302006 C 13.139176,47.74029 3.2220705,26.685316 20.135883,10.538119 5.2604712,31.277363 17.328956,46.896526 31.959289,53.302006 z"
-       inkscape:connector-curvature="0"
-       id="path3357"
-       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="m 114.43636,67.783485 a 14.491941,8.7451372 0 1 1 -28.983882,0 14.491941,8.7451372 0 1 1 28.983882,0 z"
-       transform="matrix(0.49738705,0.50938559,-0.49738705,0.50938559,32.38169,-37.5299)"
-       id="path3367"
-       style="fill:url(#radialGradient3744);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
-    <path
-       d="M 75.507424,89.729651 C 92.395695,59.991122 71.541057,42.900541 50.921225,38.461502 72.744968,52.611998 53.415609,80.420295 25.57686,89.77402 37.598829,89.71496 63.486001,89.874549 75.507424,89.72965 z"
-       inkscape:connector-curvature="0"
-       id="path3399"
-       style="fill:#e72121;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="M 54.993729,44.097043 C 67.841315,54.100824 51.703889,77.710043 33.712203,84.6647 56.520407,71.237163 64.118749,53.501449 54.993729,44.097043 z"
-       inkscape:connector-curvature="0"
-       id="path3405"
-       style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       d="M 64.89227,42.496146 C 83.712385,48.057864 90.858314,71.063977 78.101266,88.098057 90.032301,66.294557 79.522602,48.901631 64.89227,42.496146 z"
-       inkscape:connector-curvature="0"
-       id="path3407"
-       style="opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <g
-       clip-path="url(#clipPath2920)"
-       id="g2912"
-       style="opacity:0.8">
-      <path
-         d="M 52.40625,8.46875 C 43.830477,8.4559939 35.514175,8.4080741 26.6875,8.5 c -5.453186,6.520741 -8.141163,12.350404 -8.875,17.34375 -0.766103,5.212895 0.432799,9.633263 2.96875,13.5625 3.421535,5.301372 9.494091,9.448987 16.0625,12.3125 C 35.547702,49.716692 34.526525,47.619569 34,45.4375 32.73062,40.17683 33.60744,34.700747 35.75,29.5 39.044845,21.50225 45.319675,14.064812 52.40625,8.46875 z"
-         id="path2907"
-         style="fill:url(#linearGradient2916);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;filter:url(#filter3795)" />
-      <path
-         d="m 59.09375,43.3125 c 1.603818,2.329455 2.642147,4.862645 3.09375,7.46875 0.927705,5.353589 -0.500792,10.930861 -3.46875,16.1875 -4.542518,8.04539 -12.742331,15.469886 -22.78125,20.6875 12.720504,0.0024 28.507282,0.03673 38.21875,-0.0625 C 81.665806,73.757614 80.613523,63.467116 75.5,55.78125 71.806878,50.230313 65.771206,46.072542 59.09375,43.3125 z"
-         id="path2903"
-         style="fill:url(#linearGradient2918);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;filter:url(#filter3790)" />
-    </g>
-  </g>
-  <g
-     id="layer5">
-    <rect
-       width="66"
-       height="66"
-       rx="12"
-       ry="12"
-       x="15"
-       y="15"
-       clip-path="url(#clipPath3613)"
-       id="rect3171"
-       style="opacity:0.1;fill:url(#linearGradient3613);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794)" />
-    <path
-       d="M 12,90 C 8.676,90 6,87.324 6,84 L 6,82 6,14 6,12 c 0,-0.334721 0.04135,-0.6507 0.09375,-0.96875 0.0487,-0.295596 0.09704,-0.596915 0.1875,-0.875 C 6.29113,10.12587 6.302142,10.09265 6.3125,10.0625 6.411365,9.774729 6.5473802,9.515048 6.6875,9.25 6.8320918,8.976493 7.0031161,8.714385 7.1875,8.46875 7.3718839,8.223115 7.5612765,7.995278 7.78125,7.78125 8.221197,7.353194 8.72416,6.966724 9.28125,6.6875 9.559795,6.547888 9.8547231,6.440553 10.15625,6.34375 9.9000482,6.443972 9.6695391,6.580022 9.4375,6.71875 c -0.00741,0.0044 -0.023866,-0.0045 -0.03125,0 -0.031933,0.0193 -0.062293,0.04251 -0.09375,0.0625 -0.120395,0.0767 -0.2310226,0.163513 -0.34375,0.25 -0.1061728,0.0808 -0.2132809,0.161112 -0.3125,0.25 C 8.4783201,7.442683 8.3087904,7.626638 8.15625,7.8125 8.0486711,7.942755 7.9378561,8.077785 7.84375,8.21875 7.818661,8.25713 7.805304,8.30462 7.78125,8.34375 7.716487,8.446782 7.6510225,8.548267 7.59375,8.65625 7.4927417,8.850956 7.3880752,9.071951 7.3125,9.28125 7.30454,9.30306 7.288911,9.3218 7.28125,9.34375 7.2494249,9.4357 7.2454455,9.530581 7.21875,9.625 7.1884177,9.731618 7.1483606,9.828031 7.125,9.9375 7.0521214,10.279012 7,10.635705 7,11 l 0,2 0,68 0,2 c 0,2.781848 2.2181517,5 5,5 l 2,0 68,0 2,0 c 2.781848,0 5,-2.218152 5,-5 l 0,-2 0,-68 0,-2 C 89,10.635705 88.94788,10.279012 88.875,9.9375 88.83085,9.730607 88.78662,9.539842 88.71875,9.34375 88.71105,9.3218 88.69545,9.30306 88.6875,9.28125 88.62476,9.107511 88.549117,8.913801 88.46875,8.75 88.42717,8.6672 88.38971,8.580046 88.34375,8.5 88.28915,8.40279 88.216976,8.31165 88.15625,8.21875 88.06214,8.077785 87.951329,7.942755 87.84375,7.8125 87.700576,7.63805 87.540609,7.465502 87.375,7.3125 87.36383,7.3023 87.35502,7.29135 87.34375,7.28125 87.205364,7.155694 87.058659,7.046814 86.90625,6.9375 86.803679,6.86435 86.701932,6.784136 86.59375,6.71875 c -0.0074,-0.0045 -0.02384,0.0044 -0.03125,0 -0.232039,-0.138728 -0.462548,-0.274778 -0.71875,-0.375 0.301527,0.0968 0.596455,0.204138 0.875,0.34375 0.55709,0.279224 1.060053,0.665694 1.5,1.09375 0.219973,0.214028 0.409366,0.441865 0.59375,0.6875 0.184384,0.245635 0.355408,0.507743 0.5,0.78125 0.14012,0.265048 0.276135,0.524729 0.375,0.8125 0.01041,0.03078 0.02133,0.06274 0.03125,0.09375 0.09046,0.278085 0.1388,0.579404 0.1875,0.875 C 89.95865,11.3493 90,11.665279 90,12 l 0,2 0,68 0,2 c 0,3.324 -2.676,6 -6,6 l -72,0 z"
-       inkscape:connector-curvature="0"
-       id="path3615"
-       style="opacity:0.2;fill:url(#radialGradient3619);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,2 0,68 0,2 c 0,0.334721 0.04135,0.6507 0.09375,0.96875 0.0487,0.295596 0.09704,0.596915 0.1875,0.875 0.00988,0.03038 0.020892,0.0636 0.03125,0.09375 0.098865,0.287771 0.2348802,0.547452 0.375,0.8125 0.1445918,0.273507 0.3156161,0.535615 0.5,0.78125 0.1843839,0.245635 0.3737765,0.473472 0.59375,0.6875 0.439947,0.428056 0.94291,0.814526 1.5,1.09375 0.278545,0.139612 0.5734731,0.246947 0.875,0.34375 -0.2562018,-0.100222 -0.4867109,-0.236272 -0.71875,-0.375 -0.00741,-0.0044 -0.023866,0.0045 -0.03125,0 -0.031933,-0.0193 -0.062293,-0.04251 -0.09375,-0.0625 -0.120395,-0.0767 -0.2310226,-0.163513 -0.34375,-0.25 -0.1061728,-0.0808 -0.2132809,-0.161112 -0.3125,-0.25 C 8.4783201,88.557317 8.3087904,88.373362 8.15625,88.1875 8.0486711,88.057245 7.9378561,87.922215 7.84375,87.78125 7.818661,87.74287 7.805304,87.69538 7.78125,87.65625 7.716487,87.553218 7.6510225,87.451733 7.59375,87.34375 7.4927417,87.149044 7.3880752,86.928049 7.3125,86.71875 7.30454,86.69694 7.288911,86.6782 7.28125,86.65625 7.2494249,86.5643 7.2454455,86.469419 7.21875,86.375 7.1884177,86.268382 7.1483606,86.171969 7.125,86.0625 7.0521214,85.720988 7,85.364295 7,85 L 7,83 7,15 7,13 C 7,10.218152 9.2181517,8 12,8 l 2,0 68,0 2,0 c 2.781848,0 5,2.218152 5,5 l 0,2 0,68 0,2 c 0,0.364295 -0.05212,0.720988 -0.125,1.0625 -0.04415,0.206893 -0.08838,0.397658 -0.15625,0.59375 -0.0077,0.02195 -0.0233,0.04069 -0.03125,0.0625 -0.06274,0.173739 -0.138383,0.367449 -0.21875,0.53125 -0.04158,0.0828 -0.07904,0.169954 -0.125,0.25 -0.0546,0.09721 -0.126774,0.18835 -0.1875,0.28125 -0.09411,0.140965 -0.204921,0.275995 -0.3125,0.40625 -0.143174,0.17445 -0.303141,0.346998 -0.46875,0.5 -0.01117,0.0102 -0.01998,0.02115 -0.03125,0.03125 -0.138386,0.125556 -0.285091,0.234436 -0.4375,0.34375 -0.102571,0.07315 -0.204318,0.153364 -0.3125,0.21875 -0.0074,0.0045 -0.02384,-0.0044 -0.03125,0 -0.232039,0.138728 -0.462548,0.274778 -0.71875,0.375 0.301527,-0.0968 0.596455,-0.204138 0.875,-0.34375 0.55709,-0.279224 1.060053,-0.665694 1.5,-1.09375 0.219973,-0.214028 0.409366,-0.441865 0.59375,-0.6875 0.184384,-0.245635 0.355408,-0.507743 0.5,-0.78125 0.14012,-0.265048 0.276135,-0.524729 0.375,-0.8125 0.01041,-0.03078 0.02133,-0.06274 0.03125,-0.09375 0.09046,-0.278085 0.1388,-0.579404 0.1875,-0.875 C 89.95865,84.6507 90,84.334721 90,84 l 0,-2 0,-68 0,-2 C 90,8.676 87.324,6 84,6 L 12,6 z"
-       inkscape:connector-curvature="0"
-       id="rect3728"
-       style="opacity:0.3;fill:url(#linearGradient3188);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
-</svg>
--- a/2
+++ b/2
@ -1 +1 @@
-d14508f2a0e129b147fc0d905984c1fc  compiz-0.8.8.tar.bz2
+SHA512 (compiz-core-v0.8.18.tar.bz2) = f65d869469706e9bea3ac1622ee7f4e1257101600a2373537e903f8495cb236a27de5868ad10136fa8344b6f503dc4e84648516b2ad56aba5c4ae7793e68a4a0
Author	SHA1	Message	Date
Fedora Release Engineering	cf3b49b8c1	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-20 23:26:18 +00:00
Jaroslav Škarvada	5603e1edf1	Added patch description Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>	2022-01-26 12:02:57 +01:00
Jaroslav Škarvada	9d7ce1b99a	Fixed FTBFS with the librsvg2-2.52 Resolves: rhbz#2045273	2022-01-26 11:59:20 +01:00
Fedora Release Engineering	5de04ff49c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-19 23:41:59 +00:00
Fedora Release Engineering	a3036ea14b	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-21 19:54:38 +00:00
Fedora Release Engineering	37065acde8	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-21 14:56:15 +00:00
Fedora Release Engineering	f1eba5656f	- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-01-26 02:25:00 +00:00
Tom Stellard	218758aad1	Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot	2020-12-17 03:48:23 +00:00
Jaroslav Škarvada	225c20b5f8	New version Resolves: rhbz#1891137	2020-11-09 20:48:18 +01:00
raveit65	bd0a7bc9fb	build with marco again	2020-10-23 20:58:16 +02:00
Fedora Release Engineering	a355b20358	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-27 14:25:49 +00:00
Fedora Release Engineering	ae3abd9298	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-28 14:37:52 +00:00
Fedora Release Engineering	eaf234813d	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-24 20:49:26 +00:00
raveit65	8f3b2f9171	add patches from upstream master	2019-06-17 17:01:10 +02:00
raveit65	87e1700f13	build with marco-1.22.2	2019-06-17 16:59:13 +02:00
raveit65	2a90388e48	disable BR libcompizconfig-devel	2019-06-17 15:42:17 +02:00
raveit65	785547f31d	build without marco, because of reverse dependencies to libcompizconfig	2019-06-17 15:14:21 +02:00
Jaroslav Škarvada	ed5915c008	New version Resolves: rhbz#1656467 New URL	2019-04-02 21:15:32 +02:00
Fedora Release Engineering	27bacfbf27	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-01-31 16:07:11 +00:00
Igor Gnatenko	7f5749c02c	Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag	2019-01-28 20:23:58 +01:00
Igor Gnatenko	a8eb0f9ba6	Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2019-01-22 18:38:43 +01:00
Fedora Release Engineering	4d04afa73f	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-12 22:08:20 +00:00
Fedora Release Engineering	91878afa88	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-07 05:33:15 +00:00
Igor Gnatenko	4f0c4a4f05	Remove obsolete scriptlets Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2018-01-07 20:05:06 +01:00
Fedora Release Engineering	e6f67d3f5a	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild	2017-08-02 19:06:28 +00:00
Fedora Release Engineering	d402708afb	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild	2017-07-26 05:20:09 +00:00
raveit65	d49995d10b	update to 0.8.14	2017-04-20 16:10:10 +02:00
Fedora Release Engineering	27318687d1	- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild	2017-02-10 07:48:23 +00:00
raveit65	bc92a3c6fd	enable BR libcompizconfig-devel again	2016-11-20 17:38:38 +01:00
raveit65	2cbbc5ec16	disable BR libcompizconfig-devel for rebuilding libcompizconfig for libprotobuf soname bump	2016-11-20 16:54:19 +01:00
raveit65	4e677fe99a	bump version for rebuild with libcompizconfig-devel	2016-06-11 00:35:11 +02:00
raveit65	22c820b168	Revert "disable BR libcompizconfig-devel tempoary" This reverts commit `7b44c822c2`.	2016-06-11 00:33:07 +02:00
raveit65	7b44c822c2	disable BR libcompizconfig-devel tempoary	2016-06-11 00:18:52 +02:00
raveit65	9d952528c4	switch to gtk3	2016-06-11 00:04:55 +02:00
raveit65	0115bbe629	update to 0.8.12.3 release	2016-04-14 15:06:31 +02:00
raveit65	913c29dd5e	update to 0.8.12.2 release	2016-03-28 22:34:47 +02:00
Wolfgang Ulbrich	b9f4549151	remove obsolete patch	2016-02-13 15:07:18 +01:00
Wolfgang Ulbrich	b9ec5c9361	fix date in changelog	2016-02-13 12:25:21 +01:00
Wolfgang Ulbrich	517e0e62da	update to 0.8.12 release	2016-02-13 12:23:51 +01:00
Dennis Gilmore	e0d37456c5	- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild	2016-02-03 18:01:05 +00:00
Wolfgang Ulbrich	1110b93fa5	fix crash with gwd using close button, rhbz (#1300162 , #1298016 )	2016-01-22 05:44:13 +01:00
Wolfgang Ulbrich	4bb8d54f8d	fix runtime requires	2015-12-20 12:38:04 +01:00
Wolfgang Ulbrich	4954f9a538	update to 0.8.10 release	2015-12-19 20:53:44 +01:00
Wolfgang Ulbrich	fd09a91ec9	remove runtime requires fedora-logos	2015-11-22 15:00:13 +01:00
Wolfgang Ulbrich	18c11ca420	some spec file correction	2015-11-06 16:20:44 +01:00
Wolfgang Ulbrich	3cc45af73f	update configure flags	2015-11-06 16:18:11 +01:00
Wolfgang Ulbrich	1b22eb1bc4	move gtk-window-decorator to main package	2015-11-06 16:16:15 +01:00
Wolfgang Ulbrich	7026236419	update build requires	2015-11-06 16:11:45 +01:00
Wolfgang Ulbrich	286668427f	add desktop-file-install scriptlet	2015-11-06 16:08:40 +01:00
Wolfgang Ulbrich	a15ef2e4cd	some spec file cleanup	2015-11-06 16:06:56 +01:00
Wolfgang Ulbrich	de77473938	remove old obsoletes for f15/16	2015-11-06 16:01:42 +01:00
Wolfgang Ulbrich	781985000c	remove mate gwd scripts, they are in the tarball now	2015-11-06 15:59:56 +01:00
Wolfgang Ulbrich	e322b59b13	remove external matecompat logo, it's in the tarball now	2015-11-06 15:52:27 +01:00
Wolfgang Ulbrich	b4e809e6c6	use runtime require fedora-logos for the cube plugin	2015-11-06 15:48:30 +01:00
Wolfgang Ulbrich	ea1af42dc6	remove runtime require emerald and hicolors	2015-11-06 15:46:53 +01:00
Wolfgang Ulbrich	20e77dfce5	no xfce/lxde subpackages anymore	2015-11-06 15:42:53 +01:00
Wolfgang Ulbrich	ca1bf1261a	move emerald scripts to emerald	2015-11-06 15:39:19 +01:00
Wolfgang Ulbrich	a81ac8bbb0	remove upstreamed patches	2015-11-06 15:31:19 +01:00
Wolfgang Ulbrich	ca683e10e8	update to 0.8.9 release	2015-11-06 15:17:52 +01:00
Dennis Gilmore	5e5e04f685	- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild	2015-06-17 03:07:28 +00:00
raveit65	bde83e2ca5	rebuild for f22	2015-03-18 09:17:47 +01:00
Peter Robinson	2653f53deb	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-16 01:05:37 +00:00
Dennis Gilmore	216fc52955	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild	2014-06-07 00:38:33 -05:00
raveit65	3d9d124805	switch to libwnck for f21	2014-02-16 18:42:10 +01:00
raveit65	d6578353f2	update patches in spec file	2014-02-16 18:40:32 +01:00
raveit65	37bde37774	change BR to marco-devel for f21	2014-02-16 18:37:01 +01:00
raveit65	bbcd3edfac	add cube-set-opacity-during-rotation-to-70-as-default patch	2014-02-16 18:32:53 +01:00
raveit65	176b9d1be1	re-work remove_old_metacity_checks patch	2014-02-16 18:30:52 +01:00
raveit65	089cd0aea0	re-work remove_mateconf_dbus_glib patch	2014-02-16 18:18:25 +01:00
raveit65	3891b9b5fc	re-work remove-kde patch	2014-02-16 18:16:37 +01:00
raveit65	6db1e94d8f	re-work keybindings_and_mate-windows-settings patch	2014-02-16 18:15:01 +01:00