Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
gdm
gdm-helper-directory.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gdm-helper-directory.patch of Package gdm
Index: gdm-3.1.90/configure.ac =================================================================== --- gdm-3.1.90.orig/configure.ac +++ gdm-3.1.90/configure.ac @@ -1045,6 +1045,22 @@ fi AC_SUBST(GDM_CUSTOM_CONF) AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf') +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) + +AC_ARG_WITH(check-accelerated-directory, + [AC_HELP_STRING([--with-check-accelerated-directory], + [Specify the directory of gnome-session-check-accelerated @<:@default=libexecdir@:>@])],, + [with_check_accelerated_directory="\${libexecdir}"]) + +CHECK_ACCELERATED_DIR=$with_check_accelerated_directory +AC_SUBST(CHECK_ACCELERATED_DIR) + dnl --------------------------------------------------------------------------- dnl - Check for XEvIE extension support dnl --------------------------------------------------------------------------- @@ -1497,6 +1513,8 @@ echo " dmconfdir: ${dmconfdir} localstatedir: ${localstatedir} datadir: ${datadir} + consolekit location: ${with_consolekit_directory} + gnome-session-check-accel location: ${with_check_accelerated_directory} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} Index: gdm-3.1.90/daemon/Makefile.am =================================================================== --- gdm-3.1.90.orig/daemon/Makefile.am +++ gdm-3.1.90/daemon/Makefile.am @@ -20,6 +20,7 @@ AM_CPPFLAGS = \ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_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-3.1.90/daemon/gdm-server.c =================================================================== --- gdm-3.1.90.orig/daemon/gdm-server.c +++ gdm-3.1.90/daemon/gdm-server.c @@ -134,7 +134,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-3.1.90/data/gdm-shell.session.in =================================================================== --- gdm-3.1.90.orig/data/gdm-shell.session.in +++ gdm-3.1.90/data/gdm-shell.session.in @@ -1,5 +1,5 @@ [GNOME Session] Name=Display Manager RequiredComponents=gnome-shell;gnome-settings-daemon; -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 && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated' FallbackSession=gdm-fallback Index: gdm-3.1.90/data/Makefile.am =================================================================== --- gdm-3.1.90.orig/data/Makefile.am +++ gdm-3.1.90/data/Makefile.am @@ -77,6 +77,7 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in gdm-shell.session: $(srcdir)/gdm-shell.session.in sed -e 's,[@]libexecdir[@],$(libexecdir),g' \ + -e 's,[@]CHECK_ACCELERATED_DIR[@],$(CHECK_ACCELERATED_DIR),g' \ < $(srcdir)/gdm-shell.session.in > gdm-shell.session localealiasdir = $(datadir)/gdm
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