commit 52f580856eb911e7868a781822c9eb49f7c15ef8 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jun 1 13:43:37 2018 +0200 Updated to version 1.3.0. .gitignore | 1 + sources | 2 +- telegram-desktop-build-fixes.patch | 29 +++++++++++++++-------------- telegram-desktop-system-fonts.patch | 33 +++++++++++++++++++++++++++++++++ telegram-desktop.spec | 35 ++++++++++++++++++++++++++++------- 5 files changed, 78 insertions(+), 22 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8a8d7cb..7e0cf68 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /tdesktop-1.2.15.tar.gz /tdesktop-1.2.16.tar.gz /tdesktop-1.2.17.tar.gz +/tdesktop-1.3.0.tar.gz diff --git a/sources b/sources index 3d6c893..3f4086e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz -ef9c74659cba6f792e43a245ceb1c102 tdesktop-1.2.17.tar.gz +2bfaea91997754312c3b1857d0554f43 tdesktop-1.3.0.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 38130ea..bf446e5 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,4 +1,4 @@ -From ff1914aaef5cde44f38359ffa2169bf1d0ec2c64 Mon Sep 17 00:00:00 2001 +From c4742c80a5af1f74b34fcd794a214cf3856f0cd8 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,16 +6,16 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. --- Telegram/Resources/qrc/telegram_linux.qrc | 1 - Telegram/SourceFiles/core/launcher.cpp | 1 + - Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++++ + Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++ Telegram/gyp/CMakeLists.inj | 3 + Telegram/gyp/PrecompiledHeader.cmake | 4 +- - Telegram/gyp/Telegram.gyp | 29 +++------- - Telegram/gyp/codegen_rules.gypi | 8 +-- - Telegram/gyp/qt.gypi | 87 ++++++++-------------------- + Telegram/gyp/Telegram.gyp | 29 ++----- + Telegram/gyp/codegen_rules.gypi | 8 +- + Telegram/gyp/qt.gypi | 87 ++++++--------------- Telegram/gyp/qt_moc.gypi | 5 +- Telegram/gyp/qt_rcc.gypi | 2 +- Telegram/gyp/settings_linux.gypi | 5 -- - Telegram/gyp/telegram_linux.gypi | 86 +++++++--------------------- + Telegram/gyp/telegram_linux.gypi | 86 +++++---------------- Telegram/gyp/telegram_sources.txt | 9 +-- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- @@ -34,7 +34,7 @@ index 0554fa17..3ea02740 100644 </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 7f173565..c70ccc79 100644 +index 62662277..66598a1d 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -51,6 +51,7 @@ int Launcher::exec() { @@ -518,7 +518,7 @@ index 03284c1d..9b6f0c51 100644 ], 'cflags_c': [ diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index a5b4b197..19aefb6b 100644 +index 22f3e161..10d73e48 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -7,7 +7,7 @@ @@ -530,7 +530,7 @@ index a5b4b197..19aefb6b 100644 'pkgconfig_libs': [ # In order to work libxkbcommon must be linked statically, # PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon" -@@ -15,99 +15,53 @@ +@@ -15,50 +15,29 @@ # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], @@ -598,7 +598,8 @@ index a5b4b197..19aefb6b 100644 # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ - '-Wno-strict-overflow', +@@ -66,49 +45,24 @@ + '-Wno-maybe-uninitialized', ], 'ldflags': [ - '-Wl,-wrap,aligned_alloc', @@ -650,10 +651,10 @@ index a5b4b197..19aefb6b 100644 ], }] diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index a9c36e09..40b8eb15 100644 +index f60aba58..d01a9eff 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -750,7 +750,7 @@ +@@ -753,7 +753,7 @@ <(src_loc)/observer_peer.h <(src_loc)/passcodewidget.cpp <(src_loc)/passcodewidget.h @@ -662,7 +663,7 @@ index a9c36e09..40b8eb15 100644 <(src_loc)/settings.cpp <(src_loc)/settings.h <(src_loc)/shortcuts.cpp -@@ -761,13 +761,6 @@ +@@ -764,13 +764,6 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win @@ -707,5 +708,5 @@ index 0a806951..550b9f78 100644 StartupWMClass=TelegramDesktop Type=Application -- -2.14.3 +2.17.0 diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch new file mode 100644 index 0000000..8d6202d --- /dev/null +++ b/telegram-desktop-system-fonts.patch @@ -0,0 +1,33 @@ +Description: Remove links to packaged Open Sans font + This makes Telegram Desktop use system-wide fonts. + Warnings about non-existent fonts in resources are also disabled. +Author: Nicholas Guriev <guriev-ns(a)ya.ru&gt; +Bug-Debian: https://bugs.debian.org/890341 +Last-Update: Sat, 31 Mar 2018 14:36:39 +0300 + +--- a/Telegram/Resources/qrc/telegram.qrc ++++ b/Telegram/Resources/qrc/telegram.qrc +@@ -1,8 +1,5 @@ + <RCC> + <qresource prefix="/gui"> +- <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file> +- <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file> +- <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file> + <file alias="art/bg.jpg">../art/bg.jpg</file> + <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file> + <file alias="art/logo_256.png">../art/logo_256.png</file> +--- a/Telegram/SourceFiles/ui/twidget.cpp ++++ b/Telegram/SourceFiles/ui/twidget.cpp +@@ -70,9 +70,9 @@ void Start() { + } + Started = true; + +- auto regular = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"), qsl("Open Sans")); +- auto bold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Bold.ttf"), qsl("Open Sans"), style::internal::FontBold); +- auto semibold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Semibold.ttf"), qsl("Open Sans Semibold")); ++ auto regular = ValidateFont(qsl("Open Sans")); ++ auto bold = ValidateFont(qsl("Open Sans"), style::internal::FontBold); ++ auto semibold = ValidateFont(qsl("Open Sans Semibold")); + + #ifdef Q_OS_WIN + // Attempt to workaround a strange font bug with Open Sans Semibold not loading. diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 92cec4f..4e51905 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -10,8 +10,8 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.2.17 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} # Application and 3rd-party modules licensing: # * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source; @@ -28,10 +28,12 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz Source1: https://github.com/telegramdesktop/crl/archive/%{commit1}.tar.gz#/crl-%{s... Patch0: %{name}-build-fixes.patch Patch1: %{name}-api-tokens.patch +Patch2: %{name}-system-fonts.patch Recommends: libappindicator-gtk3%{?_isa} Requires: qt5-qtimageformats%{?_isa} Requires: hicolor-icon-theme +Requires: open-sans-fonts Requires: gtk3%{?_isa} # Compilers and tools... @@ -116,10 +118,6 @@ for size in 16 32 48 64 128 256 512; do install -m 0644 -p Telegram/Resources/art/icon${size}.png "$dir/%{name}.png" done -# Installing tg protocol handler... -install -d "%{buildroot}%{_datadir}/kde4/services" -install -m 0644 -p lib/xdg/tg.protocol "%{buildroot}%{_datadir}/kde4/services/tg.protocol" - # Installing appdata for Gnome Software... install -d "%{buildroot}%{_datadir}/metainfo" install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml" @@ -132,11 +130,34 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %license LICENSE LEGAL %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/kde4/services/tg.protocol %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Jun 01 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.3.0-1 +- Updated to 1.3.0. + +* Sat May 26 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.24-1 +- Updated to 1.2.24 (alpha). + +* Fri May 25 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.23-1 +- Updated to 1.2.23 (alpha). + +* Thu May 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.22-1 +- Updated to 1.2.22 (alpha). + +* Sat May 19 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.21-2 +- Updated to 1.2.21 (alpha). + +* Sun May 13 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.20-1 +- Updated to 1.2.20 (alpha). + +* Tue May 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.19-1 +- Updated to 1.2.19 (alpha). + +* Sat May 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.18-1 +- Updated to 1.2.18 (alpha). + * Mon Apr 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.2.17-2 - Added custom API tokens.