gdm: fix at-spi2-core initialization, added missing libxklavier support.

This commit is contained in:
Juan RP 2011-07-25 10:05:39 +02:00
parent 9e980476b2
commit 3247aff128

View file

@ -1,6 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
version=3.0.4
revision=1
distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
@ -59,34 +60,39 @@ Add_dependency run libXdmcp
Add_dependency run tcp_wrappers-libs
Add_dependency run libcanberra
Add_dependency run libXrandr
Add_dependency run libxklavier
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
Add_dependency build glib-devel
Add_dependency build libX11-devel
Add_dependency build dbus-glib-devel
Add_dependency build dbus-devel
Add_dependency build libXau-devel
Add_dependency build pam-devel
Add_dependency build accountsservice-devel
Add_dependency build gtk+3-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build cairo-devel
Add_dependency build pango-devel
Add_dependency build GConf-devel
Add_dependency build fontconfig-devel
Add_dependency build upower-devel
Add_dependency build libXdmcp-devel
Add_dependency build tcp_wrappers-devel
Add_dependency build libcanberra-devel
Add_dependency build libXrandr-devel
Add_dependency build libxklavier-devel
Add_dependency full ConsoleKit-x11
Add_dependency full xorg-server
Add_dependency full hicolor-icon-theme
Add_dependency full polkit-gnome
pre_configure()
{
# Transform ${exec_prefix} to start at-spi-registryd!
# Make it use at-spi2-registryd, at-spi-registryd is from gnome2.
sed -i -e "s|\${exec_prefix}|/usr|" \
-e "s|at-spi-registryd|at-spi2-registryd|g" \
data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
sed -i -e "s|at-spi-registryd|at-spi2-registryd|g" \
gui/simple-chooser/gdm-host-chooser.c \
gui/simple-chooser/chooser-main.c
}
post_install()
{
# Use our own pam files.
@ -95,11 +101,7 @@ post_install()
install -m644 ${FILESDIR}/gdm-autologin.pam \
${DESTDIR}/etc/pam.d/gdm-autologin
# Install OpenRC service.
install -D -m755 ${FILESDIR}/gdm.rc ${DESTDIR}/etc/init.d/gdm
# Transform ${exec_prefix} to start at-spi-registryd!
sed -i -e "s|\${exec_prefix}|/usr|" \
${DESTDIR}//usr/share/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
install -Dm755 ${FILESDIR}/gdm.rc ${DESTDIR}/etc/init.d/gdm
mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \