Merge lp:~libqtelegram-team/telegram-app/app-bundle-thumbnailer into lp:telegram-app/app

[Michał Karnicki]

Bundle the old thumbnailer, as it has been removed in recent image. This is a temporary workaround before we have a proper C++ thumbnailer API.

I tested this the following way.

1) mv /usr/lib/arm-linux-gnueabihf/thumbnailer/vs-thumb /usr/lib/arm-linux-gnueabihf/thumbnailer/vs-thumb.old
2) record a video, confirm the gallery cannot generate a thumbnail (proves the shipped vs-thumb will not be used by Telegram app)
3) open Telegram, send the video, confirm the thumbnail is present

[Roberto Mier Escandón  (rmescandon)]

lgtm
Tested ok in regular and secret chats

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-27 13:54:43 +0000
+++ CMakeLists.txt	2015-07-20 13:25:43 +0000
@@ -157,6 +157,12 @@
     DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 install(
+    PROGRAMS
+        "thumbnailer/libthumbnailer.so.0"
+        "thumbnailer/vs-thumb"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+install(
     DIRECTORY
         "assets"
         "images"

=== modified file 'src/main.cpp'
--- src/main.cpp	2015-04-15 15:03:12 +0000
+++ src/main.cpp	2015-07-20 13:25:43 +0000
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h> 
+
 #include <QtGui/QGuiApplication>
 #include <QtQml/QtQml>
 #include <QtQml/QQmlDebuggingEnabler>
@@ -111,6 +113,10 @@
         qFatal("Could not find %s!", qPrintable(filePath));
     }
 
+    QString thumbnailerPath = QCoreApplication::applicationDirPath();
+    thumbnailerPath.append("/lib/arm-linux-gnueabihf/");
+    setenv("TN_UTILDIR", thumbnailerPath.toStdString().c_str(), 1);
+
     QGuiApplication::setApplicationName("Telegram");
     QGuiApplication::setOrganizationName("com.ubuntu.telegram");
 

=== added directory 'thumbnailer'
=== added file 'thumbnailer/libthumbnailer.so.0'
Binary files thumbnailer/libthumbnailer.so.0	1970-01-01 00:00:00 +0000 and thumbnailer/libthumbnailer.so.0	2015-07-20 13:25:43 +0000 differ
=== added file 'thumbnailer/vs-thumb'
Binary files thumbnailer/vs-thumb	1970-01-01 00:00:00 +0000 and thumbnailer/vs-thumb	2015-07-20 13:25:43 +0000 differ