From 778db909cafdaeda6cd882dde4df9def9474da13e2001fef728cd4270a78af2c Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Tue, 11 Jun 2019 18:22:44 +0000 Subject: [PATCH] Accepting request 708995 from home:tux93:branches:server:messaging Update to 1.7.7 OBS-URL: https://build.opensuse.org/request/show/708995 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=84 --- breakpad-master.tar.gz | 4 +- crl-master.zip | 4 +- gcc7-fix.patch | 13 --- gyp-master.tar.gz | 4 +- libtgvoip.zip | 4 +- ...x-syscall-support-refs-heads-master.tar.gz | 4 +- qtlottie-tdesktop.zip | 3 + range-v3-master.zip | 4 +- rapidjson-master.zip | 3 + telegram-desktop.changes | 65 ++++++++++++++ telegram-desktop.spec | 87 ++++++++++++------- v1.7.0.tar.gz | 3 - v1.7.7.tar.gz | 3 + variant-master.zip | 4 +- xxHash-master.zip | 4 +- 15 files changed, 148 insertions(+), 61 deletions(-) delete mode 100644 gcc7-fix.patch create mode 100644 qtlottie-tdesktop.zip create mode 100644 rapidjson-master.zip delete mode 100644 v1.7.0.tar.gz create mode 100644 v1.7.7.tar.gz diff --git a/breakpad-master.tar.gz b/breakpad-master.tar.gz index 9b7e8b2..5590aca 100644 --- a/breakpad-master.tar.gz +++ b/breakpad-master.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc129ec0faf08c93bff361bf39bc92a3ceb8d5e7b260cdbc68b27682af5a7368 -size 5197580 +oid sha256:80f261579f2d8500a6e9da8bb811c1218e656e99ee8783b9d8d4bd7a7902a454 +size 5213846 diff --git a/crl-master.zip b/crl-master.zip index fa6aed0..5d9479d 100644 --- a/crl-master.zip +++ b/crl-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9eec24866ff99e2b1a1421b246e740fa94334bee928ba46710c261e2ca2b6aad -size 44474 +oid sha256:289bd0f17bbc0e99e30c24bcc5b6fc80c23434d120e06fb9752991065720c2a0 +size 44562 diff --git a/gcc7-fix.patch b/gcc7-fix.patch deleted file mode 100644 index f9605b3..0000000 --- a/gcc7-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tdesktop-1.5.15/Telegram/SourceFiles/boxes/add_contact_box.cpp -=================================================================== ---- tdesktop-1.5.15.orig/Telegram/SourceFiles/boxes/add_contact_box.cpp -+++ tdesktop-1.5.15/Telegram/SourceFiles/boxes/add_contact_box.cpp -@@ -97,7 +97,7 @@ void ShowAddParticipantsError( - channel, - user, - close, -- close); -+ [=] { close(0); }); - auto box = Box( - channel, - user, diff --git a/gyp-master.tar.gz b/gyp-master.tar.gz index 3161397..1b3c681 100644 --- a/gyp-master.tar.gz +++ b/gyp-master.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:597f345c8405df985b252a55bf41283be0e0bf8e1d8af129100cc8e057042683 -size 628309 +oid sha256:f107a414eca8b881809f9c2854f95e634f4f05094192316c53ef348d46258dff +size 627010 diff --git a/libtgvoip.zip b/libtgvoip.zip index 2ef9e72..1dedb25 100644 --- a/libtgvoip.zip +++ b/libtgvoip.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47df426a467b60f38624c243f91dc1eb310622822afe5749eed0cd92e2e0f89a -size 2031843 +oid sha256:89564867d06b3f45aea83ca0df4c2e6712371112eb4a275354dc1d743efe62f2 +size 1956069 diff --git a/linux-syscall-support-refs-heads-master.tar.gz b/linux-syscall-support-refs-heads-master.tar.gz index e84ca61..88068dd 100644 --- a/linux-syscall-support-refs-heads-master.tar.gz +++ b/linux-syscall-support-refs-heads-master.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:071416fd17b7e16b71a036d535f7eff7967e6ebae50f5c1fc5648d1cc3a1df1a -size 30287 +oid sha256:70957e71cf27b788b9680324ff70ef19a243668a2fcf0466e8e2f3acb1b7c6ef +size 34552 diff --git a/qtlottie-tdesktop.zip b/qtlottie-tdesktop.zip new file mode 100644 index 0000000..486d1ed --- /dev/null +++ b/qtlottie-tdesktop.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb614d55c984e88373deedf56ec7f383e918bb69f01d28984c154bfee0ec4926 +size 115542 diff --git a/range-v3-master.zip b/range-v3-master.zip index 01fdbeb..616d554 100644 --- a/range-v3-master.zip +++ b/range-v3-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:651909280d234a427a27973ab14fbc311a247a166d6c1ab1364bae543831c5bb -size 820389 +oid sha256:c6a70d7c70ec3e2a725600a06c1497719f17078527b4c534c2d66b17b2e2653e +size 833965 diff --git a/rapidjson-master.zip b/rapidjson-master.zip new file mode 100644 index 0000000..b880386 --- /dev/null +++ b/rapidjson-master.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19abf9bd9fbbbebaa3022da4fac41f764e1ca7d64ef5752dc57b308c74a0a42c +size 1191266 diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 603d9ff..f1d7032 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Mon Jun 10 20:34:17 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.7 + * Bug fixes and other minor improvements. + +------------------------------------------------------------------- +Thu Jun 6 16:56:59 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.6 + * Bug fixes and other minor improvements. +- Updated qtlottie + +------------------------------------------------------------------- +Wed Jun 5 22:31:45 UTC 2019 - Marcel Kuehlhorn + +- Keep using GCC8 on Tumbleweed until there is a resolution for + https://github.com/telegramdesktop/tdesktop/issues/5996 + +------------------------------------------------------------------- +Wed Jun 5 20:33:30 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.5 + * Download video files while watching them using streaming. + * Set EOL for Windows XP / Vista and OS X 10.6 to 10.9 + at September 1. + * Crash fix. +- Remove gcc7-fix.patch because GCC7 will no longer work due to + qtlottie requiring "class-memaccess" option + +------------------------------------------------------------------- +Wed Jun 5 20:07:00 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.3 + * Bug fixes and other minor improvements. +- New 3rd party: rapidjson + +------------------------------------------------------------------- +Sat Jun 1 12:03:16 UTC 2019 - Marcel Kuehlhorn + +- Update to 1.7.2 + * Choose who can see your phone number with granular precision in + Privacy & Security settings. + * Add group chats to "Always/Never Share" exceptions for any + privacy setting. Permissions will update as users leave + and join the groups. + * Connect a discussion group to your channel, subscribers will + see a "Discuss" button. + * Integrate bots seamlessly with web services. + For example, see t.me/DiscussThis/1 + * Use TouchBar on MacBooks Pro to control music playback and + switch between pinned chats. +- New 3rd party: qtlottie + +------------------------------------------------------------------- +Thu May 30 09:46:29 UTC 2019 - Marcel Kuehlhorn + +- Updated bundled 3rd party sources to fix gcc9 build failures + * breakpad, linux-syscall-support, gyp, crl to current master + * libtgvoip to v2.4.4 + * mapbox-variant to v1.1.6 + * range-v3 to v0.5.0 + * xxHash to v0.7.0 +- spec-cleaner: use pkconfig + ------------------------------------------------------------------- Thu May 9 17:32:58 UTC 2019 - Marcel Kuehlhorn diff --git a/telegram-desktop.spec b/telegram-desktop.spec index b8e8e07..3222540 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -16,8 +16,16 @@ # +# temprarily always use gcc8, later add '0%{?suse_version} < 01550 && ' to only +# use gcc8 on leap +%if 0%{?is_opensuse} +%bcond_without gcc8 +%else +%bcond_with gcc8 +%endif + Name: telegram-desktop -Version: 1.7.0 +Version: 1.7.7 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only @@ -43,52 +51,42 @@ 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/Cyan4973/xxHash/zip/master -o crl-master.zip -Source11: xxHash-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 Patch0: tdesktop.patch -Patch1: gcc7-fix.patch BuildRequires: chrpath BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: ffmpeg-devel -BuildRequires: fontconfig-devel BuildRequires: freetype-devel +%if %{with gcc8} +BuildRequires: gcc8-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: glibc-devel BuildRequires: libQt5Core-private-headers-devel -BuildRequires: libQt5DBus-devel BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libQt5Network-devel -BuildRequires: libQt5Widgets-devel -BuildRequires: libXfixes-devel -BuildRequires: libexpat-devel BuildRequires: libjpeg-devel -BuildRequires: libmng-devel -BuildRequires: libopus-devel -BuildRequires: libproxy-devel BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtimageformats-devel -BuildRequires: libtiff-devel -BuildRequires: minizip-devel -BuildRequires: openal-soft-devel -BuildRequires: opusfile-devel -BuildRequires: pcre-devel BuildRequires: pkgconfig -BuildRequires: portaudio-devel # python2-base is required for gyp, Auto pulled in for Tumbleweed, but need for Leap 15. BuildRequires: python2-base BuildRequires: python3 BuildRequires: unzip -BuildRequires: xcb-util-image-devel -BuildRequires: xcb-util-keysyms-devel -BuildRequires: xcb-util-renderutil-devel -BuildRequires: xcb-util-wm-devel BuildRequires: xorg-x11-devel BuildRequires: xz -BuildRequires: zlib-devel +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(appindicator-0.1) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glib-2.0) @@ -101,18 +99,39 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libmng) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libpcre16) +BuildRequires: pkgconfig(libpcrecpp) +BuildRequires: pkgconfig(libpcreposix) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva-glx) BuildRequires: pkgconfig(libva-x11) BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(mtdev) +BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(opusfile) +BuildRequires: pkgconfig(opusurl) +BuildRequires: pkgconfig(portaudio-2.0) +BuildRequires: pkgconfig(portaudiocpp) BuildRequires: pkgconfig(tslib) +BuildRequires: pkgconfig(xcb-ewmh) +BuildRequires: pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xcb-image) +BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xcb-renderutil) BuildRequires: pkgconfig(xcb-util) +BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon-x11) +BuildRequires: pkgconfig(zlib) # Runtime requirements Requires: ffmpeg Requires: hicolor-icon-theme @@ -156,6 +175,14 @@ 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}/rapidjson-master.zip . && unzip rapidjson-master.zip +mv rapidjson-master rapidjson +mv rapidjson %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ + cp %{_sourcedir}/xxHash-master.zip . && unzip xxHash-master.zip mv xxHash-master xxHash mv xxHash %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ @@ -163,9 +190,6 @@ mv xxHash %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/ cp %{_sourcedir}/tdesktop.patch %{_builddir}/tdesktop-%{version} cd %{_builddir}/tdesktop-%{version} %patch0 -p1 -%if 0%{?sle_version} == 150000 && 0%{?is_opensuse} -%patch1 -p1 -%endif cp %{_sourcedir}/patch.py . && python3 ./patch.py cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/ @@ -175,6 +199,11 @@ cp %{_sourcedir}/catch.hpp ./Telegram/SourceFiles/ %setup -q -T -c -n gyp -a 3 %build +%if %{with gcc8} +export CC=/usr/bin/gcc-8 +export CXX=/usr/bin/g++-8 +%endif + mv %{_builddir}/tdesktop-%{version} %{_builddir}/tdesktop # patch gyp @@ -189,7 +218,7 @@ cd %{_builddir}/breakpad ln -s %{_builddir}/breakpad-lss src/third_party/lss %configure %make_build -make install DESTDIR=%{_builddir}/Libraries/breakpad +make %{?_smp_mflags} install DESTDIR=%{_builddir}/Libraries/breakpad cd %{_builddir}/tdesktop/Telegram/gyp # patch qt.gypi to change libxkbcommon path diff --git a/v1.7.0.tar.gz b/v1.7.0.tar.gz deleted file mode 100644 index d09f197..0000000 --- a/v1.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3be1f6979da9dd0061f27ad5082f96633a4dfde078b1406554b13d5e9674a8bb -size 14327246 diff --git a/v1.7.7.tar.gz b/v1.7.7.tar.gz new file mode 100644 index 0000000..c7f386d --- /dev/null +++ b/v1.7.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3ca072eb4c6e30fd17d34daa129d6211de427fa3953f4020b27a02e65400ef1 +size 14373143 diff --git a/variant-master.zip b/variant-master.zip index ee1b0db..8ff6afb 100644 --- a/variant-master.zip +++ b/variant-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:922bd263bcf26f0c24a0871e35ce99d9e0d562229295261a6f29103d230de7d4 -size 142181 +oid sha256:1819b21acaf9fc836f2b383a3b06a5cd00844a70c2ca2e1a0b86be8b5a58cfa5 +size 141553 diff --git a/xxHash-master.zip b/xxHash-master.zip index 85e157c..37ad313 100644 --- a/xxHash-master.zip +++ b/xxHash-master.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39d1d56b01371332226007824f37e98f28588b9f024e148156de45a9ff2579c1 -size 43566 +oid sha256:554c8f8b5a36156b0b53258093e806657135b455860043f24a271b1cfee197a5 +size 57956