minor changes

4 files changed, 20 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bde232587ce..1d481b7dd47b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.0.1
-# Sat Apr  9 20:46:19 UTC 2016
+# Sun Apr 10 23:23:39 UTC 2016
 pkgbase = compiz-manjaro
 	pkgdesc = OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE.
 	pkgver = 0.9.12.2
-	pkgrel = 5
+	pkgrel = 6
 	url = https://launchpad.net/compiz
 	install = compiz-manjaro.install
 	arch = i686
@@ -33,6 +33,7 @@ pkgbase = compiz-manjaro
 	depends = glu
 	depends = libsm
 	depends = dconf
+	depends = zenity
 	optdepends = xorg-xprop: grab various window properties for use in window matching rules
 	provides = compiz=0.9.12.2
 	conflicts = compiz
@@ -47,6 +48,7 @@ pkgbase = compiz-manjaro
 	conflicts = compiz-fusion-plugins-main
 	conflicts = compiz-fusion-plugins-extra
 	conflicts = compiz-fusion-plugins-unsupported
+	conflicts = compiz-fusion-plugins-experimental
 	conflicts = compiz-decorator-gtk
 	conflicts = compiz-decorator-kde
 	conflicts = libcompizconfig
@@ -86,9 +88,9 @@ pkgbase = compiz-manjaro
 	sha256sums = 443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288
 	sha256sums = 04c7d417602c144313e808d5e1bde198ee677412c97d7405cf6092e8794f95b7
 	sha256sums = 0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889
-	sha256sums = a9caa25aa72c1d28e7f3660ac89404e0bae8085b71626fc1c97db1956eea8bec
+	sha256sums = bc4643f94e0eca255e7e97968f928da11c33fb27944c1ca4f9c61ea3dafc7f42
 	sha256sums = d23b8633186bb3a2a841734ad0b917500f3536a67046f5d8fbb08818eab59160
-	sha256sums = 38ef826430307958722fa6d3553adf5a6e2bc793d7f1b55d4c66c5e51a60b385
+	sha256sums = 5c471a34a1d79a45e8c4a924f0f58d71199328e45c80472fe32ecaac76c987ee
 	sha256sums = 02eec20f75eb1f9571a2cf92013fc3c78d13c155a8ede0467cc10b83cdeba43c
 	sha256sums = 473a38b379381311b68dcc579005c0d5bbfbabefe1de7107d897c68b81e6b460
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b4ced82a657..aea55b5903dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,20 +6,20 @@ _name=compiz
 pkgname=compiz-manjaro
 _series=0.9.12
 pkgver=${_series}.2
-pkgrel=5
+pkgrel=6
 _greybirdver=1.6.2
 pkgdesc="OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE."
 arch=('i686' 'x86_64')
 url="https://launchpad.net/${_name}"
 license=('GPL' 'LGPL' 'MIT')
