procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2016-04-25 11:06:50 +03:00
parent d2922a4173 8518f01bc0
commit d5ed93edd5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis/build.sh
View File

@ -50,7 +50,7 @@ prepare() {
ln -s "$srcdir/qt5_6_0" "$srcdir/Libraries/qt5_6_0" ln -s "$srcdir/qt5_6_0" "$srcdir/Libraries/qt5_6_0"
cd "$srcdir/Libraries/qt5_6_0/qtbase" 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 if [ ! -h "$srcdir/Libraries/breakpad" ]; then
ln -s "$srcdir/breakpad" "$srcdir/Libraries/breakpad" ln -s "$srcdir/breakpad" "$srcdir/Libraries/breakpad"
@ -60,6 +60,7 @@ prepare() {
sed -i 's/CUSTOM_API_ID//g' "$srcdir/tdesktop/Telegram/Telegram.pro" 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/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,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="" local options=""

12
Telegram/Telegram.pro
View File

@ -355,9 +355,9 @@ CONFIG(debug, debug|release) {
QMAKE_LFLAGS_DEBUG += -g -rdynamic -static-libstdc++ QMAKE_LFLAGS_DEBUG += -g -rdynamic -static-libstdc++
} }
INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.5.1/QtGui\ INCLUDEPATH += /usr/local/tdesktop/Qt-5.6.0/include/QtGui/5.6.0/QtGui\
./../../Libraries/QtStatic/qtbase/include/QtCore/5.5.1/QtCore\ /usr/local/tdesktop/Qt-5.6.0/include/QtCore/5.6.0/QtCore\
./../../Libraries/QtStatic/qtbase/include\ /usr/local/tdesktop/Qt-5.6.0/include\
/usr/local/include\ /usr/local/include\
/usr/local/include/opus\ /usr/local/include/opus\
./SourceFiles\ ./SourceFiles\
@ -381,9 +381,9 @@ INCLUDEPATH += "/usr/include/dee-1.0"
INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4" INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4"
LIBS += -ldl -llzma -lopenal -lavformat -lavcodec -lswresample -lswscale -lavutil -lopus -lva LIBS += -ldl -llzma -lopenal -lavformat -lavcodec -lswresample -lswscale -lavutil -lopus -lva
LIBS += ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \ LIBS += /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \
./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \ /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \
./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a
LIBS += /usr/local/lib/libz.a LIBS += /usr/local/lib/libz.a
LIBS += /usr/local/lib/libxkbcommon.a LIBS += /usr/local/lib/libxkbcommon.a
LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a