update to 0.9.12.2

author: Rob McCathie 2015-10-07 18:36:27 +1100
committer: Rob McCathie 2015-10-07 18:36:27 +1100
commit: 85302729adc9e89aaa34fc6d07ca5ee68a498303 (patch)
tree: 9a750a9b65d34c89e5de824e303aa310f9bddbe6
parent: 198f19297a4cd81d44e2988452b1b44409a626ca (diff)
download: aur-85302729adc9e89aaa34fc6d07ca5ee68a498303.tar.gz
8 files changed, 373 insertions, 73 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03ca8698de49..fa0a7c6649f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 4.2.1
-# Sun Jul 26 06:42:34 UTC 2015
+# Wed Oct  7 07:07:58 UTC 2015
 pkgbase = compiz-manjaro
 	pkgdesc = OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE.
-	pkgver = 0.9.12.1
-	pkgrel = 5
+	pkgver = 0.9.12.2
+	pkgrel = 1
 	url = https://launchpad.net/compiz
 	install = compiz-manjaro.install
 	arch = i686
@@ -33,8 +33,8 @@ pkgbase = compiz-manjaro
 	depends = glu
 	depends = libsm
 	depends = dconf
-	provides = compiz=0.9.12.1
-	provides = compiz-core-devel=0.9.12.1
+	optdepends = xorg-xprop: grab various window properties for use in window matching rules
+	provides = compiz=0.9.12.2
 	conflicts = compiz
 	conflicts = compiz09-manjaro-test
 	conflicts = compiz-core-bzr
@@ -55,9 +55,12 @@ pkgbase = compiz-manjaro
 	conflicts = compiz-bcop
 	conflicts = ccsm
 	replaces = compiz09-manjaro-test
-	source = https://launchpad.net/compiz/0.9.12/0.9.12.1/+download/compiz-0.9.12.1.tar.bz2
-	source = set-gwd-default.patch
+	source = https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2
 	source = focus-prevention-disable.patch
+	source = gtk-extents.patch
+	source = xfce4-notifyd-nofade.patch
+	source = c++11.patch
+	source = switcher-background.patch
 	source = compiz-manjaro-defaults.patch
 	source = compiz-manjaro.gschema.override
 	source = compiz-gtk-decorator-theme-selector
@@ -72,23 +75,26 @@ pkgbase = compiz-manjaro
 	source = compiz-manjaro-mate-decoratortheme.desktop
 	source = greybird-1.5.3.tar.gz::https://github.com/shimmerproject/Greybird/archive/v1.5.3.tar.gz
 	source = metacity-3_16.patch