-depends=('boost' 'xorg-server' 'libxcomposite' 'startup-notification' 'librsvg' 'dbus' 'mesa' 'libxslt' 'fuse' 'glibmm' 'libxrender' 'libwnck3' 'pygtk' 'desktop-file-utils' 'pyrex' 'protobuf' 'metacity>=3.16.0' 'glu' 'libsm' 'dconf')
+depends=('boost' 'xorg-server' 'libxcomposite' 'startup-notification' 'librsvg' 'dbus' 'mesa' 'libxslt' 'fuse' 'glibmm' 'libxrender' 'libwnck3' 'pygtk' 'desktop-file-utils' 'pyrex' 'protobuf' 'metacity>=3.16.0' 'glu' 'libsm' 'dconf' 'zenity')
 makedepends=('cmake' 'intltool')
 optdepends=(
   'xorg-xprop: grab various window properties for use in window matching rules'
 )
 conflicts=('compiz' 'compiz09-manjaro-test' 'compiz-core-bzr' 'compiz-core-devel' 'compiz-core' 'compiz-gtk-standalone' 'compiz-xfce' 'compiz-mate'
-           'compiz-core-mate' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-unsupported' 'compiz-decorator-gtk'
-           'compiz-decorator-kde' 'libcompizconfig' 'compizconfig-python' 'compizconfig-backend-gconf' 'compiz-bcop' 'ccsm')
+           'compiz-core-mate' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-unsupported' 'compiz-fusion-plugins-experimental'
+           'compiz-decorator-gtk' 'compiz-decorator-kde' 'libcompizconfig' 'compizconfig-python' 'compizconfig-backend-gconf' 'compiz-bcop' 'ccsm')
 replaces=('compiz09-manjaro-test')
 provides=("${_name}=${pkgver}")
 source=("${url}/${_series}/${pkgver}/+download/${_name}-${pkgver}.tar.bz2"
@@ -53,9 +53,9 @@ sha256sums=('8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80'
             '443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288'
             '04c7d417602c144313e808d5e1bde198ee677412c97d7405cf6092e8794f95b7'
             '0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889'
-            'a9caa25aa72c1d28e7f3660ac89404e0bae8085b71626fc1c97db1956eea8bec'
+            'bc4643f94e0eca255e7e97968f928da11c33fb27944c1ca4f9c61ea3dafc7f42'
             'd23b8633186bb3a2a841734ad0b917500f3536a67046f5d8fbb08818eab59160'
-            '38ef826430307958722fa6d3553adf5a6e2bc793d7f1b55d4c66c5e51a60b385'
+            '5c471a34a1d79a45e8c4a924f0f58d71199328e45c80472fe32ecaac76c987ee'
             '02eec20f75eb1f9571a2cf92013fc3c78d13c155a8ede0467cc10b83cdeba43c'
             '473a38b379381311b68dcc579005c0d5bbfbabefe1de7107d897c68b81e6b460')
 install="${pkgname}.install"
diff --git a/compiz-xfce-autostart-setup b/compiz-xfce-autostart-setup
index 3b5ca29e9c11..0ddb6cdc8d93 100755
--- a/compiz-xfce-autostart-setup
+++ b/compiz-xfce-autostart-setup
@@ -9,7 +9,15 @@ elif [ "$(xfconf-query -c xsettings -p /Net/ThemeName)" == "Vertex-Maia-Square"
 	gsettings set org.gnome.metacity theme "Vertex-Maia-Square"
 fi
 
+mkdir -p ~/.local/bin
 mkdir -p ~/.config/autostart
+
+rm ~/.local/bin/compiz-xfce-uninstall-helper
+cp /usr/bin/compiz-xfce-uninstall-helper ~/.local/bin/
+rm ~/.config/autostart/compiz-xfce-uninstall-helper.desktop
+cp /etc/xdg/autostart/compiz-xfce-uninstall-helper.desktop ~/.config/autostart/
+sed -i 's|Exec=compiz-xfce-uninstall-helper|Exec=sh -c ~/.local/bin/compiz-xfce-uninstall-helper|' ~/.config/autostart/compiz-xfce-uninstall-helper.desktop
+
 rm ~/.config/autostart/compiz-xfce-autostart-setup.desktop
 cp /etc/xdg/autostart/compiz-xfce-autostart-setup.desktop ~/.config/autostart/
 sed -i 's|Hidden=false|Hidden=true|' ~/.config/autostart/compiz-xfce-autostart-setup.desktop
diff --git a/compiz-xfce-uninstall-helper b/compiz-xfce-uninstall-helper
index ea37f5749233..fa1aebfe83fb 100644
--- a/compiz-xfce-uninstall-helper
+++ b/compiz-xfce-uninstall-helper
@@ -12,11 +12,4 @@ if [ ! -f /usr/bin/compiz ]; then
    rm ~/.config/autostart/compiz-xfce-autostart.desktop
    
    rm ~/.local/bin/compiz-xfce-uninstall-helper
-elif [ ! -f ~/.config/autostart/compiz-xfce-uninstall-helper.desktop ]; then
-   mkdir -p ~/.local/bin
-   mkdir -p ~/.config/autostart
-   rm ~/.local/bin/compiz-xfce-uninstall-helper
-   cp /usr/bin/compiz-xfce-uninstall-helper ~/.local/bin/
-   cp /etc/xdg/autostart/compiz-xfce-uninstall-helper.desktop ~/.config/autostart/
-   sed -i 's|Exec=compiz-xfce-uninstall-helper|Exec=sh -c ~/.local/bin/compiz-xfce-uninstall-helper|' ~/.config/autostart/compiz-xfce-uninstall-helper.desktop
 fi