[telegram-desktop/el7] Updated to version 1.1.9.

commit cace415dbcd6897e4863a236a2d87488561e56f7 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jun 30 23:57:53 2017 +0500 Updated to version 1.1.9. .gitignore | 1 + 0001-Fix-crash-in-video-player-seeking.patch | 77 --------------------------- add_russian_locale.patch | 69 ------------------------ fix_build_under_fedora.patch | 28 +++++----- sources | 3 +- tdesktop-1.1.7-russian.strings | Bin 132550 -> 0 bytes telegram-desktop.spec | 41 ++++---------- 7 files changed, 28 insertions(+), 191 deletions(-) --- diff --git a/.gitignore b/.gitignore index 17d8fb3..daa1d90 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /tdesktop-1.1.2.tar.gz /libtgvoip-2993da5.tar.gz /tdesktop-1.1.7.tar.gz +/tdesktop-1.1.9.tar.gz diff --git a/fix_build_under_fedora.patch b/fix_build_under_fedora.patch index 5e50c3e..ed766c4 100644 --- a/fix_build_under_fedora.patch +++ b/fix_build_under_fedora.patch @@ -1,4 +1,4 @@ -From 8c1ea2225422a80f9f4c9f64ba4977e36052c4f1 Mon Sep 17 00:00:00 2001 +From 337972b43b01c29248229015d86c672dac0c4f5d 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. @@ -6,7 +6,7 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. --- Telegram/SourceFiles/main.cpp | 7 ++- Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++ - Telegram/SourceFiles/qt_static_plugins.cpp | 8 --- + Telegram/SourceFiles/qt_static_plugins.cpp | 9 --- Telegram/SourceFiles/ui/text/text.cpp | 6 +- Telegram/SourceFiles/ui/text/text_block.cpp | 2 +- Telegram/SourceFiles/ui/twidget.cpp | 4 +- @@ -15,12 +15,12 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. Telegram/gyp/qt.gypi | 80 +++++++----------------- Telegram/gyp/qt_rcc.gypi | 2 +- Telegram/gyp/settings_linux.gypi | 8 +-- - Telegram/gyp/telegram_linux.gypi | 57 +++++------------ + Telegram/gyp/telegram_linux.gypi | 58 +++++------------- Telegram/gyp/telegram_sources.txt | 8 +-- Telegram/gyp/utils.gyp | 4 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- - 16 files changed, 159 insertions(+), 151 deletions(-) + 16 files changed, 159 insertions(+), 153 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp @@ -150,10 +150,10 @@ index 0000000..4a722b8 + flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index 1d4896a..f2f876b 100644 +index b975c7a..f2f876b 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp -@@ -28,12 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) +@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC @@ -165,9 +165,10 @@ index 1d4896a..f2f876b 100644 -Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) -Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin) -Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) +-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp -index dbc2b0d..61fa93c 100644 +index 044f871..0865a5b 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -1692,11 +1692,11 @@ private: @@ -199,10 +200,10 @@ index f89644e..35230cf 100644 layout.createLine(); diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index 04fad32..688cd8e 100644 +index e9848ef..dcee47e 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp -@@ -187,9 +187,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton +@@ -191,9 +191,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton , button , QGuiApplication::mouseButtons() | button , QGuiApplication::keyboardModifiers() @@ -484,10 +485,10 @@ index fde88dc..7d60322 100644 'Debug': { }, diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index b8866ec..1b14723 100644 +index 2c46492..1b14723 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi -@@ -27,72 +27,43 @@ +@@ -27,73 +27,43 @@ # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], @@ -525,6 +526,7 @@ index b8866ec..1b14723 100644 - 'composeplatforminputcontextplugin', - 'ibusplatforminputcontextplugin', - 'fcitxplatforminputcontextplugin', +- 'himeplatforminputcontextplugin', - 'liblzma.a', - 'libopenal.a', - 'libavformat.a', @@ -575,10 +577,10 @@ index b8866ec..1b14723 100644 }, }, diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 069aa30..ce27332 100644 +index bfc18fd..4a1c525 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -555,13 +555,7 @@ +@@ -579,13 +579,7 @@ <(src_loc)/structs.h platforms: !win diff --git a/sources b/sources index e40ad56..18aad6d 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ ba90e749953f2ac1c013011601a58598 GSL-c5851a8.tar.gz 0373c28165f86474f8abdce278320c1a gyp-a478c1a.tar.gz 38d0bd37a328d04a4c8f723691f0901e libtgvoip-2993da5.tar.gz -3a4675445f1f5022e0509375a6698ddc tdesktop-1.1.7.tar.gz -dac56e1dcadfad1b7370d10cbc405fc7 variant-550ac2f.tar.gz +86b18dc4313f4506bcfff16ed26d016b tdesktop-1.1.9.tar.gz diff --git a/telegram-desktop.spec b/telegram-desktop.spec index bcdcbd4..32b25e4 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -10,26 +10,20 @@ %global commit2 c5851a8161938798c5594a66420cb814fea92711 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) -# Git revision of Variant... -%global commit3 550ac2f159ca883d360c196149b466955c77a573 -%global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) - # Git revision of libtgvoip... -%global commit4 2993da5aa08d18b549cc6fff160fc732f4114a31 -%global shortcommit4 %(c=%{commit4}; echo ${c:0:7}) +%global commit3 2993da5aa08d18b549cc6fff160fc732f4114a31 +%global shortcommit3 %(c=%{commit3}; echo ${c:0:7}) Summary: Telegram is a new era of messaging Name: telegram-desktop -Version: 1.1.7 +Version: 1.1.9 Release: 1%{?dist} # Application and 3rd-party modules licensing: # * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source; # * S1 (GYP) - BSD -- build-time dependency; # * S2 (GSL) - MIT -- build-time dependency; -# * S3 (Variant) - BSD -- build-time dependency; -# * S4 (libtgvoip) - Public Domain -- shared library; -# * S5 (Russian language pack) - GPLv3+ -- bundled into executable. +# * S3 (libtgvoip) - Public Domain -- shared library; # * P0 (qt_functions.cpp) - LGPLv3 -- build-time dependency. License: GPLv3+ and LGPLv3 and BSD and MIT Group: Applications/Internet @@ -39,15 +33,10 @@ ExclusiveArch: i686 x86_64 Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz Source1: https://chromium.googlesource.com/external/gyp/+archive/%{commit1}.tar.gz... Source2: https://github.com/Microsoft/GSL/archive/%{commit2}.tar.gz#/GSL-%{shortco... -Source3: https://github.com/mapbox/variant/archive/%{commit3}.tar.gz#/variant-%{sh... -Source4: https://github.com/telegramdesktop/libtgvoip/archive/%{commit4}.tar.gz#/l... -Source5: https://tlgrm.ru/files/locales/tdesktop/Russian.strings#/%{appname}-%{ver... +Source3: https://github.com/telegramdesktop/libtgvoip/archive/%{commit3}.tar.gz#/l... 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 @@ -98,6 +87,7 @@ BuildRequires: libxkbcommon-x11-devel BuildRequires: harfbuzz-devel BuildRequires: gtk3-devel BuildRequires: pulseaudio-libs-devel +BuildRequires: mapbox-variant-devel %if 0%{?fedora} >= 26 BuildRequires: compat-openssl10-devel %else @@ -120,8 +110,6 @@ personal or business messaging needs. # Unpacking Telegram Desktop source archive... %setup -qn %{appname}-%{version} %patch0 -p1 -%patch2 -p1 -%patch101 -p1 # Unpacking GYP... mkdir -p Telegram/ThirdParty/gyp @@ -137,18 +125,11 @@ pushd Telegram/ThirdParty mv GSL-%{commit2} GSL popd -# Unpacking Variant... -pushd Telegram/ThirdParty - rm -rf variant - tar -xf %{SOURCE3} - mv variant-%{commit3} variant -popd - # Unpacking libtgvoip... pushd Telegram/ThirdParty rm -rf libtgvoip - tar -xf %{SOURCE4} - mv libtgvoip-%{commit4} libtgvoip + tar -xf %{SOURCE3} + mv libtgvoip-%{commit3} libtgvoip popd # Patching libtgvoip... @@ -156,9 +137,6 @@ pushd Telegram/ThirdParty/libtgvoip %patch1 -p1 popd -# Unpacking additional locales from sources... -iconv -f "UTF-16" -t "UTF-8" "%{SOURCE5}" > Telegram/Resources/langs/lang_ru.strings - %build # Exporting some additional constants... export VOIPVER="%{voipver}" @@ -248,6 +226,9 @@ fi %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Fri Jun 30 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.9-1 +- Updated to 1.1.9. + * Wed May 31 2017 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.1.7-1 - Updated to 1.1.7.