fix build and adjust install file for pacman hooks

4 files changed, 20 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d481b7dd47b..7e2a6b34c7e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 5.0.1
-# Sun Apr 10 23:23:39 UTC 2016
+# Mon May  9 13:22:16 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
@@ -66,6 +66,7 @@ pkgbase = compiz-manjaro
 	source = cmake3.patch
 	source = cube-texture.patch
 	source = marco-in-mate.patch
+	source = trailfocus-fix.patch
 	source = compiz-manjaro-defaults.patch
 	source = compiz-manjaro.gschema.override
 	source = compiz-gtk-decorator-theme-selector
@@ -84,6 +85,7 @@ pkgbase = compiz-manjaro
 	sha256sums = e5016fd62f9c9659d887eeafd556c18350615cd6d185c8ffa08825465890c5e0
 	sha256sums = 81780f8c56f5b27b09394ae9ed59d10ae50c58f9ade445e9f85d7c2a00445f7e
 	sha256sums = 0d7474aee60c1a482cf26d5d0be6ec2e1b1067fa1d601fdf4aa19a71b07e41d3
+	sha256sums = 01e94ac52cd39eb5462a8505c7df61c7b14b05159de64f8700dfadb524bdb2ce
 	sha256sums = cdc9eeaa213dbde3bceb2d0a73171ed319929b6a5146ff55fcd4f17df7b25d13
 	sha256sums = 443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288
 	sha256sums = 04c7d417602c144313e808d5e1bde198ee677412c97d7405cf6092e8794f95b7
diff --git a/PKGBUILD b/PKGBUILD
index aea55b5903dc..a6cd55be8e4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,6 +31,7 @@ source=("${url}/${_series}/${pkgver}/+download/${_name}-${pkgver}.tar.bz2"
         "cmake3.patch"
         "cube-texture.patch"
         "marco-in-mate.patch"
+        "trailfocus-fix.patch"
         "${pkgname}-defaults.patch"
         "${pkgname}.gschema.override"
         "compiz-gtk-decorator-theme-selector"
@@ -49,6 +50,7 @@ sha256sums=('8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80'
             'e5016fd62f9c9659d887eeafd556c18350615cd6d185c8ffa08825465890c5e0'
             '81780f8c56f5b27b09394ae9ed59d10ae50c58f9ade445e9f85d7c2a00445f7e'
             '0d7474aee60c1a482cf26d5d0be6ec2e1b1067fa1d601fdf4aa19a71b07e41d3'
+            '01e94ac52cd39eb5462a8505c7df61c7b14b05159de64f8700dfadb524bdb2ce'
             'cdc9eeaa213dbde3bceb2d0a73171ed319929b6a5146ff55fcd4f17df7b25d13'
             '443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288'
             '04c7d417602c144313e808d5e1bde198ee677412c97d7405cf6092e8794f95b7'
@@ -96,6 +98,9 @@ prepare() {
   
   # Use the Marco gsettings in MATE session (commits 3997+4002)
   patch -p1 -i "${srcdir}/marco-in-mate.patch"
+
+  # Fix ambiguous function call in trailfocus plugin
+  patch -p1 -i "${srcdir}/trailfocus-fix.patch"
   
   # Manjaro defaults
   patch -p1 -i "${srcdir}/${pkgname}-defaults.patch"
diff --git a/compiz-manjaro.install b/compiz-manjaro.install
index 150d7a876e8d..50bdaf860d45 100644
--- a/compiz-manjaro.install
+++ b/compiz-manjaro.install
@@ -1,15 +1,4 @@
 post_install() {
-    echo "  -> Updating icon cache..."
-    gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-    echo "  -> Updating XDG menu database..."
-    update-desktop-database -q
-
-    ls /usr/share/glib-2.0/schemas 2>/dev/null | grep -qm1 org.compiz
-    if [ $? -eq 0 ]; then
-        echo "  -> Recompiling the GSettings database... "
-        glib-compile-schemas /usr/share/glib-2.0/schemas
-    fi
-    
      echo ""
      echo "***  Xfce and MATE users just log out    ***"
      echo "***  and back in, Compiz will autostart  ***"
@@ -22,28 +11,3 @@ pre_upgrade() {
    	    gconfpkg --uninstall compiz
     fi
 }
-
-post_upgrade() {
-    echo "  -> Updating icon cache..."
-    gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-    echo "  -> Updating XDG menu database..."
-    update-desktop-database -q
-
-    ls /usr/share/glib-2.0/schemas 2>/dev/null | grep -qm1 org.compiz
-    if [ $? -eq 0 ]; then
-        echo "  -> Recompiling the GSettings database... "
-        glib-compile-schemas /usr/share/glib-2.0/schemas
-    fi
-}
-
-post_remove() {
-    echo "  -> Updating icon cache..."
-    gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor    
-    echo " -> Updating XDG menu database..."
-    update-desktop-database -q
-
-    if [ -d /usr/share/glib-2.0/schemas ]; then
-        echo "  -> Recompiling the GSettings database... "
-        glib-compile-schemas /usr/share/glib-2.0/schemas
-    fi
-}
diff --git a/trailfocus-fix.patch b/trailfocus-fix.patch
new file mode 100644
index 000000000000..2300e57a1ddf
--- /dev/null
+++ b/trailfocus-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur original/plugins/trailfocus/src/trailfocus.cpp modified/plugins/trailfocus/src/trailfocus.cpp
+--- original/plugins/trailfocus/src/trailfocus.cpp	2015-08-20 14:01:09.000000000 +0100
++++ modified/plugins/trailfocus/src/trailfocus.cpp	2016-05-08 13:57:35.867366143 +0100
+@@ -195,7 +195,7 @@
+ 	}
+ 	else
+ 	{
+-	    distance = abs (cur->activeNum () - best->activeNum ());
++	    distance = abs ((int)(cur->activeNum () - best->activeNum ()));
+ 	    if (distance < bestDist)
+ 	    {
+ 		best     = cur;