Tue Apr 15 03:22:01 UTC 2014

3 files changed, 4 insertions, 60 deletions

diff --git a/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch b/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch
deleted file mode 100644
index 0d6d7424f..000000000
--- a/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
-From: Asad Mehmood <asad78611@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
-
diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD
index 1ef8bbb86..f6d6371d7 100644
--- a/extra/mutter-wayland/PKGBUILD
+++ b/extra/mutter-wayland/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 206148 2014-02-20 08:59:56Z heftig $
+# $Id: PKGBUILD 210521 2014-04-14 20:07:21Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@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 @@ makedepends=(intltool gnome-doc-utils)
 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() {
diff --git a/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch
deleted file mode 100644
index 922e0ae33..000000000
--- a/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx	2013-09-16 16:40:46.000000000 -0400
-+++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c	2013-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 */