add fix for double fading xfce4-notifyd notifications.

3 files changed, 25 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1aaab315b18..74f03f301337 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = compiz-bzr
 	pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM (development version)
-	pkgver = 3971
-	pkgrel = 3
+	pkgver = 3977
+	pkgrel = 1
 	url = https://launchpad.net/compiz
 	install = compiz-bzr.install
 	arch = i686
@@ -39,9 +39,11 @@ pkgbase = compiz-bzr
 	source = compiz::bzr+http://bazaar.launchpad.net/~compiz-team/compiz/0.9.12/
 	source = focus-prevention-disable.patch
 	source = gtk-extents.patch
+	source = xfce4-notifyd-nofade.patch
 	sha256sums = SKIP
 	sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
 	sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
+	sha256sums = 273aa79cb0887922e3a73fbbe97596495cee19ca6f4bd716c6c7057f323d8198
 
 pkgname = compiz-bzr
 
diff --git a/PKGBUILD b/PKGBUILD
index 587081c83636..739909c2eaba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Iven Hsu <ivenvd AT gmail>
 
 pkgname=compiz-bzr
-pkgver=3971
-pkgrel=3
+pkgver=3977
+pkgrel=1
 _bzrname=compiz
 _bzrbranch=0.9.12
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM (development version)"
@@ -20,10 +20,12 @@ conflicts=('compiz-core' 'compiz')
 provides=("compiz=$_bzrbranch")
 source=("$_bzrname::bzr+http://bazaar.launchpad.net/~compiz-team/$_bzrname/$_bzrbranch/"
         "focus-prevention-disable.patch"
-        "gtk-extents.patch")
+        "gtk-extents.patch"
+        "xfce4-notifyd-nofade.patch")
 sha256sums=('SKIP'
             'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
-            '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9')
+            '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
+            '273aa79cb0887922e3a73fbbe97596495cee19ca6f4bd716c6c7057f323d8198')
 install='compiz-bzr.install'
 
 pkgver() {
@@ -49,6 +51,9 @@ prepare() {
 
   # Fix incorrect extents for GTK+ tooltips, csd etc
   patch -Np1 -i "${srcdir}/gtk-extents.patch"
+
+  # Ensure xfce4 notifications are not 'double faded'
+  patch -Np1 -i "${srcdir}/xfce4-notifyd-nofade.patch"
 }
 
 build() {
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">