[arch-commits] Commit in gdm/trunk (3 files)
Ionut Biru
ibiru at archlinux.org
Sun Oct 2 01:21:56 UTC 2011
Date: Saturday, October 1, 2011 @ 21:21:56
Author: ibiru
Revision: 139469
g-s-d is now a requirement, make fallback mode fault by adding metacity as dependency
Added:
gdm/trunk/check-for-shell.patch
Modified:
gdm/trunk/PKGBUILD
gdm/trunk/fix_external_program_directories.patch
----------------------------------------+
PKGBUILD | 14 +++++++++-----
check-for-shell.patch | 26 ++++++++++++++++++++++++++
fix_external_program_directories.patch | 22 +++++++++++-----------
3 files changed, 46 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-10-02 00:35:06 UTC (rev 139468)
+++ PKGBUILD 2011-10-02 01:21:56 UTC (rev 139469)
@@ -1,8 +1,9 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
+
pkgname=gdm
pkgver=3.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
arch=('i686' 'x86_64')
license=('GPL')
@@ -11,7 +12,7 @@
'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
groups=('gnome-extra')
options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
+depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
optdepends=('gnome-shell: new login interface')
install=gdm.install
@@ -19,9 +20,10 @@
fix_external_program_directories.patch
gdm-vt-allocation-hack.patch
gdm
- gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
+ gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam
+ check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d)
sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7'
- '55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15'
+ '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363'
'3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
@@ -29,10 +31,12 @@
'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
'0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
- '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
+ '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834'
+ 'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/check-for-shell.patch"
patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
Added: check-for-shell.patch
===================================================================
--- check-for-shell.patch (rev 0)
+++ check-for-shell.patch 2011-10-02 01:21:56 UTC (rev 139469)
@@ -0,0 +1,26 @@
+From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
+From: György Balló <ballogy at freestart.hu>
+Date: Fri, 30 Sep 2011 21:48:40 +0000
+Subject: data: add back check for gnome-shell before running gdm-shell session
+
+Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
+
+This commit does a quick check to make sure gnome-shell is
+installed, and supports --gdm-mode. If either of those fail,
+then fall back to the old greeter.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660409
+---
+diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
+index 3d408c3..496cc10 100644
+--- a/data/gdm-shell.session.in
++++ b/data/gdm-shell.session.in
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback
+--
+cgit v0.9.0.2
Modified: fix_external_program_directories.patch
===================================================================
--- fix_external_program_directories.patch 2011-10-02 00:35:06 UTC (rev 139468)
+++ fix_external_program_directories.patch 2011-10-02 01:21:56 UTC (rev 139469)
@@ -1,6 +1,6 @@
-diff -Nur gdm-3.1.91.orig/daemon/gdm-server.c gdm-3.1.91/daemon/gdm-server.c
---- gdm-3.1.91.orig/daemon/gdm-server.c 2011-09-09 21:58:06.586838200 +0000
-+++ gdm-3.1.91/daemon/gdm-server.c 2011-09-09 21:58:14.583578916 +0000
+diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c
+--- gdm-3.2.0.orig/daemon/gdm-server.c 2011-10-02 01:13:37.772372528 +0000
++++ gdm-3.2.0/daemon/gdm-server.c 2011-10-02 01:14:58.036444496 +0000
@@ -131,7 +131,7 @@
g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
@@ -10,19 +10,19 @@
server->priv->display_name);
g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.1.91.orig/data/gdm-shell.session.in gdm-3.1.91/data/gdm-shell.session.in
---- gdm-3.1.91.orig/data/gdm-shell.session.in 2011-09-09 21:58:06.613505113 +0000
-+++ gdm-3.1.91/data/gdm-shell.session.in 2011-09-09 21:59:00.300668930 +0000
+diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in
+--- gdm-3.2.0.orig/data/gdm-shell.session.in 2011-10-02 01:17:01.394246573 +0000
++++ gdm-3.2.0/data/gdm-shell.session.in 2011-10-02 01:16:22.210552560 +0000
@@ -1,5 +1,5 @@
[GNOME Session]
Name=Display Manager
RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated
+-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated'
FallbackSession=gdm-fallback
-diff -Nur gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-09-09 21:58:06.613505113 +0000
-+++ gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c 2011-09-09 21:58:14.583578916 +0000
+diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:13:37.775705892 +0000
++++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:14:58.036444496 +0000
@@ -131,7 +131,7 @@
ret = FALSE;
More information about the arch-commits
mailing list