[arch-commits] Commit in muffin/repos (10 files)
Alexandre Filgueira
faidoc at nymeria.archlinux.org
Sat May 3 17:27:50 UTC 2014
Date: Saturday, May 3, 2014 @ 19:27:50
Author: faidoc
Revision: 110555
archrelease: copy trunk to community-i686, community-x86_64
Added:
muffin/repos/community-i686/PKGBUILD
(from rev 110554, muffin/trunk/PKGBUILD)
muffin/repos/community-i686/muffin.install
(from rev 110554, muffin/trunk/muffin.install)
muffin/repos/community-x86_64/PKGBUILD
(from rev 110554, muffin/trunk/PKGBUILD)
muffin/repos/community-x86_64/muffin.install
(from rev 110554, muffin/trunk/muffin.install)
Deleted:
muffin/repos/community-i686/PKGBUILD
muffin/repos/community-i686/cogl_ABI.patch
muffin/repos/community-i686/muffin.install
muffin/repos/community-x86_64/PKGBUILD
muffin/repos/community-x86_64/cogl_ABI.patch
muffin/repos/community-x86_64/muffin.install
---------------------------------+
/PKGBUILD | 78 ++++++++++++++++++++++++++++++++++
/muffin.install | 20 ++++++++
community-i686/PKGBUILD | 44 -------------------
community-i686/cogl_ABI.patch | 86 --------------------------------------
community-i686/muffin.install | 10 ----
community-x86_64/PKGBUILD | 44 -------------------
community-x86_64/cogl_ABI.patch | 86 --------------------------------------
community-x86_64/muffin.install | 10 ----
8 files changed, 98 insertions(+), 280 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-05-03 17:26:55 UTC (rev 110554)
+++ community-i686/PKGBUILD 2014-05-03 17:27:50 UTC (rev 110555)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Adam Hani Schakaki <adam at schakaki.net>
-# Contributor: Ner0
-
-pkgname=muffin
-pkgver=2.2.1
-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' 'cinnamon-desktop' 'libcanberra' 'libsm'
- 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
-options=('!emptydirs')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
- cogl_ABI.patch)
-sha256sums=('aec5062ca53364e5077694ef0848b7a4efe384f19d41736c2f7d86e53ce5c009'
- 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Port to cogl 1.18
- patch -Np1 -i ../cogl_ABI.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
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-i686/PKGBUILD (from rev 110554, muffin/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-05-03 17:27:50 UTC (rev 110555)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Adam Hani Schakaki <adam at schakaki.net>
+# Contributor: Ner0
+
+pkgname=muffin
+pkgver=2.2.2
+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' 'cinnamon-desktop' 'libcanberra' 'libsm'
+ 'startup-notification' 'zenity' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+options=('!emptydirs')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+sha256sums=('1f39bb8d76ed0fa5704c5cb336ea86e6871396e92fca8a1ff0671be0b4d30739')
+
+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
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/cogl_ABI.patch
===================================================================
--- community-i686/cogl_ABI.patch 2014-05-03 17:26:55 UTC (rev 110554)
+++ community-i686/cogl_ABI.patch 2014-05-03 17:27:50 UTC (rev 110555)
@@ -1,86 +0,0 @@
-From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre at mecheye.net>
-Date: Mon, 13 Jan 2014 18:03:19 +0000
-Subject: Update for Cogl API breaks
-
----
-(limited to 'src/compositor')
-
-diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
-index 3fc9430..450155d 100644
---- a/src/compositor/meta-texture-rectangle.c
-+++ b/src/compositor/meta-texture-rectangle.c
-@@ -35,10 +35,8 @@ CoglTexture *
- meta_texture_rectangle_new (unsigned int width,
- unsigned int height,
- CoglPixelFormat format,
-- CoglPixelFormat internal_format,
- unsigned int rowstride,
-- const guint8 *data,
-- GError **error)
-+ const guint8 *data)
- {
- ClutterBackend *backend =
- clutter_get_default_backend ();
-@@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width,
- clutter_backend_get_cogl_context (backend);
- CoglTextureRectangle *tex_rect;
-
-- tex_rect = cogl_texture_rectangle_new_with_size (context,
-- width, height,
-- internal_format,
-- error);
-+ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
- if (tex_rect == NULL)
- return NULL;
-
-diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
-index 30f60d3..7b84229 100644
---- a/src/compositor/meta-texture-rectangle.h
-+++ b/src/compositor/meta-texture-rectangle.h
-@@ -34,10 +34,8 @@ CoglTexture *
- meta_texture_rectangle_new (unsigned int width,
- unsigned int height,
- CoglPixelFormat format,
-- CoglPixelFormat internal_format,
- unsigned int rowstride,
-- const guint8 *data,
-- GError **error);
-+ const guint8 *data);
-
- gboolean
- meta_texture_rectangle_check (CoglTexture *texture);
-diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
-index 9a30de0..019aaf4 100644
---- a/src/compositor/meta-texture-tower.c
-+++ b/src/compositor/meta-texture-tower.c
-@@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
- meta_texture_rectangle_new (width, height,
- /* data format */
- TEXTURE_FORMAT,
-- /* internal cogl format */
-- TEXTURE_FORMAT,
- /* rowstride */
- width * 4,
- /* data */
-- NULL,
-- /* error */
- NULL);
- }
- else
---- a/src/compositor/meta-shaped-texture.c
-+++ b/src/compositor/meta-shaped-texture.c
-@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
- if (meta_texture_rectangle_check (paint_tex))
- priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
- COGL_PIXEL_FORMAT_A_8,
-- COGL_PIXEL_FORMAT_A_8,
-- stride,
-- mask_data,
-- NULL /* error */);
-+ stride, mask_data);
- else
- priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
- COGL_TEXTURE_NONE,
---
-cgit v0.9.2
Deleted: community-i686/muffin.install
===================================================================
--- community-i686/muffin.install 2014-05-03 17:26:55 UTC (rev 110554)
+++ community-i686/muffin.install 2014-05-03 17:27:50 UTC (rev 110555)
@@ -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 110554, muffin/trunk/muffin.install)
===================================================================
--- community-i686/muffin.install (rev 0)
+++ community-i686/muffin.install 2014-05-03 17:27:50 UTC (rev 110555)
@@ -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 2014-05-03 17:26:55 UTC (rev 110554)
+++ community-x86_64/PKGBUILD 2014-05-03 17:27:50 UTC (rev 110555)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Adam Hani Schakaki <adam at schakaki.net>
-# Contributor: Ner0
-
-pkgname=muffin
-pkgver=2.2.1
-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' 'cinnamon-desktop' 'libcanberra' 'libsm'
- 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
-options=('!emptydirs')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
- cogl_ABI.patch)
-sha256sums=('aec5062ca53364e5077694ef0848b7a4efe384f19d41736c2f7d86e53ce5c009'
- 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Port to cogl 1.18
- patch -Np1 -i ../cogl_ABI.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
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-x86_64/PKGBUILD (from rev 110554, muffin/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-05-03 17:27:50 UTC (rev 110555)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Adam Hani Schakaki <adam at schakaki.net>
+# Contributor: Ner0
+
+pkgname=muffin
+pkgver=2.2.2
+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' 'cinnamon-desktop' 'libcanberra' 'libsm'
+ 'startup-notification' 'zenity' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+options=('!emptydirs')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+sha256sums=('1f39bb8d76ed0fa5704c5cb336ea86e6871396e92fca8a1ff0671be0b4d30739')
+
+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
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/cogl_ABI.patch
===================================================================
--- community-x86_64/cogl_ABI.patch 2014-05-03 17:26:55 UTC (rev 110554)
+++ community-x86_64/cogl_ABI.patch 2014-05-03 17:27:50 UTC (rev 110555)
@@ -1,86 +0,0 @@
-From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre at mecheye.net>
-Date: Mon, 13 Jan 2014 18:03:19 +0000
-Subject: Update for Cogl API breaks
-
----
-(limited to 'src/compositor')
-
-diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
-index 3fc9430..450155d 100644
---- a/src/compositor/meta-texture-rectangle.c
-+++ b/src/compositor/meta-texture-rectangle.c
-@@ -35,10 +35,8 @@ CoglTexture *
- meta_texture_rectangle_new (unsigned int width,
- unsigned int height,
- CoglPixelFormat format,
-- CoglPixelFormat internal_format,
- unsigned int rowstride,
-- const guint8 *data,
-- GError **error)
-+ const guint8 *data)
- {
- ClutterBackend *backend =
- clutter_get_default_backend ();
-@@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width,
- clutter_backend_get_cogl_context (backend);
- CoglTextureRectangle *tex_rect;
-
-- tex_rect = cogl_texture_rectangle_new_with_size (context,
-- width, height,
-- internal_format,
-- error);
-+ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
- if (tex_rect == NULL)
- return NULL;
-
-diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
-index 30f60d3..7b84229 100644
---- a/src/compositor/meta-texture-rectangle.h
-+++ b/src/compositor/meta-texture-rectangle.h
-@@ -34,10 +34,8 @@ CoglTexture *
- meta_texture_rectangle_new (unsigned int width,
- unsigned int height,
- CoglPixelFormat format,
-- CoglPixelFormat internal_format,
- unsigned int rowstride,
-- const guint8 *data,
-- GError **error);
-+ const guint8 *data);
-
- gboolean
- meta_texture_rectangle_check (CoglTexture *texture);
-diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
-index 9a30de0..019aaf4 100644
---- a/src/compositor/meta-texture-tower.c
-+++ b/src/compositor/meta-texture-tower.c
-@@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
- meta_texture_rectangle_new (width, height,
- /* data format */
- TEXTURE_FORMAT,
-- /* internal cogl format */
-- TEXTURE_FORMAT,
- /* rowstride */
- width * 4,
- /* data */
-- NULL,
-- /* error */
- NULL);
- }
- else
---- a/src/compositor/meta-shaped-texture.c
-+++ b/src/compositor/meta-shaped-texture.c
-@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
- if (meta_texture_rectangle_check (paint_tex))
- priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
- COGL_PIXEL_FORMAT_A_8,
-- COGL_PIXEL_FORMAT_A_8,
-- stride,
-- mask_data,
-- NULL /* error */);
-+ stride, mask_data);
- else
- priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
- COGL_TEXTURE_NONE,
---
-cgit v0.9.2
Deleted: community-x86_64/muffin.install
===================================================================
--- community-x86_64/muffin.install 2014-05-03 17:26:55 UTC (rev 110554)
+++ community-x86_64/muffin.install 2014-05-03 17:27:50 UTC (rev 110555)
@@ -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 110554, muffin/trunk/muffin.install)
===================================================================
--- community-x86_64/muffin.install (rev 0)
+++ community-x86_64/muffin.install 2014-05-03 17:27:50 UTC (rev 110555)
@@ -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