Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=f67d2fb14f8b2191ab5eccbd30d098932fb27f93
commit f67d2fb14f8b2191ab5eccbd30d098932fb27f93
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sat Apr 23 17:40:02 2011 +0200
Revert "xorg-server-1.9.4-2-i686"
This reverts commit 2cfe48bc68bb4e9fdb19a21bc48534086aa0f92a.
*will use /etc/sysconfig/desktop and not a prefdm
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 8c7f824..6179153 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -9,7 +9,7 @@ USE_SERVERDMX=${USE_SERVERDMX:-"y"}
pkgname=xorg-server
pkgver=1.9.4
-pkgrel=2
+pkgrel=1
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
@@ -39,15 +39,13 @@ source=("${source[@]}" \
xorg-server-1.9-nouveau-default.patch
desktop \
10-evdev.conf \
- 20-synaptics.conf \
- prefdm)
+ 20-synaptics.conf)
sha1sums=('e8d5776fe973f15c0e907fd827106f8d296acf7e' \
'bda6f333b53fcc2e1d823364a1e12e2061a66700' \
'905cc57547421ff3ca77ec1c8e6898a7a414346f' \
'9318b631eb06833bea18d5a5efd15df89ad5d12a' \
- '6c0156d129ddd2fb5277b76af1738298c2d09d4d' \
- '086bb93abd7dfb96eeb067b16a318eaad036bc69')
+ '6c0156d129ddd2fb5277b76af1738298c2d09d4d')
if Fuse $USE_DEVEL; then
pkgver=1.6.3.901.151.g120286a
@@ -150,9 +148,6 @@ build() {
else
Fcd $_F_xorg_name-$pkgver
fi
- #start login manager
- Fexe prefdm usr/bin/prefdm
-
Fpatchall
Fautoreconf
Fmake \
diff --git a/source/x11/xorg-server/prefdm b/source/x11/xorg-server/prefdm
deleted file mode 100644
index e1544f6..0000000
--- a/source/x11/xorg-server/prefdm
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-# Run preferred X display manager
-quit_arg="--retain-splash"
-if [ -f /etc/sysconfig/desktop ]; then
- . /etc/sysconfig/desktop
-fi
-
-# shut down boot splash
-/usr/bin/plymouth quit $quit_arg
-
-shopt -s execfail
-
-[ -n "$desktop" ] && exec $desktop "$@" >/dev/null 2>&1 </dev/null
-
-# Fallbacks, in order
-exec gdm "$@" >/dev/null 2>&1 </dev/null
-exec kdm "$@" >/dev/null 2>&1 </dev/null
-exec lxdm "$@" >/dev/null 2>&1 </dev/null
-exec slim "$@" >/dev/null 2>&1 </dev/null
-exec xdm "$@" >/dev/null 2>&1 </dev/null
-
-# catch all exit error
-exit 1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
