From 4dfeadb951717d6808bf07d47b3356dbb131b524 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 5 Jan 2010 23:33:15 +0100 Subject: Removed pixbuf and pango from linux32 viewer_manifest. They sometimes cause trouble when distributed. (Cherry-picked by Jacek from 9efbb42c) --- ChangeLog.txt | 8 ++++++++ linden/indra/newview/viewer_manifest.py | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 941ee35..cbcc174 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -169,6 +169,14 @@ modified: linden/install.xml +2010-01-05 Armin Weatherwax + + * Removed pixbuf and pango from linux32 viewer_manifest. + They sometimes cause trouble when distributed. + + modified: linden/indra/newview/viewer_manifest.py + + 2010-01-04 Jacek Antonelli * Implemented VWR-9597 (optional message when paying someone). diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index d7acfea..b32d31c 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -904,13 +904,13 @@ class Linux_i686Manifest(LinuxManifest): self.path("libcairo.so.2") self.path("libfontconfig.so.1") self.path("libfreetype.so.6") - self.path("libgdk_pixbuf-2.0.so.0") + # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why self.path("libgdk-x11-2.0.so.0") self.path("libgtk-x11-2.0.so.0") - self.path("libpango-1.0.so.0") - self.path("libpangoft2-1.0.so.0") - self.path("libpangox-1.0.so.0") - self.path("libpangoxft-1.0.so.0") + # self.path("libpango-1.0.so.0") # dto. + # self.path("libpangoft2-1.0.so.0") + # self.path("libpangox-1.0.so.0") + # self.path("libpangoxft-1.0.so.0") self.path("libpixman-1.so.0") # Gstreamer libs -- cgit v1.1