[arch-commits] Commit in marco/trunk (2 files)

[Martin Wimpress]

    Date: Tuesday, October 21, 2014 @ 16:29:13
  Author: flexiondotorg
Revision: 121156

upgpkg: marco 1.8.2-2 - Do not add shadows to ARGB windows

Added:
  marco/trunk/do_not_add_shadows_to_ARGB_windows.diff
Modified:
  marco/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   15 ++++++++++++---
 do_not_add_shadows_to_ARGB_windows.diff |   17 +++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-21 13:22:07 UTC (rev 121155)
+++ PKGBUILD	2014-10-21 14:29:13 UTC (rev 121156)
@@ -3,7 +3,7 @@
 
 pkgname=marco
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -17,10 +17,19 @@
 conflicts=('mate-window-manager')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
+        "do_not_add_shadows_to_ARGB_windows.diff")
+sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c'
+          'a2af3d1d6ea6a3b19bf9aa290036b2c7181a3587')
 install=${pkgname}.install
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # Adapted from the commit below to correct drop down menu rendering with GTK 3.14.
+    # - https://git.gnome.org/browse/metacity/commit/?id=a6b29b2d2f6a7787c59cfffdc2bed1b5b5b99244
+    patch -Np1 -i "${srcdir}/do_not_add_shadows_to_ARGB_windows.diff"
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \

Added: do_not_add_shadows_to_ARGB_windows.diff
===================================================================
--- do_not_add_shadows_to_ARGB_windows.diff	                        (rev 0)
+++ do_not_add_shadows_to_ARGB_windows.diff	2014-10-21 14:29:13 UTC (rev 121156)
@@ -0,0 +1,17 @@
+diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
+index dbd7bd9..9bf9d8d 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\n");
++    return FALSE;
++  }
++
+   /* Never put a shadow around shaped windows */
+   if (cw->shaped) {
+     meta_verbose ("Window has no shadow as it is shaped\n");