4 files changed, 98 insertions, 24 deletions
diff --git a/desktop/fusion-icon/README b/desktop/fusion-icon/README
index e0b8a06a31..3e34b0b114 100644
--- a/desktop/fusion-icon/README
+++ b/desktop/fusion-icon/README
@@ -3,16 +3,22 @@ Compiz Fusion. Upon launch, it will attempt to start Compiz Fusion
 automatically. You may need to select a window decorator if one does not
 appear.
 
+PLEASE read the README.Slackware file BEFORE you install any of the
+compiz packages.  The install order is listed below but there are
+some important notes you need to be aware of before you install/use
+compiz.
+
 For correct installation, build in this order:
- 1. compiz-bcop
- 2. protobuf (optional but recommended)
- 3. libcompizconfig
- 4. compizconfig-python
- 5. compizconfig-backend-kconfig4 (optional)
- 6. ccsm
- 7. compiz-plugins-main
- 8. compiz-plugins-extra (optional)
- 9. compiz-plugins-unsupported (optional)
-10. emerald (optional)
-11. emerald-themes (optional)
-12. fusion-icon (optional)
+ 1. compiz (not available at SBo, see the README.Slackware file)
+ 2. compiz-bcop
+ 3. protobuf (optional but recommended)
+ 4. libcompizconfig
+ 5. compiz (optional, see the README.Slackware file)
+ 6. compizconfig-python
+ 7. ccsm
+ 8. compiz-plugins-main
+ 9. compiz-plugins-extra (optional)
+10. compiz-plugins-experimental (optional)
+11. emerald (optional)
+12. emerald-themes (optional)
+13. fusion-icon (optional)
diff --git a/desktop/fusion-icon/README.Slackware b/desktop/fusion-icon/README.Slackware
new file mode 100644
index 0000000000..d44e53ef41
--- /dev/null
+++ b/desktop/fusion-icon/README.Slackware
@@ -0,0 +1,46 @@
+1)  Slackware still ships the old 0.8.8 release of compiz that was 
+    released back in 2011.  The project has recently been picked up
+    and is being actively maintained by the compiz-reloaded team.  
+    You can still use the 0.8.8 version of the compiz that ships 
+    with Slackware with the companion packages since there has not been 
+    any ABI changes to the code. But there is a good chance you will run 
+    into stabilty issues if you do, so it is HIGHLY recommended you use 
+    the version of compiz that matches the companion packages.  Because 
+    you will be replacing a stock Slackware package the SlackBuild is 
+    not hosted at www.slackbuilds.org.  You can download the SlackBuild 
+    from the link below.
+
+    https://dl.dropboxusercontent.com/u/85079539/compiz-0.8.12.3-SlackBuild.tar.gz
+
+    This SlackBuild is based off the 14.2 stock Slackware SlackBuild so you 
+    shouldn't run into any problems. If you do use this version of compiz you 
+    will need to blacklist compiz in your /etc/slackpkg/blacklist file to keep
+    slackpkg from reverting the package back to 0.8.8
+
+2)  Compiz now has basic support for the MATE desktop.  You will have to install 
+    MATE before you install compiz for support.  The MATE slackware project 
+    website is located here https://mateslackbuilds.github.io/
+
+3)  The compizconfig-backend-kconfig4 package has been removed from the 
+    project so if you are upgrading from a previous version you will want 
+    to remove this package.  Also compiz-plugins-unsupported has now been
+    renamed to compiz-plugins-experimental so you will need to remove 
+    compiz-plugins-unsupported before you upgrade to the newest packages.
+
+4)  The install order has compiz listed twice.  libcompizconfig depends 
+    on compiz, but compiz has some extra window decorator related features
+    that depend on libcompizconfig.  So if you want these extra features you
+    will have to recompile compiz again AFTER you build and install 
+    libcompizconfig.  This is not required it is just an option if you want
+    to do it.  
+
+5)  After you install compiz and the companion packages you will need to 
+    launch CCSM and enable "Move", "Resize Window", and "Window Decorations"
+    before you start compiz.  This way you can manage your windows.  After
+    you enable those three options you can start compiz and customize to    
+    your liking.
+
+
+
+    
+   
diff --git a/desktop/fusion-icon/fusion-icon.SlackBuild b/desktop/fusion-icon/fusion-icon.SlackBuild
index 6249ecfaff..d6c31893d4 100644
--- a/desktop/fusion-icon/fusion-icon.SlackBuild
+++ b/desktop/fusion-icon/fusion-icon.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for fusion-icon
 
-# Written by M.Dinslage (daedra1980@gmail.com)
+# Copyright 2016 Matt Dinslage, Springfield, MO
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fusion-icon
-VERSION=${VERSION:-20080213}
+VERSION=${VERSION:-0.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,20 +60,24 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --prefix=/usr --root=$PKG
+python setup.py build install --prefix=/usr --with-qt=4.0 --with-gtk=2.0 --root=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Fix desktop icon to launch qt interface instead of gtk+ which is not supported
+# due to lack of dependencies.
+sed -i 's,Exec=fusion-icon,Exec=/usr/bin/fusion-icon -i qt,g' $TMP/package-fusion-icon/usr/share/applications/fusion-icon.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/fusion-icon/fusion-icon.info b/desktop/fusion-icon/fusion-icon.info
index 53499ad383..9980026cbd 100644
--- a/desktop/fusion-icon/fusion-icon.info
+++ b/desktop/fusion-icon/fusion-icon.info
@@ -1,8 +1,8 @@
 PRGNAM="fusion-icon"
-VERSION="20080213"
-HOMEPAGE="http://www.compiz.org"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/fusion-icon/fusion-icon-20080213.tar.gz/8073ef16b388d42c63076b64d12efdf8/fusion-icon-20080213.tar.gz"
-MD5SUM="8073ef16b388d42c63076b64d12efdf8"
+VERSION="0.2.2"
+HOMEPAGE="https://github.com/raveit65/fusion-icon"
+DOWNLOAD="https://github.com/compiz-reloaded/fusion-icon/releases/download/v0.2.2/fusion-icon-0.2.2.tar.xz"
+MD5SUM="dff132190b616df91e4130f4f9286241"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ccsm"