Merge remote branch 'aleric/weekly' into weekly

3 files changed, 20 insertions, 14 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 9c5e9f7..e8e0d9e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -90,6 +90,7 @@ else (WINDOWS)
         gmodule-2.0
         gthread-2.0
         glib-2.0
+        gio-2.0
         xml2.2
         )
 
@@ -109,6 +110,7 @@ else (WINDOWS)
         gthread-2.0
         rt
         glib-2.0
+        gio-2.0
         )
 
   endif (DARWIN)
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index b70a531..9d068c4 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -39,6 +39,7 @@ else (STANDALONE)
         gdk-x11-2.0
         gdk_pixbuf-2.0
         glib-2.0
+        gio-2.0
         gmodule-2.0
         gobject-2.0
         gthread-2.0
@@ -48,6 +49,7 @@ else (STANDALONE)
         pangox-1.0
         pangoxft-1.0
         pixman-1
+        pangocairo-1.0
         )
   endif (LINUX)
 
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):
             self.path("libalut.so.0")
 
             # GTK+ and dependencies
-            self.path("libatk-1.0.so.0")
-            self.path("libcairo.so.2")
-            self.path("libfontconfig.so.1")
-            self.path("libfreetype.so.6")
+            ## Lets just use the system libraries for all of these:
+            ##self.path("libatk-1.0.so.0")
+            ##self.path("libcairo.so.2")
+            ##self.path("libfontconfig.so.1")
+            ##self.path("libfreetype.so.6")
            # 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("libgdk-x11-2.0.so.0")
+            ##self.path("libgtk-x11-2.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")
+            ##self.path("libpixman-1.so.0")
 
             # Gstreamer libs
             self.path("libgstbase-0.10.so.0")
@@ -1067,18 +1068,19 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libalut.so.0")
 
             # GTK+ and dependencies
-            self.path("libatk-1.0.so.0")
-            self.path("libcairo.so.2")
-            self.path("libfontconfig.so.1")
-            self.path("libfreetype.so.6")
+            ## Lets just use the system libraries for all of these:
+            ##self.path("libatk-1.0.so.0")
+            ##self.path("libcairo.so.2")
+            ##self.path("libfontconfig.so.1")
+            ##self.path("libfreetype.so.6")
 #            self.path("libgdk_pixbuf-2.0.so.0")        # use systems gdk pixbufs instead
-            self.path("libgdk-x11-2.0.so.0")
-            self.path("libgtk-x11-2.0.so.0")
+            ##self.path("libgdk-x11-2.0.so.0")
+            ##self.path("libgtk-x11-2.0.so.0")
 #            self.path("libpango-1.0.so.0")             # use systems pango instead
 #            self.path("libpangoft2-1.0.so.0")          # Both gdk pixbufs and pango would load systems modules
 #            self.path("libpangox-1.0.so.0")            # and crash if not compatible or present. 
 #            self.path("libpangoxft-1.0.so.0")          # So we depend system gdk pixbufs and pango anyway.
-            self.path("libpixman-1.so.0")
+            ##self.path("libpixman-1.so.0")
 
             # Gstreamer libs
             self.path("libgstbase-0.10.so.0")