Fri Oct 19 08:15:38 PDT 2012

4 files changed, 87 insertions, 0 deletions

diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
new file mode 100644
index 000000000..38e396045
--- /dev/null
+++ b/testing/gnome-session/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 169217 2012-10-18 19:26:12Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-session
+pkgver=3.6.1
+pkgrel=1
+pkgdesc="The GNOME Session Handler"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
+         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
+         'upower')
+makedepends=('intltool' 'mesa' 'xtrans')
+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
+        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
+sha256sums=('759c26230d8ac3f2d51344f5eaadce166819c4394acb733987e6d23fd42bddfb'
+            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
+            '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
+
+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
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch
new file mode 100644
index 000000000..40da1c9b7
--- /dev/null
+++ b/testing/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/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/testing/gnome-session/gnome-session.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gnome-session/timeout.patch b/testing/gnome-session/timeout.patch
new file mode 100644
index 000000000..a26b0dcf5
--- /dev/null
+++ b/testing/gnome-session/timeout.patch
@@ -0,0 +1,24 @@
+diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c
+--- gnome-session-3.4.2/gnome-session/gsm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+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-10 02:42:08.013218006 +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 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0