Advertisement
Guest User

asac

a guest
Jul 1st, 2009
78
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.00 KB | None | 0 0
  1. diff --git a/src/gnome-shell.in b/src/gnome-shell.in
  2. index f1d5e0b..b875531 100755
  3. --- a/src/gnome-shell.in
  4. +++ b/src/gnome-shell.in
  5. @@ -147,12 +147,13 @@ def start_shell():
  6.  
  7. # Work around Ubuntu xulrunner bug,
  8. # http://bugzilla.gnome.org/show_bug.cgi?id=573413
  9. - pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],
  10. + xulrunner = subprocess.Popen(['xulrunner', '--gre-version'],
  11. stdout=subprocess.PIPE)
  12. - mozjs_sdkdir = pkgconfig.communicate()[0].strip()
  13. - pkgconfig.wait()
  14. - if pkgconfig.returncode == 0:
  15. - mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
  16. + xulrunner.wait()
  17. + gre_version = xulrunner.communicate()[0].strip()
  18. + mozjs_pkglibdir = "/usr/lib/xulrunner-" + gre_version
  19. + if xulrunner.returncode == 0:
  20. + mozjs_libdir = mozjs_pkglibdir
  21. if os.path.exists(mozjs_libdir + '/libmozjs.so'):
  22. env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
  23.  
  24.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement