diff --git a/crl-master.zip b/crl-master.zip index 5d9479d..941b341 100644 --- a/crl-master.zip +++ b/crl-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:289bd0f17bbc0e99e30c24bcc5b6fc80c23434d120e06fb9752991065720c2a0 -size 44562 +oid sha256:448a03afeb29126ffa0ca0082bbe60c015414c39cd7161e405e8e9e17dd57b17 +size 44812 diff --git a/lz4-dev.zip b/lz4-dev.zip new file mode 100644 index 0000000..00742c5 --- /dev/null +++ b/lz4-dev.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94de55c83beb867bf947493d4b1aa255e6fb40bdd940dd1e166218f6e549a5f8 +size 380587 diff --git a/qtlottie-tdesktop.zip b/qtlottie-tdesktop.zip deleted file mode 100644 index 7b01d92..0000000 --- a/qtlottie-tdesktop.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:296d9e18974eeae97bd36d13662aff7105f5cc525c891ea7a4f9e13af5535031 -size 115478 diff --git a/rapidjson-master.zip b/rapidjson-master.zip deleted file mode 100644 index b880386..0000000 --- a/rapidjson-master.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19abf9bd9fbbbebaa3022da4fac41f764e1ca7d64ef5752dc57b308c74a0a42c -size 1191266 diff --git a/rlottie-master.zip b/rlottie-master.zip new file mode 100644 index 0000000..6385205 --- /dev/null +++ b/rlottie-master.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad62b90b4483da079cb0f34779caa980997f6c394ab5882b660789854a1a9187 +size 8042889 diff --git a/tdesktop.patch b/tdesktop.patch index 259e562..ad8b57c 100644 --- a/tdesktop.patch +++ b/tdesktop.patch @@ -12,7 +12,7 @@ Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp =================================================================== --- /dev/null +++ tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp -@@ -0,0 +1,94 @@ +@@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. @@ -53,6 +53,9 @@ Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp + Makes a list of filters from ;;-separated text. + Used by the mac and windows implementations +*/ ++ ++#include ++ +QStringList qt_make_filter_list(const QString &filter) +{ + QString f(filter); diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 04b2ebd..f75ad65 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jul 19 17:44:40 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.15 + * Bug fixes and other minor improvements. +- Allow GCC 9 after GCC#90949 was fixed +- Updated rlottie + +------------------------------------------------------------------- +Sun Jul 7 13:01:31 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.13 + * Send ultra-lightweight high-quality animated stickers to + express emotion with motion. + * Receive animated stickers instantly on any connection at + just 20-30 KB per sticker. + * Enjoy smooth animations at 60 frames per second. + * Create new animated sets and upload them to @stickers for + everybody to use. + * Try out these sample stickers: t.me/addstickers/hotcherry + * Use strikethrough and underline formatting. +- Removed rapidjson and qtlottie, added rlottie and lz4, updated crl +- Disable LTO due to build failures + ------------------------------------------------------------------- Mon Jun 24 17:06:02 UTC 2019 - Marcel Kuehlhorn diff --git a/telegram-desktop.spec b/telegram-desktop.spec index b86aea0..b348c74 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -16,16 +16,20 @@ # -# temprarily always use gcc8, later add '0%{?suse_version} < 01550 && ' to only -# use gcc8 on leap -%if 0%{?is_opensuse} +# We need at least gcc8 or higher to build +%if 0%{?suse_version} < 01550 && 0%{?is_opensuse} %bcond_without gcc8 %else %bcond_with gcc8 %endif +# Disable LTO on TW due to build failures +%if 0%{?suse_version} > 01500 && 0%{?is_opensuse} +%define _lto_cflags %{nil} +%endif + Name: telegram-desktop -Version: 1.7.10 +Version: 1.7.15 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only @@ -51,12 +55,13 @@ Source8: catch.hpp Source9: range-v3-master.zip # curl https://codeload.github.com/telegramdesktop/crl/zip/master -o crl-master.zip Source10: crl-master.zip -# curl https://codeload.github.com/telegramdesktop/qtlottie/zip/tdesktop -o qtlottie-tdesktop.zip -Source11: qtlottie-tdesktop.zip # curl https://codeload.github.com/Cyan4973/xxHash/zip/master -o xxHash-master.zip -Source12: xxHash-master.zip -# curl https://codeload.github.com/Tencent/rapidjson/zip/master -o rapidjson-master.zip -Source13: rapidjson-master.zip +Source11: xxHash-master.zip +# curl https://codeload.github.com/lz4/lz4/zip/dev -o lz4-dev.zip +Source12: lz4-dev.zip +# curl https://codeload.github.com/john-preston/rlottie/zip/master -o rlottie-master.zip +Source13: rlottie-master.zip + Patch0: tdesktop.patch BuildRequires: chrpath BuildRequires: cmake @@ -175,13 +180,13 @@ cp %{_sourcedir}/crl-master.zip . && unzip crl-master.zip mv crl-master crl mv crl %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ -cp %{_sourcedir}/qtlottie-tdesktop.zip . && unzip qtlottie-tdesktop.zip -mv qtlottie-tdesktop qtlottie -mv qtlottie %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ +cp %{_sourcedir}/rlottie-master.zip . && unzip rlottie-master.zip +mv rlottie-master rlottie +mv rlottie %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ -cp %{_sourcedir}/rapidjson-master.zip . && unzip rapidjson-master.zip -mv rapidjson-master rapidjson -mv rapidjson %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ +cp %{_sourcedir}/lz4-dev.zip . && unzip lz4-dev.zip +mv lz4-dev lz4 +mv lz4 %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ cp %{_sourcedir}/xxHash-master.zip . && unzip xxHash-master.zip mv xxHash-master xxHash @@ -189,6 +194,7 @@ mv xxHash %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ cp %{_sourcedir}/tdesktop.patch %{_builddir}/tdesktop-%{version} cd %{_builddir}/tdesktop-%{version} + %patch0 -p1 cp %{_sourcedir}/patch.py . && python3 ./patch.py @@ -237,7 +243,7 @@ cd %{_builddir}/tdesktop/Telegram/gyp cd %{_builddir}/tdesktop/out/Release %cmake .. sed -i 's,breakpad/usr/lib,breakpad%{_libdir},' ./CMakeFiles/Telegram.dir/link.txt -make %{?_smp_mflags} +%make_build chrpath --delete Telegram %install @@ -255,29 +261,20 @@ desktop-file-install \ # Install protocol install -d %{buildroot}%{_datadir}/kservices5 install -m644 %{_builddir}/tdesktop/lib/xdg/tg.protocol \ - %{buildroot}%{_datadir}/kservices5/tg.protocol + %{buildroot}%{_datadir}/kservices5/tg.protocol # Install icons for icon_size in 16 32 48 64 128 256 512; do icon_dir="%{buildroot}%{_datadir}/icons/hicolor/${icon_size}x${icon_size}/apps" install -d "${icon_dir}" install -m644 "%{_builddir}/tdesktop/Telegram/Resources/art/icon${icon_size}.png" \ - "${icon_dir}/telegram.png" + "${icon_dir}/telegram.png" done -%post -%icon_theme_cache_post -%desktop_database_post - -%postun -%icon_theme_cache_postun -%desktop_database_postun - %files -%defattr(0664,root,root,-) %license LICENSE %doc README.md -%attr(0755,root,root) %{_bindir}/%{name} +%{_bindir}/%{name} %{_datadir}/applications/telegramdesktop.desktop %dir %{_datadir}/kservices5 %{_datadir}/kservices5/tg.protocol diff --git a/v1.7.10.tar.gz b/v1.7.10.tar.gz deleted file mode 100644 index 7f40b5e..0000000 --- a/v1.7.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54032b9dd864424eac2a1a95f3f4254666fc99745b90be10195eb10052ed5d67 -size 14395842 diff --git a/v1.7.15.tar.gz b/v1.7.15.tar.gz new file mode 100644 index 0000000..b8756ef --- /dev/null +++ b/v1.7.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3111f6c33728fdaf19eeb02eae12fd5e460b53924325cee2c4d015bafdbf80e6 +size 14396667