-	sha1sums = 4ccbc1fc3728ded896f14e11db121bf771cec59f
-	sha1sums = be585a68eacf93a1064ea914a927623c3e774b95
-	sha1sums = b74ab025a89419c23d6f01c41e414281e1a2382f
-	sha1sums = 1996419be45490410887385975cbbebfa15a539a
-	sha1sums = e54a97ebda168c507457feee5e5085bd2ae98546
-	sha1sums = 45b98fd5e238a595e3a60741106193321bebdf64
-	sha1sums = f7e1544f8e6987f86c1b2c3e69b70d2accf95bc9
-	sha1sums = b428f171ab8b34b236aed9954867102bdd33f9da
-	sha1sums = a790b6556695b06af4eff910e7dc409aab85f9a8
-	sha1sums = 4b4fa287ea72f8b8eccdf4254dfe2174d9b41b2a
-	sha1sums = 847d498050e96fbb1a43c29a0f98b70a74319203
-	sha1sums = 36b8c620e00cfd7d9099c02589cab6906f483e53
-	sha1sums = 56146a4fc169f46504eaa86ca240de34c4bb1fd8
-	sha1sums = 8eff3fedffb543960ebfc19b15e95d7f7a90ee50
-	sha1sums = 890b02696130b8275104aaea110b9beb3a162dce
-	sha1sums = ebc447a9c13b6c8563fec789d290354b3d7c8230
-	sha1sums = 699ca81225749cc9a1b8906f5c5d30fdb649b5ef
+	sha256sums = 8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80
+	sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
+	sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
+	sha256sums = 273aa79cb0887922e3a73fbbe97596495cee19ca6f4bd716c6c7057f323d8198
+	sha256sums = eb8b432050d1eed9cb1d5f33d2645f81e2bdce2bf55d5cc779986bb751373a45
+	sha256sums = e3125ed3a7e87a7d4bdaa23f1b6f654a02d0b050ad7a694ce9165fff2c6ff310
+	sha256sums = cdc9eeaa213dbde3bceb2d0a73171ed319929b6a5146ff55fcd4f17df7b25d13
+	sha256sums = 443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288
+	sha256sums = 4f57ce60785f7b3dd18c7fc29edcfc9004688d2227bbff724ecb4db1200a5ac2
+	sha256sums = 0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889
+	sha256sums = d8205f6a9e69f904d17bce276941c10ad3d4a767be31d875a951ed7ddc26fd62
+	sha256sums = 8938f927c0f0ee5a9e83489dd66939588ebe4ad65bb59b483a54991421836a53
+	sha256sums = 1000b69dbbdfbf67d309e14f040e2b74ec6e1e25cd2316406ae15ae839e01f37
+	sha256sums = 2c225942951642b0afa6ee0ddc2f3bb312bf3c20e135736851f5772378823b11
+	sha256sums = 4dff6abcf5455c9f91866d031d3c41ed8ae4bd2ca0f4561f3afb8e2605f2176a
+	sha256sums = dc7d2f58e1bfab312d056f02008faecc0bcd572f41065f1e09c077c62c3f65ca
+	sha256sums = 71d8a014695b23807e3c758e96045b2180c4d8d9ef501f1dded54f9232e1e1eb
+	sha256sums = a992819fd34c4a9c256519c081e53047ef6527662ae989f4cb0e575fd1592115
+	sha256sums = 856f092ebd199a2a28346938a3dfe62613135ad886c25bbaeebd3a917de4c962
+	sha256sums = 27e7c516c22947a28bb1f34ecc63142fc1a6b8178439a04660f7ae0968bdc57c
 
 pkgname = compiz-manjaro
 
diff --git a/PKGBUILD b/PKGBUILD
index db284f3413c4..2672bb59a5eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,29 @@
 _name=compiz
 pkgname=compiz-manjaro
 _series=0.9.12
-pkgver=${_series}.1
-pkgrel=5
+pkgver=${_series}.2
+pkgrel=1
 _greybirdver=1.5.3
 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')
 makedepends=('cmake' 'intltool')
-#optdepends=()
+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')
 replaces=('compiz09-manjaro-test')
