commit d952a3b11cecd542d3c120dbba1931c20de58c4c Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed May 31 18:09:17 2017 +0500 Updated to 1.1.7. .gitignore | 2 + 0001-Fix-crash-in-video-player-seeking.patch | 77 +++++++++++++++++++++ fix_build_under_fedora.patch | 28 ++------ fix_libtgvoip.patch | 4 +- sources | 4 +- ...ssian.strings => tdesktop-1.1.7-russian.strings | Bin 132484 -> 132550 bytes telegram-desktop.spec | 34 ++++++--- 7 files changed, 111 insertions(+), 38 deletions(-) --- diff --git a/.gitignore b/.gitignore index e3919ff..17d8fb3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /tdesktop-1.1.1.tar.gz /variant-550ac2f.tar.gz /tdesktop-1.1.2.tar.gz +/libtgvoip-2993da5.tar.gz +/tdesktop-1.1.7.tar.gz diff --git a/0001-Fix-crash-in-video-player-seeking.patch b/0001-Fix-crash-in-video-player-seeking.patch new file mode 100644 index 0000000..9a6bd0a --- /dev/null +++ b/0001-Fix-crash-in-video-player-seeking.patch @@ -0,0 +1,77 @@ +From 66662e02a65ba60632085af0a6c64834334d39ed Mon Sep 17 00:00:00 2001 +From: John Preston <johnprestonmail(a)gmail.com&gt; +Date: Wed, 31 May 2017 11:58:43 +0300 +Subject: [PATCH] Fix crash in video player seeking. + +Regression was introduced in 87ff770020. + +Seek handler may destroy controller so first the playback is updated. +--- + Telegram/SourceFiles/media/player/media_player_cover.cpp | 4 ++-- + Telegram/SourceFiles/media/player/media_player_widget.cpp | 4 ++-- + Telegram/SourceFiles/media/view/media_clip_controller.cpp | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp +index 7a14876..365a23f 100644 +--- a/Telegram/SourceFiles/media/player/media_player_cover.cpp ++++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp +@@ -94,12 +94,12 @@ CoverWidget::CoverWidget(QWidget *parent) : TWidget(parent) + _playbackSlider->setValue(value); + }); + _playbackSlider->setChangeProgressCallback([this](float64 value) { +- handleSeekProgress(value); + _playback->setValue(value, false); ++ handleSeekProgress(value); + }); + _playbackSlider->setChangeFinishedCallback([this](float64 value) { +- handleSeekFinished(value); + _playback->setValue(value, false); ++ handleSeekFinished(value); + }); + _playPause->setClickedCallback([this] { + instance()->playPauseCancelClicked(AudioMsgId::Type::Song); +diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp +index 6d88254..7a2fd58 100644 +--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp ++++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp +@@ -111,15 +111,15 @@ Widget::Widget(QWidget *parent) : TWidget(parent) + if (_type != AudioMsgId::Type::Song) { + return; // Round video seek is not supported for now :( + } +- handleSeekProgress(value); + _playback->setValue(value, false); ++ handleSeekProgress(value); + }); + _playbackSlider->setChangeFinishedCallback([this](float64 value) { + if (_type != AudioMsgId::Type::Song) { + return; // Round video seek is not supported for now :( + } +- handleSeekFinished(value); + _playback->setValue(value, false); ++ handleSeekFinished(value); + }); + _playPause->setClickedCallback([this] { + instance()->playPauseCancelClicked(_type); +diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp +index edf7b15..913e35a 100644 +--- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp ++++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp +@@ -58,12 +58,12 @@ Controller::Controller(QWidget *parent) : TWidget(parent) + _playbackSlider->setValue(value); + }); + _playbackSlider->setChangeProgressCallback([this](float64 value) { +- handleSeekProgress(value); + _playback->setValue(value, false); ++ handleSeekProgress(value); // This may destroy Controller. + }); + _playbackSlider->setChangeFinishedCallback([this](float64 value) { +- handleSeekFinished(value); + _playback->setValue(value, false); ++ handleSeekFinished(value); + }); + } + +-- +2.9.4 + diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch index 6ee4753..5e50c3e 100644 --- a/fix_build_under_fedora.patch +++ b/fix_build_under_fedora.patch @@ -1,4 +1,4 @@ -From ec8022a1ecd618b53f3023044e5276fe2057977e Mon Sep 17 00:00:00 2001 +From 8c1ea2225422a80f9f4c9f64ba4977e36052c4f1 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri, 31 Mar 2017 14:29:58 +0200 Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. @@ -14,14 +14,13 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. Telegram/gyp/Telegram.gyp | 18 ++---- Telegram/gyp/qt.gypi | 80 +++++++----------------- Telegram/gyp/qt_rcc.gypi | 2 +- - Telegram/gyp/refresh.sh | 8 +-- Telegram/gyp/settings_linux.gypi | 8 +-- Telegram/gyp/telegram_linux.gypi | 57 +++++------------ Telegram/gyp/telegram_sources.txt | 8 +-- Telegram/gyp/utils.gyp | 4 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- - 17 files changed, 162 insertions(+), 156 deletions(-) + 16 files changed, 159 insertions(+), 151 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp @@ -451,25 +450,6 @@ index eebc696..3efa7d0 100644 '-name', '<(RULE_INPUT_ROOT)', '-no-compress', '<(RULE_INPUT_PATH)', -diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh -index cd96456..9df21fb 100755 ---- a/Telegram/gyp/refresh.sh -+++ b/Telegram/gyp/refresh.sh -@@ -17,11 +17,9 @@ MySystem=`uname -s` - cd $FullScriptPath - - if [ "$MySystem" == "Linux" ]; then -- ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out -Dofficial_build_target=$BuildTarget Telegram.gyp --format=cmake -- cd ../../out/Debug -- ../../../Libraries/cmake-3.6.2/bin/cmake . -- cd ../Release -- ../../../Libraries/cmake-3.6.2/bin/cmake . -+ ../ThirdParty/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake -+ cd ../../out/Release -+ cmake . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON - cd ../../Telegram/gyp - else - #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=ninja diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi index fde88dc..7d60322 100644 --- a/Telegram/gyp/settings_linux.gypi @@ -595,10 +575,10 @@ index b8866ec..1b14723 100644 }, }, diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index c970f98..fab0268 100644 +index 069aa30..ce27332 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -553,13 +553,7 @@ +@@ -555,13 +555,7 @@ <(src_loc)/structs.h platforms: !win diff --git a/fix_libtgvoip.patch b/fix_libtgvoip.patch index 9d50690..7e7cd19 100644 --- a/fix_libtgvoip.patch +++ b/fix_libtgvoip.patch @@ -1,4 +1,4 @@ -From 1d93ee88637a91e1b833069e68ccac5f8e26f1b3 Mon Sep 17 00:00:00 2001 +From 24a204f5fb232e19dc3513ae828e6cf6dd525c93 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed, 10 May 2017 13:19:54 +0200 Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library. @@ -8,7 +8,7 @@ Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library. 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libtgvoip.gyp b/libtgvoip.gyp -index 58dc6bf..b0288ae 100644 +index 52fbea1..e3dc413 100644 --- a/libtgvoip.gyp +++ b/libtgvoip.gyp @@ -4,7 +4,8 @@ diff --git a/sources b/sources index fbf1802..e40ad56 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz 0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz -c6a0cd9ffcc6da823a52022ba9863347 libtgvoip-2ed5a50.tar.gz -f0076c4da897e789dd502cc76eb3d9a0 tdesktop-1.1.2.tar.gz +38d0bd37a328d04a4c8f723691f0901e libtgvoip-2993da5.tar.gz +3a4675445f1f5022e0509375a6698ddc tdesktop-1.1.7.tar.gz dac56e1dcadfad1b7370d10cbc405fc7 variant-550ac2f.tar.gz diff --git a/tdesktop-1.1.2-russian.strings b/tdesktop-1.1.7-russian.strings similarity index 99% rename from tdesktop-1.1.2-russian.strings rename to tdesktop-1.1.7-russian.strings index c1e9895..ec49ca1 100644 Binary files a/tdesktop-1.1.2-russian.strings and b/tdesktop-1.1.7-russian.strings differ diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 4b1170c..bcdcbd4 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -15,12 +15,12 @@ %global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) # Git revision of libtgvoip... -%global commit4 2ed5a50271029bde58ba210ac81b6ba4011ec33f +%global commit4 2993da5aa08d18b549cc6fff160fc732f4114a31 %global shortcommit4 %(c=%{commit4}; echo ${c:0:7}) Summary: Telegram is a new era of messaging Name: telegram-desktop -Version: 1.1.2 +Version: 1.1.7 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -47,6 +47,8 @@ Patch0: fix_build_under_fedora.patch Patch1: fix_libtgvoip.patch Patch2: add_russian_locale.patch +Patch101: 0001-Fix-crash-in-video-player-seeking.patch + Provides: libtgvoip = %{voipver} Requires: hicolor-icon-theme Requires: qt5-qtimageformats%{?_isa} @@ -119,6 +121,7 @@ personal or business messaging needs. %setup -qn %{appname}-%{version} %patch0 -p1 %patch2 -p1 +%patch101 -p1 # Unpacking GYP... mkdir -p Telegram/ThirdParty/gyp @@ -157,21 +160,17 @@ popd iconv -f "UTF-16" -t "UTF-8" "%{SOURCE5}" > Telegram/Resources/langs/lang_ru.strings %build -# Exporting correct build flags... -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" -export LDFLAGS="%{__global_ldflags}" - # Exporting some additional constants... export VOIPVER="%{voipver}" # Generating cmake script using GYP... -pushd Telegram - gyp/refresh.sh +pushd Telegram/gyp + ../ThirdParty/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake popd -# Building Telegram Desktop... +# Building Telegram Desktop using cmake... pushd out/Release + %cmake . %make_build popd @@ -249,6 +248,21 @@ fi %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Wed May 31 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.7-1 +- Updated to 1.1.7. + +* Sat May 27 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.6-1 +- Updated to 1.1.6 (alpha). + +* Fri May 26 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.5-1 +- Updated to 1.1.5 (alpha). + +* Thu May 25 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.4-1 +- Updated to 1.1.4 (alpha). + +* Wed May 24 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.3-1 +- Updated to 1.1.3 (alpha). + * Thu May 18 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.2-1 - Updated to 1.1.2.