[arch-commits] Commit in marco/repos (14 files)
Martin Wimpress
flexiondotorg at archlinux.org
Tue Nov 4 18:04:27 UTC 2014
Date: Tuesday, November 4, 2014 @ 19:04:27
Author: flexiondotorg
Revision: 121864
archrelease: copy trunk to community-i686, community-x86_64
Added:
marco/repos/community-i686/PKGBUILD
(from rev 121863, marco/trunk/PKGBUILD)
marco/repos/community-i686/do_not_add_shadows_to_ARGB_windows.diff
(from rev 121863, marco/trunk/do_not_add_shadows_to_ARGB_windows.diff)
marco/repos/community-i686/marco.install
(from rev 121863, marco/trunk/marco.install)
marco/repos/community-i686/update_keybindings_with_new_name.diff
(from rev 121863, marco/trunk/update_keybindings_with_new_name.diff)
marco/repos/community-x86_64/PKGBUILD
(from rev 121863, marco/trunk/PKGBUILD)
marco/repos/community-x86_64/do_not_add_shadows_to_ARGB_windows.diff
(from rev 121863, marco/trunk/do_not_add_shadows_to_ARGB_windows.diff)
marco/repos/community-x86_64/marco.install
(from rev 121863, marco/trunk/marco.install)
marco/repos/community-x86_64/update_keybindings_with_new_name.diff
(from rev 121863, marco/trunk/update_keybindings_with_new_name.diff)
Deleted:
marco/repos/community-i686/PKGBUILD
marco/repos/community-i686/do_not_add_shadows_to_ARGB_windows.diff
marco/repos/community-i686/marco.install
marco/repos/community-x86_64/PKGBUILD
marco/repos/community-x86_64/do_not_add_shadows_to_ARGB_windows.diff
marco/repos/community-x86_64/marco.install
----------------------------------------------------------+
/PKGBUILD | 106 +++++++++++++
/do_not_add_shadows_to_ARGB_windows.diff | 34 ++++
/marco.install | 22 ++
community-i686/PKGBUILD | 48 -----
community-i686/do_not_add_shadows_to_ARGB_windows.diff | 17 --
community-i686/marco.install | 11 -
community-i686/update_keybindings_with_new_name.diff | 33 ++++
community-x86_64/PKGBUILD | 48 -----
community-x86_64/do_not_add_shadows_to_ARGB_windows.diff | 17 --
community-x86_64/marco.install | 11 -
community-x86_64/update_keybindings_with_new_name.diff | 33 ++++
11 files changed, 228 insertions(+), 152 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-11-04 18:04:06 UTC (rev 121863)
+++ community-i686/PKGBUILD 2014-11-04 18:04:27 UTC (rev 121864)
@@ -1,48 +0,0 @@
-# $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/PKGBUILD (from rev 121863, marco/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-11-04 18:04:27 UTC (rev 121864)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=marco
+pkgver=1.8.2
+pkgrel=3
+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'
+ 'update_keybindings_with_new_name.diff')
+sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c'
+ 'a2af3d1d6ea6a3b19bf9aa290036b2c7181a3587'
+ 'f09d9871ef920e7848458bca853589f482f340b3')
+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"
+ # Update keybindings files with new name
+ # - https://github.com/mate-desktop/marco/commit/c2cbcaa90d88d3d74dc7b79cae17964f4243a51d
+ patch -Np1 -i "${srcdir}/update_keybindings_with_new_name.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
+}
Deleted: community-i686/do_not_add_shadows_to_ARGB_windows.diff
===================================================================
--- community-i686/do_not_add_shadows_to_ARGB_windows.diff 2014-11-04 18:04:06 UTC (rev 121863)
+++ community-i686/do_not_add_shadows_to_ARGB_windows.diff 2014-11-04 18:04:27 UTC (rev 121864)
@@ -1,17 +0,0 @@
-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");
Copied: marco/repos/community-i686/do_not_add_shadows_to_ARGB_windows.diff (from rev 121863, 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-11-04 18:04:27 UTC (rev 121864)
@@ -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-11-04 18:04:06 UTC (rev 121863)
+++ community-i686/marco.install 2014-11-04 18:04:27 UTC (rev 121864)
@@ -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 121863, marco/trunk/marco.install)
===================================================================
--- community-i686/marco.install (rev 0)
+++ community-i686/marco.install 2014-11-04 18:04:27 UTC (rev 121864)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: marco/repos/community-i686/update_keybindings_with_new_name.diff (from rev 121863, marco/trunk/update_keybindings_with_new_name.diff)
===================================================================
--- community-i686/update_keybindings_with_new_name.diff (rev 0)
+++ community-i686/update_keybindings_with_new_name.diff 2014-11-04 18:04:27 UTC (rev 121864)
@@ -0,0 +1,33 @@
+diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in
+index 00ebc91..f9e33c3 100644
+--- a/src/50-marco-desktop-key.xml.in
++++ b/src/50-marco-desktop-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Desktop" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
++<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+
+ <KeyListEntry name="panel-run-dialog" _description="Show the panel's "Run Application" dialog box" />
+
+diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in
+index 9a61c37..81a8db8 100644
+--- a/src/50-marco-global-key.xml.in
++++ b/src/50-marco-global-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+
+ <KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" />
+
+diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in
+index 3aba645..5d79933 100644
+--- a/src/50-marco-window-key.xml.in
++++ b/src/50-marco-window-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.window-keybindings">
++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
+
+ <KeyListEntry
+ name="activate-window-menu"
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-11-04 18:04:06 UTC (rev 121863)
+++ community-x86_64/PKGBUILD 2014-11-04 18:04:27 UTC (rev 121864)
@@ -1,48 +0,0 @@
-# $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/PKGBUILD (from rev 121863, marco/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-11-04 18:04:27 UTC (rev 121864)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=marco
+pkgver=1.8.2
+pkgrel=3
+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'
+ 'update_keybindings_with_new_name.diff')
+sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c'
+ 'a2af3d1d6ea6a3b19bf9aa290036b2c7181a3587'
+ 'f09d9871ef920e7848458bca853589f482f340b3')
+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"
+ # Update keybindings files with new name
+ # - https://github.com/mate-desktop/marco/commit/c2cbcaa90d88d3d74dc7b79cae17964f4243a51d
+ patch -Np1 -i "${srcdir}/update_keybindings_with_new_name.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
+}
Deleted: community-x86_64/do_not_add_shadows_to_ARGB_windows.diff
===================================================================
--- community-x86_64/do_not_add_shadows_to_ARGB_windows.diff 2014-11-04 18:04:06 UTC (rev 121863)
+++ community-x86_64/do_not_add_shadows_to_ARGB_windows.diff 2014-11-04 18:04:27 UTC (rev 121864)
@@ -1,17 +0,0 @@
-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");
Copied: marco/repos/community-x86_64/do_not_add_shadows_to_ARGB_windows.diff (from rev 121863, 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-11-04 18:04:27 UTC (rev 121864)
@@ -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-11-04 18:04:06 UTC (rev 121863)
+++ community-x86_64/marco.install 2014-11-04 18:04:27 UTC (rev 121864)
@@ -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 121863, marco/trunk/marco.install)
===================================================================
--- community-x86_64/marco.install (rev 0)
+++ community-x86_64/marco.install 2014-11-04 18:04:27 UTC (rev 121864)
@@ -0,0 +1,11 @@
+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/update_keybindings_with_new_name.diff (from rev 121863, marco/trunk/update_keybindings_with_new_name.diff)
===================================================================
--- community-x86_64/update_keybindings_with_new_name.diff (rev 0)
+++ community-x86_64/update_keybindings_with_new_name.diff 2014-11-04 18:04:27 UTC (rev 121864)
@@ -0,0 +1,33 @@
+diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in
+index 00ebc91..f9e33c3 100644
+--- a/src/50-marco-desktop-key.xml.in
++++ b/src/50-marco-desktop-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Desktop" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
++<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+
+ <KeyListEntry name="panel-run-dialog" _description="Show the panel's "Run Application" dialog box" />
+
+diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in
+index 9a61c37..81a8db8 100644
+--- a/src/50-marco-global-key.xml.in
++++ b/src/50-marco-global-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+
+ <KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" />
+
+diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in
+index 3aba645..5d79933 100644
+--- a/src/50-marco-window-key.xml.in
++++ b/src/50-marco-window-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.window-keybindings">
++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
+
+ <KeyListEntry
+ name="activate-window-menu"
More information about the arch-commits
mailing list