[SCM] marco Debian package branch, master, updated. debian/1.8.2+dfsg1-1-5-g30b1f48

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=a3db334

The following commit has been merged in the master branch:
commit a3db334e315f6fae0e816c1a1c4174f02754a384
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 23 01:16:49 2014 +0200

    debian/patches: Add 0003_no-shadows-to-ARGB-windows.patch. Don't add shadows to ARGB windows. Required with latest mate-themes for GTK-3.14.
---
 .../patches/0003_no-shadows-to-ARGB-windows.patch  | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0003_no-shadows-to-ARGB-windows.patch b/debian/patches/0003_no-shadows-to-ARGB-windows.patch
new file mode 100644
index 0000000..55f1987
--- /dev/null
+++ b/debian/patches/0003_no-shadows-to-ARGB-windows.patch
@@ -0,0 +1,26 @@
+From a85010e3060ac3852a16afb8803102d5c1702758 Mon Sep 17 00:00:00 2001
+From: Martin Wimpress <code at flexion.org>
+Date: Tue, 21 Oct 2014 16:32:10 +0100
+Subject: [PATCH] compositor-xrender: don't add shadows to ARGB windows
+
+---
+ src/compositor/compositor-xrender.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
+index 6294e9d..2eff883 100644
+--- a/src/compositor/compositor-xrender.c
++++ b/src/compositor/compositor-xrender.c
+@@ -911,6 +911,12 @@ window_has_shadow (MetaCompWindow *cw)
+       }
+     }
+ 
++  /* Do not add shadows to ARGB windows */
++  if (cw->mode == WINDOW_ARGB) {
++    meta_verbose ("Window has no shadow as it is ARGB
");
++    return FALSE;
++  }
++
+   /* Never put a shadow around shaped windows */
+   if (cw->shaped) {
+     meta_verbose ("Window has no shadow as it is shaped
");
diff --git a/debian/patches/series b/debian/patches/series
index b64fa6a..fb44c82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001_use-zenity-instead-of-mate-dialogs.patch
 0002_update-keybindings-files-with-new-name.patch
+0003_no-shadows-to-ARGB-windows.patch
 2001_omit-gfdl-licensed-theme-documentation.patch

-- 
marco Debian package