[arch-commits] Commit in marco/repos (10 files)
Martin Wimpress
flexiondotorg at archlinux.org
Tue Oct 21 14:29:24 UTC 2014
Date: Tuesday, October 21, 2014 @ 16:29:24
Author: flexiondotorg
Revision: 121157
archrelease: copy trunk to community-i686, community-x86_64
Added:
marco/repos/community-i686/PKGBUILD
(from rev 121156, marco/trunk/PKGBUILD)
marco/repos/community-i686/do_not_add_shadows_to_ARGB_windows.diff
(from rev 121156, marco/trunk/do_not_add_shadows_to_ARGB_windows.diff)
marco/repos/community-i686/marco.install
(from rev 121156, marco/trunk/marco.install)
marco/repos/community-x86_64/PKGBUILD
(from rev 121156, marco/trunk/PKGBUILD)
marco/repos/community-x86_64/do_not_add_shadows_to_ARGB_windows.diff
(from rev 121156, marco/trunk/do_not_add_shadows_to_ARGB_windows.diff)
marco/repos/community-x86_64/marco.install
(from rev 121156, marco/trunk/marco.install)
Deleted:
marco/repos/community-i686/PKGBUILD
marco/repos/community-i686/marco.install
marco/repos/community-x86_64/PKGBUILD
marco/repos/community-x86_64/marco.install
----------------------------------------------------------+
/PKGBUILD | 96 +++++++++++++
/marco.install | 22 ++
community-i686/PKGBUILD | 39 -----
community-i686/do_not_add_shadows_to_ARGB_windows.diff | 17 ++
community-i686/marco.install | 11 -
community-x86_64/PKGBUILD | 39 -----
community-x86_64/do_not_add_shadows_to_ARGB_windows.diff | 17 ++
community-x86_64/marco.install | 11 -
8 files changed, 152 insertions(+), 100 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-10-21 14:29:13 UTC (rev 121156)
+++ community-i686/PKGBUILD 2014-10-21 14:29:24 UTC (rev 121157)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgname=marco
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="A window manager for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop'
- 'mate-dialogs' 'startup-notification')
-makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-replaces=('mate-window-manager')
-provides=('mate-window-manager')
-conflicts=('mate-window-manager')
-options=('!emptydirs')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c')
-install=${pkgname}.install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-gtk=2.0 \
- --enable-startup-notification \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: marco/repos/community-i686/PKGBUILD (from rev 121156, marco/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-10-21 14:29:24 UTC (rev 121157)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=marco
+pkgver=1.8.2
+pkgrel=2
+pkgdesc="A window manager for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop'
+ 'mate-dialogs' 'startup-notification')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+replaces=('mate-window-manager')
+provides=('mate-window-manager')
+conflicts=('mate-window-manager')
+options=('!emptydirs')
+groups=('mate')
+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 \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gtk=2.0 \
+ --enable-startup-notification \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: marco/repos/community-i686/do_not_add_shadows_to_ARGB_windows.diff (from rev 121156, marco/trunk/do_not_add_shadows_to_ARGB_windows.diff)
===================================================================
--- community-i686/do_not_add_shadows_to_ARGB_windows.diff (rev 0)
+++ community-i686/do_not_add_shadows_to_ARGB_windows.diff 2014-10-21 14:29:24 UTC (rev 121157)
@@ -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");
Deleted: community-i686/marco.install
===================================================================
--- community-i686/marco.install 2014-10-21 14:29:13 UTC (rev 121156)
+++ community-i686/marco.install 2014-10-21 14:29:24 UTC (rev 121157)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: marco/repos/community-i686/marco.install (from rev 121156, marco/trunk/marco.install)
===================================================================
--- community-i686/marco.install (rev 0)
+++ community-i686/marco.install 2014-10-21 14:29:24 UTC (rev 121157)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-10-21 14:29:13 UTC (rev 121156)
+++ community-x86_64/PKGBUILD 2014-10-21 14:29:24 UTC (rev 121157)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgname=marco
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="A window manager for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop'
- 'mate-dialogs' 'startup-notification')
-makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-replaces=('mate-window-manager')
-provides=('mate-window-manager')
-conflicts=('mate-window-manager')
-options=('!emptydirs')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c')
-install=${pkgname}.install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-gtk=2.0 \
- --enable-startup-notification \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: marco/repos/community-x86_64/PKGBUILD (from rev 121156, marco/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-10-21 14:29:24 UTC (rev 121157)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=marco
+pkgver=1.8.2
+pkgrel=2
+pkgdesc="A window manager for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop'
+ 'mate-dialogs' 'startup-notification')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+replaces=('mate-window-manager')
+provides=('mate-window-manager')
+conflicts=('mate-window-manager')
+options=('!emptydirs')
+groups=('mate')
+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 \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-gtk=2.0 \
+ --enable-startup-notification \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: marco/repos/community-x86_64/do_not_add_shadows_to_ARGB_windows.diff (from rev 121156, marco/trunk/do_not_add_shadows_to_ARGB_windows.diff)
===================================================================
--- community-x86_64/do_not_add_shadows_to_ARGB_windows.diff (rev 0)
+++ community-x86_64/do_not_add_shadows_to_ARGB_windows.diff 2014-10-21 14:29:24 UTC (rev 121157)
@@ -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");
Deleted: community-x86_64/marco.install
===================================================================
--- community-x86_64/marco.install 2014-10-21 14:29:13 UTC (rev 121156)
+++ community-x86_64/marco.install 2014-10-21 14:29:24 UTC (rev 121157)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: marco/repos/community-x86_64/marco.install (from rev 121156, marco/trunk/marco.install)
===================================================================
--- community-x86_64/marco.install (rev 0)
+++ community-x86_64/marco.install 2014-10-21 14:29:24 UTC (rev 121157)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list