From 53a56bbc2ac9019a41d37699289acf71cfa401cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 23 Apr 2016 14:53:48 +0300
Subject: [PATCH 1/2] Telegram.pro using final Qt install path.
---
.travis/build.sh | 1 +
Telegram/Telegram.pro | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.travis/build.sh b/.travis/build.sh
index dc7fe1ff7..f9a738f56 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -59,6 +59,7 @@ prepare() {
sed -i 's/CUSTOM_API_ID//g' "$srcdir/tdesktop/Telegram/Telegram.pro"
sed -i 's,LIBS += /usr/local/lib/libxkbcommon.a,,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
sed -i 's,LIBS += /usr/local/lib/libz.a,LIBS += -lz,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+ sed -i "s,/usr/local/tdesktop/Qt-5.6.0,$srcdir/qt,g" "$srcdir/tdesktop/Telegram/Telegram.pro"
local options=""
diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro
index 6d2ef081a..860302557 100644
--- a/Telegram/Telegram.pro
+++ b/Telegram/Telegram.pro
@@ -355,9 +355,9 @@ CONFIG(debug, debug|release) {
QMAKE_LFLAGS_DEBUG += -g -rdynamic -static-libstdc++
}
-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.5.1/QtGui\
- ./../../Libraries/QtStatic/qtbase/include/QtCore/5.5.1/QtCore\
- ./../../Libraries/QtStatic/qtbase/include\
+INCLUDEPATH += /usr/local/tdesktop/Qt-5.6.0/include/QtGui/5.6.0/QtGui\
+ /usr/local/tdesktop/Qt-5.6.0/include/QtCore/5.6.0/QtCore\
+ /usr/local/tdesktop/Qt-5.6.0/include\
/usr/local/include\
/usr/local/include/opus\
./SourceFiles\
@@ -381,9 +381,9 @@ INCLUDEPATH += "/usr/include/dee-1.0"
INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4"
LIBS += -ldl -llzma -lopenal -lavformat -lavcodec -lswresample -lswscale -lavutil -lopus -lva
-LIBS += ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \
- ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \
- ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a
+LIBS += /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \
+ /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \
+ /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a
LIBS += /usr/local/lib/libz.a
LIBS += /usr/local/lib/libxkbcommon.a
LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a
From bd41ce024a91c6fd72761dd0932b6cf67e4de320 Mon Sep 17 00:00:00 2001
From: Christoph <auer.chrisi@gmx.net>
Date: Sat, 23 Apr 2016 20:02:17 +0200
Subject: [PATCH 2/2] Fix path to qt patch
Signed-off-by: Christoph <auer.chrisi@gmx.net>
---
.travis/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis/build.sh b/.travis/build.sh
index f9a738f56..57a6373d4 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -49,7 +49,7 @@ prepare() {
ln -s "$srcdir/qt5_6_0" "$srcdir/Libraries/qt5_6_0"
cd "$srcdir/Libraries/qt5_6_0/qtbase"
- git apply "$srcdir/tdesktop/Telegram/_qtbase_5_6_0_patch.diff"
+ git apply "$srcdir/tdesktop/Telegram/Patches/qtbase_5_6_0.diff"
if [ ! -h "$srcdir/Libraries/breakpad" ]; then
ln -s "$srcdir/breakpad" "$srcdir/Libraries/breakpad"