--- a/patches/compiz-01-solaris-port.diff Fri Nov 02 10:40:55 2007 +0000
+++ b/patches/compiz-01-solaris-port.diff Fri Nov 02 16:59:59 2007 +0000
@@ -1,33 +1,3 @@
-diff -urN compiz-0.6.0.orig/metadata/annotate.xml compiz-0.6.0/metadata/annotate.xml
---- compiz-0.6.0.orig/metadata/annotate.xml 2007-10-01 13:43:27.000000000 -0400
-+++ compiz-0.6.0/metadata/annotate.xml 2007-10-31 00:52:10.047172630 -0400
-@@ -34,7 +34,7 @@
- <long xml:lang="pl">Rozpocznij rysowanie</long>
- <allowed key="true" button="true"/>
- <default>
-- <button><Super><Alt>Button1</button>
-+ <button><Mod4><Alt>Button1</button>
- </default>
- </option>
- <option type="action" name="draw">
-@@ -58,7 +58,7 @@
- <long xml:lang="sv">Initiera radering av anteckning</long>
- <allowed key="true" button="true"/>
- <default>
-- <button><Super><Alt>Button3</button>
-+ <button><Mod4><Alt>Button3</button>
- </default>
- </option>
- <option type="action" name="clear">
-@@ -76,7 +76,7 @@
- <long xml:lang="sv">Töm</long>
- <allowed key="true" button="true"/>
- <default>
-- <key><Super><Alt>k</key>
-+ <key><Mod4><Alt>k</key>
- </default>
- </option>
- <option type="color" name="fill_color">
diff -urN compiz-0.6.0.orig/metadata/annotate.xml.in compiz-0.6.0/metadata/annotate.xml.in
--- compiz-0.6.0.orig/metadata/annotate.xml.in 2007-08-23 06:06:48.000000000 -0400
+++ compiz-0.6.0/metadata/annotate.xml.in 2007-10-31 00:52:10.050263204 -0400
@@ -58,18 +28,6 @@
</default>
</option>
<option name="fill_color" type="color">
-diff -urN compiz-0.6.0.orig/metadata/clone.xml compiz-0.6.0/metadata/clone.xml
---- compiz-0.6.0.orig/metadata/clone.xml 2007-10-01 13:43:27.000000000 -0400
-+++ compiz-0.6.0/metadata/clone.xml 2007-10-31 00:52:10.050053819 -0400
-@@ -33,7 +33,7 @@
- <long xml:lang="pl">Rozpocznij klonowanie zaznaczenia</long>
- <allowed button="true"/>
- <default>
-- <button><Super><Shift>Button1</button>
-+ <button><Mod4><Shift>Button1</button>
- </default>
- </option>
- </display>
diff -urN compiz-0.6.0.orig/metadata/clone.xml.in compiz-0.6.0/metadata/clone.xml.in
--- compiz-0.6.0.orig/metadata/clone.xml.in 2007-08-23 06:06:48.000000000 -0400
+++ compiz-0.6.0/metadata/clone.xml.in 2007-10-31 00:52:10.049274921 -0400
@@ -265,18 +223,6 @@
<min>0.0</min>
<max>100.0</max>
<precision>1.0</precision>
-diff -urN compiz-0.6.0.orig/metadata/screenshot.xml compiz-0.6.0/metadata/screenshot.xml
---- compiz-0.6.0.orig/metadata/screenshot.xml 2007-10-01 13:43:30.000000000 -0400
-+++ compiz-0.6.0/metadata/screenshot.xml 2007-10-31 00:52:10.048829146 -0400
-@@ -34,7 +34,7 @@
- <long xml:lang="pl">Rozpocznik prostokątny zrzut ekranu</long>
- <allowed button="true"/>
- <default>
-- <button><Super>Button1</button>
-+ <button><Mod4>Button1</button>
- </default>
- </option>
- <option type="string" name="directory">
diff -urN compiz-0.6.0.orig/metadata/screenshot.xml.in compiz-0.6.0/metadata/screenshot.xml.in
--- compiz-0.6.0.orig/metadata/screenshot.xml.in 2007-08-23 06:06:48.000000000 -0400
+++ compiz-0.6.0/metadata/screenshot.xml.in 2007-10-31 00:52:10.051214817 -0400
@@ -289,18 +235,6 @@
</default>
</option>
<option name="directory" type="string">
-diff -urN compiz-0.6.0.orig/metadata/water.xml compiz-0.6.0/metadata/water.xml
---- compiz-0.6.0.orig/metadata/water.xml 2007-10-01 13:43:30.000000000 -0400
-+++ compiz-0.6.0/metadata/water.xml 2007-10-31 00:52:10.051078107 -0400
-@@ -83,7 +83,7 @@
- <long xml:lang="zh_TW">啟用指標水波特效</long>
- <allowed key="true"/>
- <default>
-- <key><Control><Super></key>
-+ <key><Control><Mod4></key>
- </default>
- </option>
- <option type="action" name="toggle_rain">
diff -urN compiz-0.6.0.orig/metadata/water.xml.in compiz-0.6.0/metadata/water.xml.in
--- compiz-0.6.0.orig/metadata/water.xml.in 2007-08-23 06:06:48.000000000 -0400
+++ compiz-0.6.0/metadata/water.xml.in 2007-10-31 00:52:10.047945174 -0400
@@ -313,45 +247,6 @@
</default>
</option>
<option name="toggle_rain" type="action">
-diff -urN compiz-0.6.0.orig/metadata/zoom.xml compiz-0.6.0/metadata/zoom.xml
---- compiz-0.6.0.orig/metadata/zoom.xml 2007-10-01 13:43:31.000000000 -0400
-+++ compiz-0.6.0/metadata/zoom.xml 2007-10-31 00:52:10.047716734 -0400
-@@ -77,7 +77,7 @@
- <long xml:lang="zh_TW">放大</long>
- <allowed key="true" button="true"/>
- <default>
-- <button><Super>Button3</button>
-+ <button><Mod4>Button3</button>
- </default>
- </option>
- <option type="action" name="zoom_in">
-@@ -119,7 +119,7 @@
- <long xml:lang="zh_TW">放大</long>
- <allowed key="true" button="true"/>
- <default>
-- <button><Super>Button4</button>
-+ <button><Mod4>Button4</button>
- </default>
- </option>
- <option type="action" name="zoom_out">
-@@ -161,7 +161,7 @@
- <long xml:lang="zh_TW">縮小</long>
- <allowed key="true" button="true"/>
- <default>
-- <button><Super>Button5</button>
-+ <button><Mod4>Button5</button>
- </default>
- </option>
- <option type="action" name="zoom_pan">
-@@ -169,7 +169,7 @@
- <long>Zoom pan</long>
- <allowed key="true" button="true"/>
- <default>
-- <button><Super>Button2</button>
-+ <button><Mod4>Button2</button>
- </default>
- </option>
- </display>
diff -urN compiz-0.6.0.orig/metadata/zoom.xml.in compiz-0.6.0/metadata/zoom.xml.in
--- compiz-0.6.0.orig/metadata/zoom.xml.in 2007-08-23 06:06:48.000000000 -0400
+++ compiz-0.6.0/metadata/zoom.xml.in 2007-10-31 00:52:10.046852442 -0400