[arch-commits] Commit in mutter-wayland/trunk (3 files)

2014-03-29 Thread Jan Steffens 
Date: Saturday, March 29, 2014 @ 18:45:38
  Author: heftig
Revision: 209137

3.12.0

Modified:
  mutter-wayland/trunk/PKGBUILD
Deleted:
  mutter-wayland/trunk/0001-monitor-expose-min-backlight-step.patch
  mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch

--+
 0001-monitor-expose-min-backlight-step.patch |   29 -
 PKGBUILD |   16 ++---
 mutter-wayland-3.10.0.1-logfile.patch|   17 --
 3 files changed, 3 insertions(+), 59 deletions(-)

Deleted: 0001-monitor-expose-min-backlight-step.patch
===
--- 0001-monitor-expose-min-backlight-step.patch2014-03-29 17:28:40 UTC 
(rev 209136)
+++ 0001-monitor-expose-min-backlight-step.patch2014-03-29 17:45:38 UTC 
(rev 209137)
@@ -1,29 +0,0 @@
-From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
-From: Asad Mehmood asad78...@googlemail.com
-Date: Thu, 17 Oct 2013 16:05:59 +0100
-Subject: [PATCH] monitor: expose min-backlight-step
-
-Expose min-backlight-step so that gnome-settings-daemon can
-support backlights with less than 10 steps without mutter
-normalizing the brightness back to its original value

- src/core/monitor.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/core/monitor.c b/src/core/monitor.c
-index 9ec0c2a..6d65f9e 100644
 a/src/core/monitor.c
-+++ b/src/core/monitor.c
-@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources 
(MetaDBusDisplayConfig *skeleton,
-  g_variant_new_take_string (make_display_name 
(manager, output)));
-   g_variant_builder_add (properties, {sv}, backlight,
-  g_variant_new_int32 (output-backlight));
-+  g_variant_builder_add (properties, {sv}, min-backlight-step,
-+ g_variant_new_int32 ((output-backlight_max - 
output-backlight_min) ?
-+  100 / 
(output-backlight_max - output-backlight_min) : -1));
-   g_variant_builder_add (properties, {sv}, primary,
-  g_variant_new_boolean (output-is_primary));
-   g_variant_builder_add (properties, {sv}, presentation,
--- 
-1.8.4.1
-

Modified: PKGBUILD
===
--- PKGBUILD2014-03-29 17:28:40 UTC (rev 209136)
+++ PKGBUILD2014-03-29 17:45:38 UTC (rev 209137)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 
 pkgname=mutter-wayland
-pkgver=3.10.4
+pkgver=3.12.0
 pkgrel=1
 pkgdesc=A Wayland compositor for GNOME
 arch=(i686 x86_64)
@@ -12,22 +12,12 @@
 url=http://www.gnome.org;
 options=('!emptydirs')
 install=mutter-wayland.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-mutter-wayland-3.10.0.1-logfile.patch
-0001-monitor-expose-min-backlight-step.patch)
-sha256sums=('2dd625a0e0429a4852ec52ca9a40890d57537d947cc6269a9d85c52987d87828'
-'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644'
-'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('612346cda299939873a4594295cd5b70a1ff7a3433cf34ff913c575bedf6979a')
 
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # From Fedora: Don't try to redirect the logfile. It won't work.
-  patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
-
-  # FS#37224
-  patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
 }
 
 build() {

Deleted: mutter-wayland-3.10.0.1-logfile.patch
===
--- mutter-wayland-3.10.0.1-logfile.patch   2014-03-29 17:28:40 UTC (rev 
209136)
+++ mutter-wayland-3.10.0.1-logfile.patch   2014-03-29 17:45:38 UTC (rev 
209137)
@@ -1,17 +0,0 @@
 mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16 
16:40:46.0 -0400
-+++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c2013-10-02 
13:37:57.027318760 -0400
-@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
-   args[3] = -rootless;
-   args[4] = -retro;
-   args[5] = -noreset;
--  args[6] = -logfile;
--  args[7] = g_build_filename (g_get_user_cache_dir (), xwayland.log, NULL);
--  args[8] = -nolisten;
--  args[9] = all;
--  args[10] = NULL;
-+  args[6] = -nolisten;
-+  args[7] = all;
-+  args[8] = NULL;
- 
-   error = NULL;
-   if (g_spawn_async (NULL, /* cwd */

[arch-commits] Commit in mutter-wayland/trunk (3 files)

2013-09-24 Thread Jan Steffens 
Date: Tuesday, September 24, 2013 @ 09:12:49
  Author: heftig
Revision: 194896

3.9.92

Added:
  mutter-wayland/trunk/mutter-wayland.install
(from rev 194895, mutter-wayland/trunk/mutter.install)
Modified:
  mutter-wayland/trunk/PKGBUILD
Deleted:
  mutter-wayland/trunk/mutter.install

+
 PKGBUILD   |   25 +
 mutter-wayland.install |   11 +++
 mutter.install |   19 ---
 3 files changed, 24 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-24 07:00:54 UTC (rev 194895)
+++ PKGBUILD2013-09-24 07:12:49 UTC (rev 194896)
@@ -1,27 +1,24 @@
 # $Id$
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Maintainer: Ionut Biru ib...@archlinux.org
-# Contributor: Michael Kanis mkanis_at_gmx_dot_de
 
-pkgname=mutter
-pkgver=3.10.0
+pkgname=mutter-wayland
+pkgver=3.9.92
 pkgrel=1
-pkgdesc=A window manager for GNOME
+pkgdesc=A Wayland compositor for GNOME
 arch=(i686 x86_64)
-license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 
'libcanberra' 'startup-notification' 'zenity' 'libsm' 'gnome-desktop' 'upower')
-makedepends=('intltool' 'gnome-doc-utils')
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
 url=http://www.gnome.org;
-groups=('gnome')
 options=('!libtool' '!emptydirs')
-install=mutter.install
+install=mutter-wayland.install
 
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bf468054e86759e844aea1e97d438eb84840edad1cc40cb6e13c145e398af242')
+sha256sums=('562fc8bccf9b413f2f1f6ee3e1be8113a35b0cdcb28f3d242e143f066b974712')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-  --libexecdir=/usr/lib/mutter \
+  --libexecdir=/usr/lib/$pkgname \
   --localstatedir=/var --disable-static \
   --disable-schemas-compile --enable-compile-warnings=minimum
 
@@ -34,4 +31,8 @@
 package() {
   cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
+
+  # Already in mutter
+  rm -r $pkgdir/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+  rm $pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 }

Copied: mutter-wayland/trunk/mutter-wayland.install (from rev 194895, 
mutter-wayland/trunk/mutter.install)
===
--- mutter-wayland.install  (rev 0)
+++ mutter-wayland.install  2013-09-24 07:12:49 UTC (rev 194896)
@@ -0,0 +1,11 @@
+post_install() {
+glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}

Deleted: mutter.install
===
--- mutter.install  2013-09-24 07:00:54 UTC (rev 194895)
+++ mutter.install  2013-09-24 07:12:49 UTC (rev 194896)
@@ -1,19 +0,0 @@
-pkgname=mutter
-
-post_install() {
-glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-/usr/sbin/gconfpkg --uninstall $pkgname
-fi
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}