From b0a8787eaf76a36f087de7c9d9d915f8bb699781 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 26 Jul 2016 12:22:27 +0300 Subject: [PATCH 1/3] Linking libav-drm statically. --- Telegram/build/makefile_static.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Telegram/build/makefile_static.sh b/Telegram/build/makefile_static.sh index da1c19c1a6..014698e90b 100755 --- a/Telegram/build/makefile_static.sh +++ b/Telegram/build/makefile_static.sh @@ -66,4 +66,5 @@ Replace '\-lswresample' "$LocalDirPath\/libswresample\.a" Replace '\-lswscale' "$LocalDirPath\/libswscale\.a" Replace '\-lavutil' "$LocalDirPath\/libavutil\.a" Replace '\-lva-x11' "$LocalDirPath\/libva-x11\.a" +Replace '\-lva-drm' "$LocalDirPath\/libva-drm\.a" Replace '\-lva' "$LocalDirPath\/libva\.a" From 0721b80555fec3c2e6200518412f15ca790d127e Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 26 Jul 2016 19:11:33 +0300 Subject: [PATCH 2/3] Moved Enter key press handle from HistoryInner to HistoryWidget. --- Telegram/SourceFiles/historywidget.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 87b1c9bb89..a46a42433c 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -1481,10 +1481,6 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) { if (!_selected.isEmpty() && selectedForDelete == selectedForForward) { _widget->onDeleteSelected(); } - } else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) { - if (_selected.isEmpty()) { - _widget->onListEnterPressed(); - } } else { e->ignore(); } @@ -7216,6 +7212,8 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) { } _scroll.keyPressEvent(e); } + } else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) { + onListEnterPressed(); } else { e->ignore(); } From 0228941fdbbdbc61ac0b72f7ada19096d12d2fb1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 27 Jul 2016 16:48:52 +0300 Subject: [PATCH 3/3] Using /usr/local libssl, libcrypto and libz when linking the build. The previous version crashed in gtk file picker on Gentoo with KDE. See #2278 --- Telegram/build/makefile_static.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/build/makefile_static.sh b/Telegram/build/makefile_static.sh index 014698e90b..3aad822f32 100755 --- a/Telegram/build/makefile_static.sh +++ b/Telegram/build/makefile_static.sh @@ -38,7 +38,9 @@ fi Replace () { CheckCommand="grep -ci '$1' Makefile" + set +e CheckCount=$(eval $CheckCommand) + set -e if [ "$CheckCount" -gt 0 ]; then echo "Requested '$1' to '$2', found - replacing.." ReplaceCommand="sed -i'.~' 's/$1/$2/g' Makefile" @@ -48,9 +50,6 @@ Replace () { fi } -Replace '\-lssl' "$ArchDirPath\/libssl\.a" -Replace '\-lcrypto' "$ArchDirPath\/libcrypto\.a" -Replace '\-lz' "$ArchDirPath\/libz\.a" Replace '\-llzma' "$ArchDirPath\/liblzma\.a" Replace '\-lXi' "$ArchDirPath\/libXi\.a $ArchDirPath\/libXext\.a" Replace '\-lSM' "$ArchDirPath\/libSM\.a" @@ -58,6 +57,7 @@ Replace '\-lICE' "$ArchDirPath\/libICE\.a" Replace '\-lfontconfig' "$ArchDirPath\/libfontconfig\.a $ArchDirPath\/libexpat\.a" Replace '\-lfreetype' "$ArchDirPath\/libfreetype\.a" Replace '\-lXext' "$ArchDirPath\/libXext\.a" +Replace '\-lz' "$LocalDirPath\/libz\.a" Replace '\-lopus' "$LocalDirPath\/libopus\.a" Replace '\-lopenal' "$LocalDirPath\/libopenal\.a" Replace '\-lavformat' "$LocalDirPath\/libavformat\.a"