aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt8
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py10
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 @@
169 modified: linden/install.xml 169 modified: linden/install.xml
170 170
171 171
1722010-01-05 Armin Weatherwax <Armin.Weatherwax@gmail.com>
173
174 * Removed pixbuf and pango from linux32 viewer_manifest.
175 They sometimes cause trouble when distributed.
176
177 modified: linden/indra/newview/viewer_manifest.py
178
179
1722010-01-04 Jacek Antonelli <jacek.antonelli@gmail.com> 1802010-01-04 Jacek Antonelli <jacek.antonelli@gmail.com>
173 181
174 * Implemented VWR-9597 (optional message when paying someone). 182 * 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):
904 self.path("libcairo.so.2") 904 self.path("libcairo.so.2")
905 self.path("libfontconfig.so.1") 905 self.path("libfontconfig.so.1")
906 self.path("libfreetype.so.6") 906 self.path("libfreetype.so.6")
907 self.path("libgdk_pixbuf-2.0.so.0") 907 # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why
908 self.path("libgdk-x11-2.0.so.0") 908 self.path("libgdk-x11-2.0.so.0")
909 self.path("libgtk-x11-2.0.so.0") 909 self.path("libgtk-x11-2.0.so.0")
910 self.path("libpango-1.0.so.0") 910 # self.path("libpango-1.0.so.0") # dto.
911 self.path("libpangoft2-1.0.so.0") 911 # self.path("libpangoft2-1.0.so.0")
912 self.path("libpangox-1.0.so.0") 912 # self.path("libpangox-1.0.so.0")
913 self.path("libpangoxft-1.0.so.0") 913 # self.path("libpangoxft-1.0.so.0")
914 self.path("libpixman-1.so.0") 914 self.path("libpixman-1.so.0")
915 915
916 # Gstreamer libs 916 # Gstreamer libs