[arch-commits] Commit in muffin/repos (10 files)
Alexandre Filgueira
faidoc at archlinux.org
Sat Apr 23 15:44:44 UTC 2016
Date: Saturday, April 23, 2016 @ 17:44:43
Author: faidoc
Revision: 171630
archrelease: copy trunk to community-i686, community-x86_64
Added:
muffin/repos/community-i686/PKGBUILD
(from rev 171629, muffin/trunk/PKGBUILD)
muffin/repos/community-i686/context_menu_position_fix.patch
(from rev 171629, muffin/trunk/context_menu_position_fix.patch)
muffin/repos/community-i686/muffin.install
(from rev 171629, muffin/trunk/muffin.install)
muffin/repos/community-x86_64/PKGBUILD
(from rev 171629, muffin/trunk/PKGBUILD)
muffin/repos/community-x86_64/context_menu_position_fix.patch
(from rev 171629, muffin/trunk/context_menu_position_fix.patch)
muffin/repos/community-x86_64/muffin.install
(from rev 171629, muffin/trunk/muffin.install)
Deleted:
muffin/repos/community-i686/PKGBUILD
muffin/repos/community-i686/muffin.install
muffin/repos/community-x86_64/PKGBUILD
muffin/repos/community-x86_64/muffin.install
--------------------------------------------------+
/PKGBUILD | 110 +++++++++++++++++++++
/muffin.install | 20 +++
community-i686/PKGBUILD | 50 ---------
community-i686/context_menu_position_fix.patch | 48 +++++++++
community-i686/muffin.install | 10 -
community-x86_64/PKGBUILD | 50 ---------
community-x86_64/context_menu_position_fix.patch | 48 +++++++++
community-x86_64/muffin.install | 10 -
8 files changed, 226 insertions(+), 120 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-04-23 15:43:13 UTC (rev 171629)
+++ community-i686/PKGBUILD 2016-04-23 15:44:43 UTC (rev 171630)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
-# Contributor: Adam Hani Schakaki <adam at schakaki.net>
-# Contributor: Ner0
-
-pkgname=muffin
-pkgver=2.8.5
-pkgrel=1
-pkgdesc="Cinnamon window manager based on Mutter"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/muffin"
-license=('GPL')
-depends=('clutter' 'gobject-introspection-runtime' 'cinnamon-desktop' 'libcanberra' 'libsm'
- 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc')
-options=('!emptydirs')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('0ae19de74111f222b44f7bf8d159437a83c6ae2e7ce70b327c0296365d69aba4')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
- --localstatedir=/var --disable-static --disable-schemas-compile \
- --enable-compile-warnings=minimum
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-
- # Remove unused stuff
- make -C src DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-desktopfilesDATA
- make -C src/tools DESTDIR="$pkgdir" uninstall
- make -C src/compositor/plugins DESTDIR="$pkgdir" uninstall
- make -C doc/man DESTDIR="$pkgdir" uninstall
-}
-
-# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-i686/PKGBUILD (from rev 171629, muffin/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-04-23 15:44:43 UTC (rev 171630)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Adam Hani Schakaki <adam at schakaki.net>
+# Contributor: Ner0
+
+pkgname=muffin
+pkgver=2.8.5
+pkgrel=2
+pkgdesc="Cinnamon window manager based on Mutter"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/muffin"
+license=('GPL')
+depends=('clutter' 'gobject-introspection-runtime' 'cinnamon-desktop' 'libcanberra' 'libsm'
+ 'startup-notification' 'zenity' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc')
+options=('!emptydirs')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+ "context_menu_position_fix.patch")
+sha256sums=('0ae19de74111f222b44f7bf8d159437a83c6ae2e7ce70b327c0296365d69aba4'
+ '228aa59317b7495abe8099e6b3ce01e037f3f045274ec4de93aad79fe4d3d6a0')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # window.c: don't send configure notifies for OR windows (https://github.com/linuxmint/Cinnamon/issues/5202)
+ patch -Np1 -i ../context_menu_position_fix.patch
+
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+ --localstatedir=/var --disable-static --disable-schemas-compile \
+ --enable-compile-warnings=minimum
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir/" install
+
+ # Remove unused stuff
+ make -C src DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-desktopfilesDATA
+ make -C src/tools DESTDIR="$pkgdir" uninstall
+ make -C src/compositor/plugins DESTDIR="$pkgdir" uninstall
+ make -C doc/man DESTDIR="$pkgdir" uninstall
+}
+
+# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-i686/context_menu_position_fix.patch (from rev 171629, muffin/trunk/context_menu_position_fix.patch)
===================================================================
--- community-i686/context_menu_position_fix.patch (rev 0)
+++ community-i686/context_menu_position_fix.patch 2016-04-23 15:44:43 UTC (rev 171630)
@@ -0,0 +1,48 @@
+From 65fd5fe41436ccfa74ea37b886f96adee6f258c1 Mon Sep 17 00:00:00 2001
+From: itzexor <itzexor at gmail.com>
+Date: Mon, 18 Apr 2016 20:46:59 -0700
+Subject: [PATCH] window.c: don't send configure notifies for OR windows this
+ causes popup placement issues with gtk 3.20 as described in the mutter commit
+ this is based on. the assertion is left out, as we still need to send
+ configure notifies for OR windows in other cases.
+
+based on:
+https://github.com/GNOME/mutter/commit/e3622275147181a2876e45397f5fc7ed063b8bb8
+---
+ src/core/window.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/window.c b/src/core/window.c
+index 90b0e3b..8d96cb2 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -1817,12 +1817,6 @@ meta_window_unmanage (MetaWindow *window,
+ window->tile_type != META_WINDOW_TILE_TYPE_NONE)
+ unmaximize_window_before_freeing (window);
+
+- /* The XReparentWindow call in meta_window_destroy_frame() moves the
+- * window so we need to send a configure notify; see bug 399552. (We
+- * also do this just in case a window got unmaximized.)
+- */
+- send_configure_notify (window);
+-
+ meta_window_unqueue (window, META_QUEUE_CALC_SHOWING |
+ META_QUEUE_MOVE_RESIZE |
+ META_QUEUE_UPDATE_ICON);
+@@ -1859,7 +1853,15 @@ meta_window_unmanage (MetaWindow *window,
+ meta_window_destroy_sync_request_alarm (window);
+
+ if (window->frame)
+- meta_window_destroy_frame (window);
++ {
++ /* The XReparentWindow call in meta_window_destroy_frame() moves the
++ * window so we need to send a configure notify; see bug 399552. (We
++ * also do this just in case a window got unmaximized.)
++ */
++ send_configure_notify (window);
++
++ meta_window_destroy_frame (window);
++ }
+
+ /* If an undecorated window is being withdrawn, that will change the
+ * stack as presented to the compositing manager, without actually
Deleted: community-i686/muffin.install
===================================================================
--- community-i686/muffin.install 2016-04-23 15:43:13 UTC (rev 171629)
+++ community-i686/muffin.install 2016-04-23 15:44:43 UTC (rev 171630)
@@ -1,10 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-post_remove() {
- post_install
-}
Copied: muffin/repos/community-i686/muffin.install (from rev 171629, muffin/trunk/muffin.install)
===================================================================
--- community-i686/muffin.install (rev 0)
+++ community-i686/muffin.install 2016-04-23 15:44:43 UTC (rev 171630)
@@ -0,0 +1,10 @@
+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 2016-04-23 15:43:13 UTC (rev 171629)
+++ community-x86_64/PKGBUILD 2016-04-23 15:44:43 UTC (rev 171630)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
-# Contributor: Adam Hani Schakaki <adam at schakaki.net>
-# Contributor: Ner0
-
-pkgname=muffin
-pkgver=2.8.5
-pkgrel=1
-pkgdesc="Cinnamon window manager based on Mutter"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/muffin"
-license=('GPL')
-depends=('clutter' 'gobject-introspection-runtime' 'cinnamon-desktop' 'libcanberra' 'libsm'
- 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc')
-options=('!emptydirs')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('0ae19de74111f222b44f7bf8d159437a83c6ae2e7ce70b327c0296365d69aba4')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
- --localstatedir=/var --disable-static --disable-schemas-compile \
- --enable-compile-warnings=minimum
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-
- # Remove unused stuff
- make -C src DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-desktopfilesDATA
- make -C src/tools DESTDIR="$pkgdir" uninstall
- make -C src/compositor/plugins DESTDIR="$pkgdir" uninstall
- make -C doc/man DESTDIR="$pkgdir" uninstall
-}
-
-# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-x86_64/PKGBUILD (from rev 171629, muffin/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-04-23 15:44:43 UTC (rev 171630)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at antergos.com>
+# Contributor: Adam Hani Schakaki <adam at schakaki.net>
+# Contributor: Ner0
+
+pkgname=muffin
+pkgver=2.8.5
+pkgrel=2
+pkgdesc="Cinnamon window manager based on Mutter"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/muffin"
+license=('GPL')
+depends=('clutter' 'gobject-introspection-runtime' 'cinnamon-desktop' 'libcanberra' 'libsm'
+ 'startup-notification' 'zenity' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc')
+options=('!emptydirs')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+ "context_menu_position_fix.patch")
+sha256sums=('0ae19de74111f222b44f7bf8d159437a83c6ae2e7ce70b327c0296365d69aba4'
+ '228aa59317b7495abe8099e6b3ce01e037f3f045274ec4de93aad79fe4d3d6a0')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # window.c: don't send configure notifies for OR windows (https://github.com/linuxmint/Cinnamon/issues/5202)
+ patch -Np1 -i ../context_menu_position_fix.patch
+
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+ --localstatedir=/var --disable-static --disable-schemas-compile \
+ --enable-compile-warnings=minimum
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir/" install
+
+ # Remove unused stuff
+ make -C src DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-desktopfilesDATA
+ make -C src/tools DESTDIR="$pkgdir" uninstall
+ make -C src/compositor/plugins DESTDIR="$pkgdir" uninstall
+ make -C doc/man DESTDIR="$pkgdir" uninstall
+}
+
+# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-x86_64/context_menu_position_fix.patch (from rev 171629, muffin/trunk/context_menu_position_fix.patch)
===================================================================
--- community-x86_64/context_menu_position_fix.patch (rev 0)
+++ community-x86_64/context_menu_position_fix.patch 2016-04-23 15:44:43 UTC (rev 171630)
@@ -0,0 +1,48 @@
+From 65fd5fe41436ccfa74ea37b886f96adee6f258c1 Mon Sep 17 00:00:00 2001
+From: itzexor <itzexor at gmail.com>
+Date: Mon, 18 Apr 2016 20:46:59 -0700
+Subject: [PATCH] window.c: don't send configure notifies for OR windows this
+ causes popup placement issues with gtk 3.20 as described in the mutter commit
+ this is based on. the assertion is left out, as we still need to send
+ configure notifies for OR windows in other cases.
+
+based on:
+https://github.com/GNOME/mutter/commit/e3622275147181a2876e45397f5fc7ed063b8bb8
+---
+ src/core/window.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/window.c b/src/core/window.c
+index 90b0e3b..8d96cb2 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -1817,12 +1817,6 @@ meta_window_unmanage (MetaWindow *window,
+ window->tile_type != META_WINDOW_TILE_TYPE_NONE)
+ unmaximize_window_before_freeing (window);
+
+- /* The XReparentWindow call in meta_window_destroy_frame() moves the
+- * window so we need to send a configure notify; see bug 399552. (We
+- * also do this just in case a window got unmaximized.)
+- */
+- send_configure_notify (window);
+-
+ meta_window_unqueue (window, META_QUEUE_CALC_SHOWING |
+ META_QUEUE_MOVE_RESIZE |
+ META_QUEUE_UPDATE_ICON);
+@@ -1859,7 +1853,15 @@ meta_window_unmanage (MetaWindow *window,
+ meta_window_destroy_sync_request_alarm (window);
+
+ if (window->frame)
+- meta_window_destroy_frame (window);
++ {
++ /* The XReparentWindow call in meta_window_destroy_frame() moves the
++ * window so we need to send a configure notify; see bug 399552. (We
++ * also do this just in case a window got unmaximized.)
++ */
++ send_configure_notify (window);
++
++ meta_window_destroy_frame (window);
++ }
+
+ /* If an undecorated window is being withdrawn, that will change the
+ * stack as presented to the compositing manager, without actually
Deleted: community-x86_64/muffin.install
===================================================================
--- community-x86_64/muffin.install 2016-04-23 15:43:13 UTC (rev 171629)
+++ community-x86_64/muffin.install 2016-04-23 15:44:43 UTC (rev 171630)
@@ -1,10 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-post_remove() {
- post_install
-}
Copied: muffin/repos/community-x86_64/muffin.install (from rev 171629, muffin/trunk/muffin.install)
===================================================================
--- community-x86_64/muffin.install (rev 0)
+++ community-x86_64/muffin.install 2016-04-23 15:44:43 UTC (rev 171630)
@@ -0,0 +1,10 @@
+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