-provides=("${_name}=${pkgver}" "${_name}-core-devel=${pkgver}")
+provides=("${_name}=${pkgver}")
 source=("${url}/${_series}/${pkgver}/+download/${_name}-${pkgver}.tar.bz2"
-        "set-gwd-default.patch"
         "focus-prevention-disable.patch"
+        "gtk-extents.patch"
+        "xfce4-notifyd-nofade.patch"
+        "c++11.patch"
+        "switcher-background.patch"
         "${pkgname}-defaults.patch"
         "${pkgname}.gschema.override"
         "compiz-gtk-decorator-theme-selector"
@@ -38,45 +42,58 @@ source=("${url}/${_series}/${pkgver}/+download/${_name}-${pkgver}.tar.bz2"
         "${pkgname}-mate-decoratortheme.desktop"
         "greybird-${_greybirdver}.tar.gz::https://github.com/shimmerproject/Greybird/archive/v${_greybirdver}.tar.gz"
         "metacity-3_16.patch")
-sha1sums=('4ccbc1fc3728ded896f14e11db121bf771cec59f'
-          'be585a68eacf93a1064ea914a927623c3e774b95'
-          'b74ab025a89419c23d6f01c41e414281e1a2382f'
-          '1996419be45490410887385975cbbebfa15a539a'
-          'e54a97ebda168c507457feee5e5085bd2ae98546'
-          '45b98fd5e238a595e3a60741106193321bebdf64'
-          'f7e1544f8e6987f86c1b2c3e69b70d2accf95bc9'
-          'b428f171ab8b34b236aed9954867102bdd33f9da'
-          'a790b6556695b06af4eff910e7dc409aab85f9a8'
-          '4b4fa287ea72f8b8eccdf4254dfe2174d9b41b2a'
-          '847d498050e96fbb1a43c29a0f98b70a74319203'
-          '36b8c620e00cfd7d9099c02589cab6906f483e53'
-          '56146a4fc169f46504eaa86ca240de34c4bb1fd8'
-          '8eff3fedffb543960ebfc19b15e95d7f7a90ee50'
-          '890b02696130b8275104aaea110b9beb3a162dce'
-          'ebc447a9c13b6c8563fec789d290354b3d7c8230'
-          '699ca81225749cc9a1b8906f5c5d30fdb649b5ef')
+sha256sums=('8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80'
+            'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
+            '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
+            '273aa79cb0887922e3a73fbbe97596495cee19ca6f4bd716c6c7057f323d8198'
+            'eb8b432050d1eed9cb1d5f33d2645f81e2bdce2bf55d5cc779986bb751373a45'
+            'e3125ed3a7e87a7d4bdaa23f1b6f654a02d0b050ad7a694ce9165fff2c6ff310'
+            'cdc9eeaa213dbde3bceb2d0a73171ed319929b6a5146ff55fcd4f17df7b25d13'
+            '443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288'
+            '4f57ce60785f7b3dd18c7fc29edcfc9004688d2227bbff724ecb4db1200a5ac2'
+            '0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889'
+            'd8205f6a9e69f904d17bce276941c10ad3d4a767be31d875a951ed7ddc26fd62'
+            '8938f927c0f0ee5a9e83489dd66939588ebe4ad65bb59b483a54991421836a53'
+            '1000b69dbbdfbf67d309e14f040e2b74ec6e1e25cd2316406ae15ae839e01f37'
+            '2c225942951642b0afa6ee0ddc2f3bb312bf3c20e135736851f5772378823b11'
+            '4dff6abcf5455c9f91866d031d3c41ed8ae4bd2ca0f4561f3afb8e2605f2176a'
+            'dc7d2f58e1bfab312d056f02008faecc0bcd572f41065f1e09c077c62c3f65ca'
+            '71d8a014695b23807e3c758e96045b2180c4d8d9ef501f1dded54f9232e1e1eb'
+            'a992819fd34c4a9c256519c081e53047ef6527662ae989f4cb0e575fd1592115'
+            '856f092ebd199a2a28346938a3dfe62613135ad886c25bbaeebd3a917de4c962'
+            '27e7c516c22947a28bb1f34ecc63142fc1a6b8178439a04660f7ae0968bdc57c')
 install="${pkgname}.install"
 
 prepare() {
   cd "${_name}-${pkgver}"
-
-  # Set gtk-window-decorator as default in the Window Decoration plugin
-  patch -p1 -i "${srcdir}/set-gwd-default.patch"
+  
+  # Fix decorator start command
+  sed -i 's/exec \\"${COMPIZ_BIN_PATH}compiz-decorator\\"/exec \/usr\/bin\/compiz-decorator/g' plugins/decor/decor.xml.in
 
   # Set focus prevention level to off which means that new windows will always get focus
   patch -p1 -i "${srcdir}/focus-prevention-disable.patch"
   
-  # Manjaro defaults
-  patch -p1 -i "${srcdir}/${pkgname}-defaults.patch"
-
+  # Use Python 2
   find -type f \( -name 'CMakeLists.txt' -or -name '*.cmake' \) -exec sed -e 's/COMMAND python/COMMAND python2/g' -i {} \;
   find compizconfig/ccsm -type f -exec sed -e 's|^#!.*python|#!/usr/bin/env python2|g' -i {} \;
   
   # Fix Python build directory with CMake 3.2
   sed -i 's/${PY_BUILD_DIR}/lib/g' compizconfig/ccsm/CMakeLists.txt
   
-  # Metacity 3.16 compatibility
-  patch -Np1 -i "${srcdir}/metacity-3_16.patch"
+  # Fix incorrect extents for GTK+ tooltips, csd etc
+  patch -p1 -i "${srcdir}/gtk-extents.patch"
+
+  # Ensure xfce4 notifications are not 'double faded'
+  patch -p1 -i "${srcdir}/xfce4-notifyd-nofade.patch"
+
+  # Use C++11 (pre-requisite for switcher-background.patch)
+  patch -p1 -i "${srcdir}/c++11.patch"
+
+  # Allow user to change switcher background colour (fixes blank background for Emerald)
+  patch -p1 -i "${srcdir}/switcher-background.patch"
+  
+  # Manjaro defaults
+  patch -p1 -i "${srcdir}/${pkgname}-defaults.patch"
 }
 
 build() {
@@ -90,9 +107,6 @@ build() {
     -DCMAKE_BUILD_TYPE="Release" \
     -DCMAKE_INSTALL_PREFIX="/usr" \
     -DCMAKE_INSTALL_LIBDIR="/usr/lib" \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
     -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On \
     -DCOMPIZ_BUILD_WITH_RPATH=Off \
     -DCOMPIZ_PACKAGING_ENABLED=On \
@@ -103,7 +117,8 @@ build() {
     -DUSE_GSETTINGS=On \
     -DCOMPIZ_BUILD_TESTING=Off \
     -DCOMPIZ_WERROR=Off \
-    -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,expo,grid,regex,animation,ccp"
+    -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,expo,grid,regex,animation,ccp" \
+    -DCOMPIZ_DISABLE_PLUGIN_DBUS=On
   
   make
 }
diff --git a/c++11.patch b/c++11.patch
new file mode 100644
index 000000000000..13aaa7fefe1b
--- /dev/null
+++ b/c++11.patch
@@ -0,0 +1,104 @@
+=== modified file 'cmake/CompizCommon.cmake'
+--- a/cmake/CompizCommon.cmake	2015-07-30 19:36:21 +0000
++++ b/cmake/CompizCommon.cmake	2015-07-30 20:16:16 +0000
+@@ -84,7 +84,7 @@
+ endif ()
+ 
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -std=c++11")
+ 
+ set (COMMON_LINKER_FLAGS "-Wl,-zdefs")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
+
+=== modified file 'compizconfig/gsettings/mocks/CMakeLists.txt'
+--- a/compizconfig/gsettings/mocks/CMakeLists.txt	2012-10-08 13:50:56 +0000
++++ b/compizconfig/gsettings/mocks/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -8,7 +8,7 @@
+ 			 ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared
+ 			 ${GLIB_INCLUDE_DIRS})
+ 
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+     add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
+ 	         ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
+
+=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
+--- a/compizconfig/gsettings/tests/CMakeLists.txt	2013-07-17 06:06:08 +0000
++++ b/compizconfig/gsettings/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -17,7 +17,7 @@
+ 
+ if (COMPIZCONFIG_TEST_GSETTINGS_FOUND)
+ 
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+     link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
+     link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments)
+
+=== modified file 'compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt'
+--- a/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt	2013-05-13 13:41:19 +0000
++++ b/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -11,7 +11,7 @@
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting
+ 		${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp)
+
+=== modified file 'compizconfig/integration/gnome/tests/CMakeLists.txt'
+--- a/compizconfig/integration/gnome/tests/CMakeLists.txt	2013-05-13 13:42:28 +0000
++++ b/compizconfig/integration/gnome/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -8,7 +8,7 @@
+ include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
+ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c)
+
+=== modified file 'compizconfig/integration/mate/gsettings/tests/CMakeLists.txt'
+--- a/compizconfig/integration/mate/gsettings/tests/CMakeLists.txt	2015-02-04 22:20:18 +0000
++++ b/compizconfig/integration/mate/gsettings/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -11,7 +11,7 @@
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_executable (compizconfig_test_ccs_mate_gsettings_integrated_setting
+ 		${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_mate_gsettings_integrated_setting.cpp)
+
+=== modified file 'compizconfig/integration/mate/tests/CMakeLists.txt'
+--- a/compizconfig/integration/mate/tests/CMakeLists.txt	2015-02-04 22:20:18 +0000
++++ b/compizconfig/integration/mate/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -8,7 +8,7 @@
+ include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests)
+ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_library (compizconfig_ccs_mock_mate_integrated_setting_composition
+ 	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_mate_integrated_setting_composition.c)
+
+=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
+--- a/compizconfig/libcompizconfig/tests/CMakeLists.txt	2013-07-17 06:06:08 +0000
++++ b/compizconfig/libcompizconfig/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+@@ -9,7 +9,7 @@
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
+ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ add_definitions (-DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\")
+ 
+
diff --git a/compiz-manjaro-defaults.patch b/compiz-manjaro-defaults.patch
index 71bf48fa5275..7c216d57af54 100644
--- a/compiz-manjaro-defaults.patch
+++ b/compiz-manjaro-defaults.patch
@@ -49,7 +49,7 @@ diff -Naur a/plugins/animation/animation.xml.in b/plugins/animation/animation.xm
 -	      <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
 +	      <value>(type=Normal) &amp; !(name=gnome-screensaver)</value>
 +	      <value>(type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Unknown)</value>
- 	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
+ 	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd) &amp; !(name=xfce4-notifyd)</value>
  	    </default>
  	  </option>
 @@ -168,7 +168,7 @@
