commit 541e5acd8d3c275beadcda6088cd396fb606bcb8 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sun Feb 10 11:27:13 2019 +0100 Updated to version 1.5.12. .gitignore | 2 ++ sources | 4 ++-- telegram-desktop-build-fixes.patch | 37 +++++++++++++++++++++++---------- telegram-desktop-system-fonts.patch | 4 ++-- telegram-desktop-unbundle-minizip.patch | 6 +++--- telegram-desktop.spec | 7 +++++-- 6 files changed, 40 insertions(+), 20 deletions(-) --- diff --git a/.gitignore b/.gitignore index d2b9225..83a2667 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ /tdesktop-1.5.7.tar.gz /tdesktop-1.5.8.tar.gz /tdesktop-1.5.11.tar.gz +/crl-40063ab.tar.gz +/tdesktop-1.5.12.tar.gz diff --git a/sources b/sources index e8b77ce..154c66b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3ac19bcca9cb18f67bdb0ccb99445773 crl-9b7c6b5.tar.gz -b34989efc35c74a313e59fbc64d8583c tdesktop-1.5.11.tar.gz +b38cf6bd3d30a3b9a9602e2e7ab2efea crl-40063ab.tar.gz +e03e33c623beae434f987cfab68541c0 tdesktop-1.5.12.tar.gz diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch index 517ff88..c538625 100644 --- a/telegram-desktop-build-fixes.patch +++ b/telegram-desktop-build-fixes.patch @@ -1,10 +1,11 @@ -From f2b45bc6e63be1613cda0a5116ef36e2fdb5718f Mon Sep 17 00:00:00 2001 +From 0174a10e3bf553539bb07ad068250105e04b259b 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 1/3] Fixed build under Fedora using rpmbuild and mock. --- - Telegram/Resources/qrc/telegram_linux.qrc | 2 - + Telegram/Resources/qrc/telegram.qrc | 3 - + Telegram/Resources/qrc/telegram_linux.qrc | 6 -- Telegram/SourceFiles/core/launcher.cpp | 1 + Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++ Telegram/gyp/CMakeLists.inj | 6 ++ @@ -23,22 +24,36 @@ Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock. Telegram/gyp/telegram_sources.txt | 2 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 5 +- - 19 files changed, 172 insertions(+), 181 deletions(-) + 20 files changed, 172 insertions(+), 188 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp create mode 100644 Telegram/gyp/CMakeLists.inj +diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc +index 99f66c5cb..8e39756ac 100644 +--- a/Telegram/Resources/qrc/telegram.qrc ++++ b/Telegram/Resources/qrc/telegram.qrc +@@ -62,9 +62,6 @@ + <file alias="call_connect.mp3">../sounds/call_connect.mp3</file> + <file alias="call_end.mp3">../sounds/call_end.mp3</file> + </qresource> +- <qresource prefix="/qt-project.org"> +- <file>qmime/freedesktop.org.xml</file> +- </qresource> + <qresource prefix="/misc"> + <file alias="default_shortcuts-custom.json">../default_shortcuts-custom.json</file> + </qresource> diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc -index 164e8d4f2..c67569284 100644 +index 164e8d4f2..03585ec03 100644 --- a/Telegram/Resources/qrc/telegram_linux.qrc +++ b/Telegram/Resources/qrc/telegram_linux.qrc -@@ -1,8 +1,6 @@ +@@ -1,8 +1,2 @@ <RCC> - <qresource prefix="/qt"> +- <qresource prefix="/qt"> - <file alias="etc/qt.conf">../etc/qt_linux.conf</file> - </qresource> - <qresource prefix="/fc"> +- </qresource> +- <qresource prefix="/fc"> - <file alias="fc-custom.conf">../fc-custom.conf</file> - </qresource> +- </qresource> </RCC> diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp index 129407523..0b5a1c3ef 100644 @@ -759,10 +774,10 @@ index ffe0e5a96..9bc686d44 100644 ], }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index a914a0ae5..c36ab7817 100644 +index 09e216394..e292f82ca 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -824,7 +824,7 @@ +@@ -828,7 +828,7 @@ <(src_loc)/mediaview.h <(src_loc)/observer_peer.cpp <(src_loc)/observer_peer.h diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch index ec731a5..9ff868e 100644 --- a/telegram-desktop-system-fonts.patch +++ b/telegram-desktop-system-fonts.patch @@ -1,4 +1,4 @@ -From 72e5ad8818993786d24ba1321e29612ca3dd99d4 Mon Sep 17 00:00:00 2001 +From 25b99255c19cf31895734ead8e3c7e58d9b66125 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Sun, 24 Jun 2018 22:59:34 +0200 Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer @@ -11,7 +11,7 @@ Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc -index 99f66c5cb..b3b241c9f 100644 +index 8e39756ac..29b3d55e6 100644 --- a/Telegram/Resources/qrc/telegram.qrc +++ b/Telegram/Resources/qrc/telegram.qrc @@ -42,9 +42,6 @@ diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch index cec8e22..78b95fe 100644 --- a/telegram-desktop-unbundle-minizip.patch +++ b/telegram-desktop-unbundle-minizip.patch @@ -1,4 +1,4 @@ -From 421283fe4936cac801aa483dd7af3464a8212982 Mon Sep 17 00:00:00 2001 +From 5df0ad653d929b6e441965b72e34e80254e014aa Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Wed, 17 Oct 2018 17:57:59 +0200 Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29. @@ -50,10 +50,10 @@ index 9bc686d44..806374202 100644 'lzma', 'xxhash', diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index c36ab7817..6181f7d35 100644 +index e292f82ca..21d0706dd 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -831,13 +831,6 @@ +@@ -835,13 +835,6 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 6623c45..743f446 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -4,7 +4,7 @@ %global apihash dfbe1bc42dc9d20507e17d1814cc2f0a # Git revision of crl... -%global commit1 9b7c6b5d9f1b59d2160bf6e9c4e74510f955efe1 +%global commit1 40063abec74e560220891443f6d5157de15e1b62 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # Decrease debuginfo verbosity to reduce memory consumption... @@ -12,7 +12,7 @@ Summary: Telegram Desktop official messaging app Name: telegram-desktop -Version: 1.5.11 +Version: 1.5.12 Release: 1%{?dist} # Application and 3rd-party modules licensing: @@ -157,6 +157,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}. %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Sun Feb 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.12-1 +- Updated to 1.5.12. + * Fri Feb 01 2019 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 1.5.11-1 - Updated to 1.5.11. - Enabled LTO optimizations.