Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
gdm
gdm-helper-directory.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gdm-helper-directory.patch of Package gdm
Index: gdm-2.28.2/configure.ac =================================================================== --- gdm-2.28.2.orig/configure.ac +++ gdm-2.28.2/configure.ac @@ -990,6 +990,22 @@ fi AC_SUBST(GDM_CUSTOM_CONF) AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf') +AC_ARG_WITH(gnome-settings-daemon-directory, + [AC_HELP_STRING([--with-gnome-settings-daemon-directory], + [Specify the directory of gnome-settings-daemon @<:@default=libexecdir@:>@])],, + [with_gnome_settings_daemon_directory="\${libexecdir}"]) + +GNOME_SETTINGS_DAEMON_DIR=$with_gnome_settings_daemon_directory +AC_SUBST(GNOME_SETTINGS_DAEMON_DIR) + +AC_ARG_WITH(consolekit-directory, + [AC_HELP_STRING([--with-consolekit-directory], + [Specify the directory of ck-get-x11-display-device @<:@default=libexecdir@:>@])],, + [with_consolekit_directory="\${libexecdir}"]) + +CONSOLEKIT_DIR=$with_consolekit_directory +AC_SUBST(CONSOLEKIT_DIR) + dnl --------------------------------------------------------------------------- dnl - Check for XEvIE extension support dnl --------------------------------------------------------------------------- @@ -1400,6 +1416,8 @@ echo " dmconfdir: ${dmconfdir} localstatedir: ${localstatedir} datadir: ${datadir} + g-s-d location: ${with_gnome_settings_daemon_directory} + consolekit location: ${with_consolekit_directory} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} Index: gdm-2.28.2/daemon/Makefile.am =================================================================== --- gdm-2.28.2.orig/daemon/Makefile.am +++ gdm-2.28.2/daemon/Makefile.am @@ -17,6 +17,7 @@ AM_CPPFLAGS = \ -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \ + -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \ $(DISABLE_DEPRECATED_CFLAGS) \ $(DAEMON_CFLAGS) \ $(XLIB_CFLAGS) \ Index: gdm-2.28.2/daemon/gdm-server.c =================================================================== --- gdm-2.28.2.orig/daemon/gdm-server.c +++ gdm-2.28.2/daemon/gdm-server.c @@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device g_return_val_if_fail (GDM_IS_SERVER (server), NULL); error = NULL; - command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", + command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s", server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); Index: gdm-2.28.2/data/greeter-autostart/Makefile.am =================================================================== --- gdm-2.28.2.orig/data/greeter-autostart/Makefile.am +++ gdm-2.28.2/data/greeter-autostart/Makefile.am @@ -5,7 +5,8 @@ edit = sed \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ + -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' %.desktop.in: %.desktop.in.in Makefile $(edit) $< >$@ Index: gdm-2.28.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in =================================================================== --- gdm-2.28.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +++ gdm-2.28.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application _Name=GNOME Settings Daemon -TryExec=@LIBEXECDIR@/gnome-settings-daemon -Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins +TryExec=@GNOME_SETTINGS_DAEMON_DIR@/gnome-settings-daemon +Exec=@GNOME_SETTINGS_DAEMON_DIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor