brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set GCONF_DEFAULT_SOURCE_PATH from the gnome-shell wrapper script

Browse Source 
Needed so that a jhbuilt gnome-shell can find its schemas at runtime
This commit is contained in:
Dan Winship 2009-06-30 17:29:40 -04:00
parent 8a790e1c38
commit a5e3227b64
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -14,6 +14,7 @@ gnome-shell: gnome-shell.in
-e "s|@libexecdir[@]|$(libexecdir)|" \ -e "s|@libexecdir[@]|$(libexecdir)|" \
-e "s|@libdir[@]|$(libdir)|" \ -e "s|@libdir[@]|$(libdir)|" \
-e "s|@pkgdatadir[@]|$(pkgdatadir)|" \ -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
-e "s|@sysconfdir[@]|$(sysconfdir)|" \
$< > $@ && chmod a+x $@ $< > $@ && chmod a+x $@
CLEANFILES += gnome-shell CLEANFILES += gnome-shell
EXTRA_DIST += gnome-shell.in EXTRA_DIST += gnome-shell.in

4
src/gnome-shell.in
View File

@ -141,6 +141,10 @@ def start_shell():
env.update({'GNOME_SHELL_DATADIR' : data_dir, env.update({'GNOME_SHELL_DATADIR' : data_dir,
'GI_TYPELIB_PATH' : typelib_dir}) 'GI_TYPELIB_PATH' : typelib_dir})
jhbuild_gconf_source = os.path.join('@sysconfdir@', 'gconf/2/path.jhbuild')
if os.path.exists(jhbuild_gconf_source):
env['GCONF_DEFAULT_SOURCE_PATH'] = jhbuild_gconf_source
# Work around Ubuntu xulrunner bug, # Work around Ubuntu xulrunner bug,
# http://bugzilla.gnome.org/show_bug.cgi?id=573413 # http://bugzilla.gnome.org/show_bug.cgi?id=573413
pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'], pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],