diff --git a/gtk-extents.patch b/gtk-extents.patch
new file mode 100644
index 000000000000..5c8ec1ec2049
--- /dev/null
+++ b/gtk-extents.patch
@@ -0,0 +1,13 @@
+# Diff from https://code.launchpad.net/~albertsmuktupavels/compiz/add-gtk-frame-extents-to-net-supported/+merge/257303
+=== modified file 'src/screen.cpp'
+--- a/src/screen.cpp	2014-12-02 19:37:10 +0000
++++ b/src/screen.cpp	2015-04-23 20:41:24 +0000
+@@ -2362,6 +2362,7 @@
+ 
+     atoms.push_back (Atoms::wmUserTime);
+     atoms.push_back (Atoms::frameExtents);
++    atoms.push_back (Atoms::frameGtkExtents);
+     atoms.push_back (Atoms::frameWindow);
+ 
+     atoms.push_back (Atoms::winState);
+
diff --git a/set-gwd-default.patch b/set-gwd-default.patch
deleted file mode 100644
index 624cffbdd5f5..000000000000
--- a/set-gwd-default.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in
---- original/plugins/decor/decor.xml.in	2013-07-23 20:58:03.000000000 +0100
-+++ modified/plugins/decor/decor.xml.in	2014-06-11 00:01:50.332286339 +0100
-@@ -101,7 +101,7 @@
- 	    <option name="command" type="string">
- 		<_short>Command</_short>
- 		<_long>Decorator command line that is executed if no decorator is already running.</_long>
--		<default>exec \"${COMPIZ_BIN_PATH}compiz-decorator\"</default>
-+		<default>gtk-window-decorator</default>
- 	    </option>
- 	    <option name="mipmap" type="bool">
- 		<_short>Mipmap</_short>
diff --git a/switcher-background.patch b/switcher-background.patch
new file mode 100644
index 000000000000..5ed29bd85f35
--- /dev/null
+++ b/switcher-background.patch
@@ -0,0 +1,162 @@
+=== modified file 'plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h'
+--- a/plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h	2013-10-31 15:59:14 +0000
++++ b/plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h	2015-08-22 21:46:01 +0000
+@@ -63,7 +63,7 @@
+     AllViewports,
+     Panels,
+     Group
+-} SwitchWindowSelection;	    
++} SwitchWindowSelection;
+ 
+ class BaseSwitchScreen
+ {
+@@ -75,6 +75,7 @@
+ 	void setSelectedWindowHint (bool focus);
+ 	void activateEvent (bool activating);
+ 	void updateForegroundColor ();
++	void updateBackground (bool useBackgroundColor, unsigned short backgroundColor[]);
+ 
+ 	CompWindow *switchToWindow (bool toNext, bool autoChangeVPOption, bool focus);
+ 	static bool compareWindows (CompWindow *w1, CompWindow *w2);
+
+=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
+--- a/plugins/compiztoolbox/src/compiztoolbox.cpp	2013-05-12 08:13:05 +0000
++++ b/plugins/compiztoolbox/src/compiztoolbox.cpp	2015-08-22 21:46:01 +0000
+@@ -124,6 +124,24 @@
+     return "";
+ }
+ 
++void
++BaseSwitchScreen::updateBackground(bool           useBackgroundColor,
++				   unsigned short backgroundColor[])
++{
++    if (!popupWindow)
++	return;
++
++    unsigned long  background_pixel = 0ul;
++    if (useBackgroundColor)
++    {
++	background_pixel = ((((static_cast<unsigned long>(backgroundColor [3]) * backgroundColor [2]) >> 24) & 0x0000ff) |
++	(((backgroundColor [3] * backgroundColor [1]) >> 16) & 0x00ff00) |
++	(((backgroundColor [3] * backgroundColor [0]) >> 8) & 0xff0000) |
++	(((backgroundColor [3] & 0xff00) << 16)));
++    }
++
++    XSetWindowBackground (screen->dpy(), popupWindow, background_pixel);
++}
+ 
+ void
+ BaseSwitchScreen::setSelectedWindowHint (bool focus)
+
+=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
+--- a/plugins/staticswitcher/src/staticswitcher.cpp	2013-06-11 04:45:57 +0000
++++ b/plugins/staticswitcher/src/staticswitcher.cpp	2015-08-22 21:46:01 +0000
+@@ -286,6 +286,7 @@
+ 			 (unsigned char *) &Atoms::winTypeUtil, 1);
+ 
+ 	::screen->setWindowProp (popupWindow, Atoms::winDesktop, 0xffffffff);
++	updateBackground(optionGetUseBackgroundColor(), optionGetBackgroundColor());
+ 
+ 	setSelectedWindowHint (false);
+ 
+@@ -1357,6 +1358,10 @@
+     move (0),
+     mouseSelect (false)
+ {
++    auto bgUpdater = [=] (...){ this->updateBackground (this->optionGetUseBackgroundColor (), this->optionGetBackgroundColor ());};
++    optionSetUseBackgroundColorNotify (bgUpdater);
++    optionSetBackgroundColorNotify (bgUpdater);
++
+ #define SWITCHBIND(a,b,c) boost::bind (switchInitiateCommon, _1, _2, _3, a, b, c)
+ 
+     optionSetNextButtonInitiate (SWITCHBIND (CurrentViewport, true, true));
+
+=== modified file 'plugins/staticswitcher/staticswitcher.xml.in'
+--- a/plugins/staticswitcher/staticswitcher.xml.in	2012-10-15 10:31:51 +0000
++++ b/plugins/staticswitcher/staticswitcher.xml.in	2015-08-22 21:46:01 +0000
+@@ -293,6 +293,24 @@
+ 			</default>
+ 		    </option>
+ 		</subgroup>
++		<subgroup>
++		    <_short>Background</_short>
++		    <option name="use_background_color" type="bool">
++			<_short>Set background color</_short>
++			<_long>Set background color</_long>
++			<default>false</default>
++		    </option>
++		    <option name="background_color" type="color">
++			<_short>Background Color</_short>
++			<_long>Background color of the switcher window.</_long>
++			<default>
++			    <red>0x3333</red>
++			    <green>0x3333</green>
++			    <blue>0x3333</blue>
++			    <alpha>0xd998</alpha>
++			</default>
++		    </option>
++		</subgroup>
+ 	    </group>
+ 	</options>
+     </plugin>
+
+=== modified file 'plugins/switcher/src/switcher.cpp'
+--- a/plugins/switcher/src/switcher.cpp	2015-07-25 20:01:51 +0000
++++ b/plugins/switcher/src/switcher.cpp	2015-08-22 21:46:01 +0000
+@@ -66,7 +66,6 @@
+      (WIDTH >> 1), HEIGHT - BOX_WIDTH, 0.0f,
+ };
+ 
+-
+ void
+ SwitchScreen::updateWindowList (int count)
+ {
+@@ -300,6 +299,7 @@
+ 			 (unsigned char *) &Atoms::winTypeUtil, 1);
+ 
+ 	screen->setWindowProp (popupWindow, Atoms::winDesktop, 0xffffffff);
++        updateBackground (optionGetUseBackgroundColor (), optionGetBackgroundColor ());
+ 
+ 	setSelectedWindowHint (false);
+     }
+@@ -1123,6 +1123,10 @@
+ 
+     optionSetZoomNotify (boost::bind (&SwitchScreen::setZoom, this));
+ 
++    auto bgUpdater = [=] (...){ this->updateBackground (this->optionGetUseBackgroundColor (), this->optionGetBackgroundColor ());};
++    optionSetUseBackgroundColorNotify (bgUpdater);
++    optionSetBackgroundColorNotify (bgUpdater);
++
+ #define SWITCHBIND(a,b,c) boost::bind (switchInitiateCommon, _1, _2, _3, a, b, c)
+ 
+     optionSetNextButtonInitiate (SWITCHBIND (CurrentViewport, true, true));
+
+=== modified file 'plugins/switcher/switcher.xml.in'
+--- a/plugins/switcher/switcher.xml.in	2012-10-15 10:31:51 +0000
++++ b/plugins/switcher/switcher.xml.in	2015-08-22 21:46:01 +0000
+@@ -166,6 +166,24 @@
+ 		<_long>Rotate to the selected window while switching</_long>
+ 		<default>false</default>
+ 	    </option>
++	    <subgroup>
++		<_short>Background</_short>
++		<option name="use_background_color" type="bool">
++		    <_short>Set background color</_short>
++		    <_long>Set background color</_long>
++		    <default>false</default>
++		</option>
++		<option name="background_color" type="color">
++		    <_short>Background Color</_short>
++		    <_long>Background color of the switcher window.</_long>
++		    <default>
++			<red>0x3333</red>
++			<green>0x3333</green>
++			<blue>0x3333</blue>
++			<alpha>0xd998</alpha>
++		    </default>
++		</option>
++	    </subgroup>
+ 	</options>
+     </plugin>
+ </compiz>
+
diff --git a/xfce4-notifyd-nofade.patch b/xfce4-notifyd-nofade.patch
new file mode 100644
index 000000000000..0618604b4a11
--- /dev/null
+++ b/xfce4-notifyd-nofade.patch
@@ -0,0 +1,12 @@
+diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in
+--- original/plugins/animation/animation.xml.in	2015-08-20 14:01:09.000000000 +0100
++++ modified/plugins/animation/animation.xml.in	2015-09-14 14:12:42.950728084 +0100
+@@ -126,7 +126,7 @@
+ 	    <default>
+ 	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
+ 	      <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
+-	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
++	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd) &amp; !(name=xfce4-notifyd)</value>
+ 	    </default>
+ 	  </option>
+ 	  <option name="close_options" type="list">
author	Rob McCathie	2015-10-07 18:36:27 +1100
committer	Rob McCathie	2015-10-07 18:36:27 +1100
commit	85302729adc9e89aaa34fc6d07ca5ee68a498303 (patch)
tree	9a750a9b65d34c89e5de824e303aa310f9bddbe6
parent	198f19297a4cd81d44e2988452b1b44409a626ca (diff)
download	aur-85302729adc9e89aaa34fc6d07ca5ee68a498303.tar.gz