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

[Jan Steffens]

    Date: Thursday, October 3, 2013 @ 23:50:52
  Author: heftig
Revision: 195893

fix xwayland problem

Added:
  mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch
Modified:
  mutter-wayland/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   16 +++++++++++++---
 mutter-wayland-3.10.0.1-logfile.patch |   17 +++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-03 19:08:22 UTC (rev 195892)
+++ PKGBUILD	2013-10-03 21:50:52 UTC (rev 195893)
@@ -3,7 +3,7 @@
 
 pkgname=mutter-wayland
 pkgver=3.10.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Wayland compositor for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
@@ -12,9 +12,19 @@
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 install=mutter-wayland.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        mutter-wayland-3.10.0.1-logfile.patch)
+sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560'
+            'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
 
+
+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
+}
+
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \

Added: mutter-wayland-3.10.0.1-logfile.patch
===================================================================
--- mutter-wayland-3.10.0.1-logfile.patch	                        (rev 0)
+++ mutter-wayland-3.10.0.1-logfile.patch	2013-10-03 21:50:52 UTC (rev 195893)
@@ -0,0 +1,17 @@
+--- 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 */