|
 |
51be249 |
diff -up mash-0.2.10/mash/multilib.py.foo mash-0.2.10/mash/multilib.py
|
|
|
51be249 |
--- mash-0.2.10/mash/multilib.py.foo 2007-09-25 15:33:41.000000000 -0400
|
|
|
51be249 |
+++ mash-0.2.10/mash/multilib.py 2008-06-23 16:42:00.000000000 -0400
|
|
|
51be249 |
@@ -66,7 +66,7 @@ class RuntimeMultilibMethod(MultilibMeth
|
|
|
8903fe3 |
|
|
|
8903fe3 |
def select(self, po):
|
|
|
8903fe3 |
libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
|
|
|
8903fe3 |
- whitelist = [ 'libgnat', 'wine', 'wine-arts', 'nspluginwrapper', 'libflashsupport', 'valgrind' ]
|
|
|
8903fe3 |
+ whitelist = [ 'libgnat', 'wine', 'wine-arts', 'nspluginwrapper', 'libflashsupport', 'pulseaudio-utils', 'valgrind' ]
|
|
|
8903fe3 |
if po.name in whitelist:
|
|
|
8903fe3 |
return True
|
|
|
8903fe3 |
if MultilibMethod.select(self,po):
|
|
|
51be249 |
@@ -89,17 +89,23 @@ class RuntimeMultilibMethod(MultilibMeth
|
|
|
17c99c3 |
# nss
|
|
|
17c99c3 |
if dirname in [ '/lib', '/lib64' ] and filename.startswith('libnss_'):
|
|
|
17c99c3 |
return True
|
|
|
17c99c3 |
+ # alsa
|
|
|
17c99c3 |
+ if dirname in [ '/usr/lib/alsa-lib', '/usr/lib64/alsa-lib' ]:
|
|
|
17c99c3 |
+ return True
|
|
|
17c99c3 |
# mysql, qt, etc.
|
|
|
17c99c3 |
if dirname == '/etc/ld.so.conf.d' and filename.endswith('.conf'):
|
|
|
17c99c3 |
return True
|
|
|
17c99c3 |
# gtk2-engines
|
|
|
17c99c3 |
if fnmatch(dirname, '/usr/lib*/gtk-2.0/*/engines'):
|
|
|
17c99c3 |
return True
|
|
|
17c99c3 |
+ # accessibility
|
|
|
17c99c3 |
+ if fnmatch(dirname, '/usr/lib*/gtk-2.0/modules'):
|
|
|
17c99c3 |
+ return True
|
|
|
17c99c3 |
# scim-bridge-gtk
|
|
|
17c99c3 |
if fnmatch(dirname, '/usr/lib*/gtk-2.0/immodules'):
|
|
|
17c99c3 |
return True
|
|
|
51be249 |
- # scim-qtimm
|
|
|
51be249 |
- if fnmatch(dirname, '/usr/lib*/qt-*/plugins/inputmethods'):
|
|
|
51be249 |
+ # scim-qt*
|
|
|
51be249 |
+ if fnmatch(dirname, '/usr/lib*/qt*/plugins/inputmethods'):
|
|
|
51be249 |
return True
|
|
|
51be249 |
|
|
|
51be249 |
return False
|