From 334c2a7916a80d08b1c216cfbf02135e64891632 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 7 Jun 2012 00:01:55 +0000
Subject: Thu Jun  7 00:01:54 UTC 2012

---
 extra/gnome-session/PKGBUILD                           | 18 ++++++++++++++----
 extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch |  9 +++++++++
 extra/gnome-session/timeout.patch                      | 12 ++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
 create mode 100644 extra/gnome-session/timeout.patch

(limited to 'extra/gnome-session')

diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 30b6b3463..071a2bf69 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159032 2012-05-15 10:44:22Z heftig $
+# $Id: PKGBUILD 160794 2012-06-05 23:43:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -15,11 +15,21 @@ options=('!emptydirs')
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
+sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356'
+            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
+            '1942c8144711cf4bc0e776edd366579849e266a446b48cca0205d7ab82241782')
 
 build() {
   cd $pkgname-$pkgver
+
+  # Allow software rendering
+  patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
+
+  # Increase timeout, for slow machines
+  patch -Np1 -i ../timeout.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
       --disable-schemas-compile --enable-systemd
diff --git a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
new file mode 100644
index 000000000..40da1c9b7
--- /dev/null
+++ b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
@@ -0,0 +1,9 @@
+diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
+--- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
++++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
+@@ -20,4 +20,4 @@
+ 
+ # Gallium has softpipe and llvmpipe
+ -softpipe
+--llvmpipe
++#llvmpipe
diff --git a/extra/gnome-session/timeout.patch b/extra/gnome-session/timeout.patch
new file mode 100644
index 000000000..20500206b
--- /dev/null
+++ b/extra/gnome-session/timeout.patch
@@ -0,0 +1,12 @@
+diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c
+--- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c	2012-06-04 11:06:35.911690067 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 10000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0
-- 
cgit v1.2.3-54-g00ecf