5 files changed, 32 insertions, 53 deletions

diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
index a4befa4..034eed5 100644
--- a/linden/indra/cmake/WebKitLibPlugin.cmake
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -29,6 +29,9 @@ if (STANDALONE)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
+  if(LINUX)
+     use_prebuilt_binary(kokua-qt)
+  endif(LINUX)
     use_prebuilt_binary(llqtwebkit)
     set(WEBKITLIBPLUGIN ON CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
@@ -62,8 +65,6 @@ elseif (LINUX)
      else (STANDALONE)
        set(WEBKIT_PLUGIN_LIBRARIES
         llqtwebkit
-        qgif
-        qjpeg
         QtWebKit
         QtOpenGL
         QtNetwork
@@ -74,6 +75,8 @@ elseif (LINUX)
         X11
         Xrender
         GL
+        jscore
         )
+
      endif (STANDALONE)
 endif (WINDOWS)
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 48e5130..8a16a0e 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -17,6 +17,10 @@ else (STANDALONE)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
   if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
+    if(LINUX AND ${ARCH} STREQUAL "x86_64")
+      set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    else(LINUX AND ${ARCH} STREQUAL "x86_64")
+      set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
+    endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   endif (WINDOWS OR LINUX)
 endif (STANDALONE)
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 4a00557..2cae8d2 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -81,6 +81,7 @@ extern "C" {
 #ifdef LL_STANDALONE
 #include <qglobal.h>
 #elif defined(LL_LINUX)
+
 // We don't provide Qt headers for non-standalone, therefore define this here.
 // Our prebuilt is built with QT_NAMESPACE undefined.
 #define QT_MANGLE_NAMESPACE(name) name
@@ -1156,7 +1157,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
                                 std::string url = message_in.getValue("url");
                                 if ( 404 == code )      // browser lib only supports 404 right now
                                 {
+#if LLQTWEBKIT_API_VERSION < 8
                                         LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url );
+#endif
                                 };
                         }
                         else if(message_name == "set_user_agent")
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 13795e5..06bee7d 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -261,8 +261,11 @@ LLFloaterAbout::LLFloaterAbout()
         support.append("\n");
 
         // TODO: Implement media plugin version query
-
+#if LL_LINUX
+        support.append("Qt Webkit Version: 4.7.4 (version number hard-coded)");
+#else
         support.append("Qt Webkit Version: 4.6 (version number hard-coded)");
+#endif
         support.append("\n");
 
         if (gPacketsIn > 0)
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 9ad43ad..c13cf1a 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1059,19 +1059,30 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
             self.path("libdb-4.2.so")
-            self.path("libcrypto.so.0.9.8")
+            self.path("libcrypto.so")
+            self.path("libcrypto.so.1.0.0")
             self.path("libexpat.so.1")
             self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0")
-            self.path("libssl.so.0.9.8")
+            self.path("libssl.so")
+            self.path("libssl.so.1.0.0")
             self.path("libuuid.so", "libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libjpeg.so.7")
             self.path("libpng12.so.0")
             self.path("libopenjpeg.so.2")
-            #self.path("libz.so.1") #not needed
 
+            self.path("libcares.so")
+            self.path("libcares.so.2")
+            self.path("libcares.so.2.0.0")
+            self.path("libcurl.so")
+            self.path("libcurl.so.4")
+            self.path("libcurl.so.4.2.0")
+            self.path("libz.so.1.2.5")
+            self.path("libz.so.1")
+            self.path("libz.so")
             # OpenAL
+
             self.path("libopenal.so")
             self.path("libopenal.so.1")
             self.path("libopenal.so.1.13.0")
@@ -1112,54 +1123,9 @@ class Linux_x86_64Manifest(LinuxManifest):
             #self.path("libgsttag-0.10.so.0")
             #self.path("libgstvideo-0.10.so.0")
 
-            ## Gstreamer plugin dependencies
-            #self.path("libfaad.so.0")
-            #self.path("libogg.so.0")
-            #self.path("libtheora.so.0")
-            #self.path("libvorbis.so.0")
-            #self.path("libvorbisenc.so.2")
-            #self.path("liboil-0.3.so.0")
 
-            ## Gstreamer plugins
-            #if self.prefix("gstreamer-plugins"):
-                #self.path("libgstalsa.so")
-                #self.path("libgstasf.so")
-                #self.path("libgstaudioconvert.so")
-                #self.path("libgstaudioresample.so")
-                #self.path("libgstautodetect.so")
-                #self.path("libgstavi.so")
-                #self.path("libgstcoreelements.so")
-                #self.path("libgstcoreindexers.so")
-                #self.path("libgstdecodebin2.so")
-                #self.path("libgstdecodebin.so")
-                #self.path("libgstesd.so")
-                #self.path("libgstfaad.so")
-                #self.path("libgstffmpeg.so")
-                #self.path("libgstffmpegcolorspace.so")
-                #self.path("libgstgnomevfs.so")
-                #self.path("libgsticydemux.so")
-                #self.path("libgstid3demux.so")
-                #self.path("libgstmpegdemux.so")
-                #self.path("libgstmultifile.so")
-                #self.path("libgstmultipart.so")
-                #self.path("libgstogg.so")
-                #self.path("libgstossaudio.so")
-                #self.path("libgstplaybin.so")
-                #self.path("libgstpulse.so")
-                #self.path("libgstqtdemux.so")
-                #self.path("libgstqueue2.so")
-                #self.path("libgsttcp.so")
-                #self.path("libgsttheora.so")
-                #self.path("libgsttypefindfunctions.so")
-                #self.path("libgstudp.so")
-                #self.path("libgstvideoscale.so")
-                #self.path("libgstvolume.so")
-                #self.path("libgstvorbis.so")
-                #self.path("libgstwavparse.so")
-                
-                #self.end_prefix("gstreamer-plugins")
             self.end_prefix("lib64")
-        
+
 
             # Vivox runtimes and libs
             if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):