Sophie

Sophie

distrib > Mandriva > 2010.1 > i586 > media > contrib-updates-src > by-pkgid > 790e1a3da4fee0bc86682a21c49909d1 > files > 1

gnome-shell-2.29.1-8.1mdv2010.1.src.rpm

diff -p -up gnome-shell-2.29.0/src/gnome-shell.in~ gnome-shell-2.29.0/src/gnome-shell.in
--- gnome-shell-2.29.0/src/gnome-shell.in~	2010-01-13 21:23:48.000000000 +0100
+++ gnome-shell-2.29.0/src/gnome-shell.in	2010-02-23 12:39:33.000000000 +0100
@@ -106,14 +106,9 @@ def start_shell():
 
     # Work around Ubuntu xulrunner bug,
     # http://bugzilla.gnome.org/show_bug.cgi?id=573413
-    pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],
-                                 stdout=subprocess.PIPE)
-    mozjs_sdkdir = pkgconfig.communicate()[0].strip()
-    pkgconfig.wait()
-    if pkgconfig.returncode == 0:
-        mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
-        if os.path.exists(mozjs_libdir + '/libmozjs.so'):
-            env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
+    mozjs_libdir = 'xXULRUNNERDIRx'
+    if os.path.exists(mozjs_libdir + '/libmozjs.so'):
+         env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
 
     # Log everything to stderr (make stderr our "log file")
     env['GJS_DEBUG_OUTPUT'] = 'stderr'