RED-429: Link against prebuilt libraries / always use gtk-related system libs (linux)

This patch fixes the problem that there were no 'developer' symlinks
for the prebuilt packages (which is not needed for runtim), causing
the casual user that tries to compile the viewer on linux (without
using --standalone) to link against their system libs (while using
the header files of the prebuilt versions), often causing linker
errors.

It also fixes the fact that a few libraries were completely missing,
most notably the dbusglib package only had header files and not
a library at all! libgio and libpangocairo where missing from the
link command line so that the wrong libraries were picked up, if
any at all.

Finally, the last GTK related prebuilt libraries have simply been
removed from the packaging: linux has those installed (or else
the users will know how to install them as soon as they see that
the viewer complains about a missing library). This is much more
stable, as all those libraries more or less form a whole.
Or rather, the libraries that use glib, as especially that one
gives a problem at the moment since the latest glib has new
g_malloc_n functions that don't exist in the prebuilt glib.

Note the difference between a USER compiling her own viewer,
and the imprudence team compiling a release:

When the imprudence team compiles a release we need to create
a portable binary that runs on many versions of linux. In order
to achieve that we link against "old" library versions, so
that the viewer still works on old operating systems, and
(hopefull) also on newer systems, since libraries with the
same SONAME are backwards compatible. With g_malloc_n as
example: our viewer binary doesn't use that function, so
a user that links with their own glib will never have a problem,
whether or not his library provides this function.

On the other hand, when a user gets the sources and compiles
his own viewer he wants to use the LATEST library versions:
his own operating system ones. The best way to achieve this
is to configure with --standalone, but that currently demands
that ALL libraries are installed on her system, including
a few very-hard-to-get libraries. If she therefore chooses
to configure without --standalone, she suddenly gets all
the old library versions, forcing her to at least link against
those at compile time (in order to minimize the risk of version
incompatibilities). A better solution for the do-it-yourself
user would be to have a --semi-standalone configuration that
only uses the hard-to-get prebuilt libs and further uses
as much the operating system libraries as possible. For most
of the hard-to-get libraries this is no problem since they
all only depend on libc and similar stable ABI libs.

6 files changed, 47 insertions, 16 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 5fe073c..1cbc2dd 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -62,6 +62,7 @@ Aleric Inglewood
         SNOW-766
         SNOW-796
         SNOW-800
+        RED-429
         RED-552
         RED-553
         RED-554
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")
diff --git a/linden/install.xml b/linden/install.xml
index 601e4b0..4985b69 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -334,9 +334,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>9738472b94191fae2b0fe3fce8df17b0</string>
+            <string>09be41e3145e1a960e50f2f9ce0a5e7d</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/dbusglib-linux64-20091129.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/dbusglib-linux64-20101007.tar.bz2</uri>
           </map>
         </map>
       </map>
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index fca6dbe..69f0c64 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -35,6 +35,7 @@ $/LicenseInfo$
 
 import sys
 import os.path
+import re
 
 # Look for indra/lib/python in all possible parent directories ...
 # This is an improvement over the setup-path.py method used previously:
@@ -563,6 +564,29 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
                     tar.extractall(path=install_dir)
                 except AttributeError:
                     _extractall(tar, path=install_dir)
+                if _get_platform() == 'linux' or _get_platform() == 'linux64':
+                    first = 1
+                    for tfile in tar.getnames():
+                        if tfile.find('.so.') > 0:
+                            LINK = re.sub(r'\.so\.[0-9.]*$', '.so', tfile)
+                            link_name = "../" + LINK
+                            if not os.path.exists(link_name):
+                                if first == 1:
+                                    first = 0
+                                    print "Adding missing symlink(s) for package %s:" % ifile.filename
+                                target = os.path.basename(tfile)
+                                soname = os.popen("readelf -d \"../%(tfile)s\" "
+                                    " | grep SONAME "
+                                    " | sed -e 's/.*\[//;s/\].*//'" % {"tfile": tfile}).read()
+                                soname = soname.strip()
+                                if soname:  # not empty
+                                    tmpfname = os.path.dirname(LINK) + "/" + soname
+                                    if os.path.exists("../" + tmpfname):
+                                        target = soname
+                                    else:
+                                        print "WARNING: SONAME %s doesn't exist!" % tmpfname
+                                os.symlink(target, link_name)
+                                print "    %s --> %s" % (LINK, target)
             if ifile.pkgname in self._installed:
                 self._installed[ifile.pkgname].add_files(
                     ifile.url,