diff options
Diffstat (limited to 'linden/indra/newview')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 4a17cd0..7563268 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -938,18 +938,19 @@ class Linux_i686Manifest(LinuxManifest): | |||
| 938 | self.path("libalut.so.0") | 938 | self.path("libalut.so.0") |
| 939 | 939 | ||
| 940 | # GTK+ and dependencies | 940 | # GTK+ and dependencies |
| 941 | self.path("libatk-1.0.so.0") | 941 | ## Lets just use the system libraries for all of these: |
| 942 | self.path("libcairo.so.2") | 942 | ##self.path("libatk-1.0.so.0") |
| 943 | self.path("libfontconfig.so.1") | 943 | ##self.path("libcairo.so.2") |
| 944 | self.path("libfreetype.so.6") | 944 | ##self.path("libfontconfig.so.1") |
| 945 | ##self.path("libfreetype.so.6") | ||
| 945 | # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why | 946 | # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why |
| 946 | self.path("libgdk-x11-2.0.so.0") | 947 | ##self.path("libgdk-x11-2.0.so.0") |
| 947 | self.path("libgtk-x11-2.0.so.0") | 948 | ##self.path("libgtk-x11-2.0.so.0") |
| 948 | # self.path("libpango-1.0.so.0") # dto. | 949 | # self.path("libpango-1.0.so.0") # dto. |
| 949 | # self.path("libpangoft2-1.0.so.0") | 950 | # self.path("libpangoft2-1.0.so.0") |
| 950 | # self.path("libpangox-1.0.so.0") | 951 | # self.path("libpangox-1.0.so.0") |
| 951 | # self.path("libpangoxft-1.0.so.0") | 952 | # self.path("libpangoxft-1.0.so.0") |
| 952 | self.path("libpixman-1.so.0") | 953 | ##self.path("libpixman-1.so.0") |
| 953 | 954 | ||
| 954 | # Gstreamer libs | 955 | # Gstreamer libs |
| 955 | self.path("libgstbase-0.10.so.0") | 956 | self.path("libgstbase-0.10.so.0") |
| @@ -1067,18 +1068,19 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
| 1067 | self.path("libalut.so.0") | 1068 | self.path("libalut.so.0") |
| 1068 | 1069 | ||
| 1069 | # GTK+ and dependencies | 1070 | # GTK+ and dependencies |
| 1070 | self.path("libatk-1.0.so.0") | 1071 | ## Lets just use the system libraries for all of these: |
| 1071 | self.path("libcairo.so.2") | 1072 | ##self.path("libatk-1.0.so.0") |
| 1072 | self.path("libfontconfig.so.1") | 1073 | ##self.path("libcairo.so.2") |
| 1073 | self.path("libfreetype.so.6") | 1074 | ##self.path("libfontconfig.so.1") |
| 1075 | ##self.path("libfreetype.so.6") | ||
| 1074 | # self.path("libgdk_pixbuf-2.0.so.0") # use systems gdk pixbufs instead | 1076 | # self.path("libgdk_pixbuf-2.0.so.0") # use systems gdk pixbufs instead |
| 1075 | self.path("libgdk-x11-2.0.so.0") | 1077 | ##self.path("libgdk-x11-2.0.so.0") |
| 1076 | self.path("libgtk-x11-2.0.so.0") | 1078 | ##self.path("libgtk-x11-2.0.so.0") |
| 1077 | # self.path("libpango-1.0.so.0") # use systems pango instead | 1079 | # self.path("libpango-1.0.so.0") # use systems pango instead |
| 1078 | # self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules | 1080 | # self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules |
| 1079 | # self.path("libpangox-1.0.so.0") # and crash if not compatible or present. | 1081 | # self.path("libpangox-1.0.so.0") # and crash if not compatible or present. |
| 1080 | # self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway. | 1082 | # self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway. |
| 1081 | self.path("libpixman-1.so.0") | 1083 | ##self.path("libpixman-1.so.0") |
| 1082 | 1084 | ||
| 1083 | # Gstreamer libs | 1085 | # Gstreamer libs |
| 1084 | self.path("libgstbase-0.10.so.0") | 1086 | self.path("libgstbase-0.10.so.0") |