[arch-commits] Commit in telegram-desktop/trunk (4 files)
Date: Tuesday, January 21, 2020 @ 20:33:48 Author: svenstaro Revision: 553330 upgpkg: telegram-desktop 1.9.4-1: Update to 1.9.4 and also get rid some patches tdesktop upstream now has DESKTOP_APP_USE_PACKAGED and that makes packaging against system libs quite a bit easier. They even load gtk3 by default. :) Added: telegram-desktop/trunk/telegram-desktop.sh Modified: telegram-desktop/trunk/0005-Use-system-wide-fonts.patch telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/series --+ 0005-Use-system-wide-fonts.patch | 37 PKGBUILD | 48 +++-- series |3 -- telegram-desktop.sh |3 ++ 4 files changed, 44 insertions(+), 47 deletions(-) Modified: 0005-Use-system-wide-fonts.patch === --- 0005-Use-system-wide-fonts.patch2020-01-21 20:03:41 UTC (rev 553329) +++ 0005-Use-system-wide-fonts.patch2020-01-21 20:33:48 UTC (rev 553330) @@ -1,6 +1,8 @@ Do not force custom fontconfig configuration. a/Telegram/lib_ui/fonts/fonts.qrc -+++ b/Telegram/lib_ui/fonts/fonts.qrc +Index: tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc +=== +--- tdesktop-1.9.4-full.orig/Telegram/lib_ui/fonts/fonts.qrc tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc @@ -1,10 +1,4 @@ @@ -12,9 +14,11 @@ -DAOpenSansSemiboldItalic.ttf a/Telegram/lib_ui/ui/style/style_core_font.cpp -+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp -@@ -94,12 +94,12 @@ +Index: tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp +=== +--- tdesktop-1.9.4-full.orig/Telegram/lib_ui/ui/style/style_core_font.cpp tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp +@@ -94,12 +94,12 @@ enum { FontTypesCount, }; QString FontTypeNames[FontTypesCount] = { @@ -33,7 +37,7 @@ }; int32 FontTypeFlags[FontTypesCount] = { 0, -@@ -135,7 +135,7 @@ +@@ -135,7 +135,7 @@ void StartFonts() { for (auto i = 0; i != FontTypesCount; ++i) { const auto name = FontTypeNames[i]; const auto flags = FontTypeFlags[i]; @@ -42,21 +46,12 @@ Overrides[i] = name; #ifdef Q_OS_WIN // Attempt to workaround a strange font bug with Open Sans Semibold not loading. a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -82,8 +82,6 @@ - return; - } - } -- -- QFile(":/fc/fc-custom.conf").copy(custom); - #endif // TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION - } - a/Telegram/lib_ui/qt_conf/linux.qrc -+++ b/Telegram/lib_ui/qt_conf/linux.qrc -@@ -2,6 +2,5 @@ - +Index: tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc +=== +--- tdesktop-1.9.4-full.orig/Telegram/lib_ui/qt_conf/linux.qrc tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc +@@ -3,6 +3,5 @@ + qt_linux.conf -fc-custom.conf Modified: PKGBUILD === --- PKGBUILD2020-01-21 20:03:41 UTC (rev 553329) +++ PKGBUILD2020-01-21 20:33:48 UTC (rev 553330) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.9.3 +pkgver=1.9.4 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -36,59 +36,61 @@ ) source=( "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz; -"0001-Dynamic-linking-system-libs.patch" -"0002-Dynamic-linking-system-qt.patch" -"0004-gtk3.patch" -"0005-Use-system-wide-fonts.patch" -"0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch" -"series" +telegram-desktop.sh +0005-Use-system-wide-fonts.patch +0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch +series ) -sha512sums=('af8e5d2c74d0b990958edd75a01f40b70bc21c0f69074acfb943f44fdb1f1e84465b461765a1a584513e54ab30045817b42b6839ad16cb4c1043fda89ea600f7' - '69fc5b50d2663af0c0bb539a6ac4b3d8996282f1701f484b9d1e29ddbd6eec942c999ee2f77d7effed13d4ecdd62e03e6ff064be0948ff91124962cc17c57143' - '5675787e849a811679b24e86b64e651c1aded56853e52c9455d8d914b85c153b63287a0d41aaa4c39c0e805ee1f411132431340d7aba99b11fcd1036e8d37680' - '8c3f48536ff3878baa73949057960eb5c8fcf3f152141c42740a7c0f2fc96c1708511a5d4ffe45ae9e20a08f88a3c2c77163a0a2050d7fca4356e4d2a96dfaf1' - 'd5fa5290b7041cb972c78066ca60d1cbc2bb3de10bf571ca1a639bf05abfa029531ffc0facba0564d39e32f89301960f4879b35bb9ac362ae9264d0a8c5c835c'
[arch-commits] Commit in telegram-desktop/trunk (4 files)
Date: Monday, July 8, 2019 @ 14:08:48 Author: farseerfc Revision: 487707 upgpkg: telegram-desktop 1.7.14-1 telegram-desktop 1.7.14-1 patching ffmpeg_utility and rlottie to build Added: telegram-desktop/trunk/tdesktop-ffmpeg-fix-convertFromARGB32PM.patch telegram-desktop/trunk/tdesktop-rlottie-static-qt.patch Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop_lottie_animation_qtdebug.patch ---+ PKGBUILD | 22 ++-- tdesktop-ffmpeg-fix-convertFromARGB32PM.patch | 42 tdesktop-rlottie-static-qt.patch | 13 +++ tdesktop_lottie_animation_qtdebug.patch |1 4 files changed, 67 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-07-08 13:30:18 UTC (rev 487706) +++ PKGBUILD2019-07-08 14:08:48 UTC (rev 487707) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.7.10 -pkgrel=6 +pkgver=1.7.14 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -23,7 +23,7 @@ "GSL::git+https://github.com/Microsoft/GSL.git; "crl::git+https://github.com/telegramdesktop/crl.git; "xxHash::git+https://github.com/Cyan4973/xxHash.git; -"qtlottie::git+https://github.com/telegramdesktop/qtlottie.git; +"rlottie::git+https://github.com/john-preston/rlottie.git; "tg.protocol" "CMakeLists.inj" "tdesktop.patch" @@ -32,7 +32,8 @@ "demibold.patch" "Use-system-wide-font.patch" "tdesktop_lottie_animation_qtdebug.patch" -"tdesktop_qtlottie_qtdebug.patch" +"tdesktop-ffmpeg-fix-convertFromARGB32PM.patch" +"tdesktop-rlottie-static-qt.patch" ) sha512sums=('SKIP' 'SKIP' @@ -49,8 +50,9 @@ 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653' - '5703b8228ab26f736928b56b90947602e78774648ff354ae10a53ad4535289ac12c8b7a049cabaed7591909246987be403dc470d48dd72a9ec1ce776a2977a66' - 'c101761ff0aa6d4be38d0159bee31d02f66cfda84dbfb614e35e8d1c8f73bd78346636764a823bf1ce33b5364e99ea71330de60e37190f78d55f25a183f0d0cc') + 'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3' + 'f0912f2adc6181d3050d8e688c81da5333eeba3166354a72cd4b6abb492c2e6093ca76d577bb4d5ea78706aaa367d952f173d4fd083a1c088172cc5227df61b0' + '1f7cecfc8698ff9e0abce87226e993e73fdf35111d037c2847f7a1f30e65483ab332e45a1bdb86f6ac4c420c1c1429ac20454655d0e982477e37b7c48f0b1599') prepare() { cd "$srcdir/tdesktop" @@ -61,7 +63,7 @@ git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch2" git config submodule.Telegram/ThirdParty/crl.url "$srcdir/crl" git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/xxHash" -git config submodule.Telegram/ThirdParty/qtlottie.url "$srcdir/qtlottie" +git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/rlottie" git submodule update patch -Np1 -i "$srcdir/tdesktop.patch" @@ -69,12 +71,10 @@ patch -R -Np1 -i "$srcdir/demibold.patch" patch -Np1 -i "$srcdir/Use-system-wide-font.patch" patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch" +patch -Np1 -i "$srcdir/tdesktop-ffmpeg-fix-convertFromARGB32PM.patch" +patch -Np1 -i "$srcdir/tdesktop-rlottie-static-qt.patch" cd "$srcdir/tdesktop" -cd "Telegram/ThirdParty/qtlottie" -patch -Np1 -i "$srcdir/tdesktop_qtlottie_qtdebug.patch" - -cd "$srcdir/tdesktop" cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch" } Added: tdesktop-ffmpeg-fix-convertFromARGB32PM.patch === --- tdesktop-ffmpeg-fix-convertFromARGB32PM.patch (rev 0) +++ tdesktop-ffmpeg-fix-convertFromARGB32PM.patch 2019-07-08 14:08:48 UTC (rev 487707) @@ -0,0 +1,42 @@ +diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp +index 5d0e50926..7d89692f8 100644 +--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp +@@ -355,6 +355,12 @@ QImage CreateFrameStorage(QSize size) { + } + + void UnPremultiply(QImage , const QImage ) { ++ to = from.convertToFormat(QImage::Format_ARGB32); ++return; ++ below is original tdesktop code, we shortcut them by
[arch-commits] Commit in telegram-desktop/trunk (4 files)
Date: Monday, July 16, 2018 @ 15:21:01 Author: svenstaro Revision: 359861 upgpkg: telegram-desktop 1.3.10-1 Modified: telegram-desktop/trunk/CMakeLists.inj telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch Deleted: telegram-desktop/trunk/libtgvoip-2.patch ---+ CMakeLists.inj|1 PKGBUILD | 18 ++- libtgvoip-2.patch | 81 tdesktop.patch| 17 +++--- 4 files changed, 16 insertions(+), 101 deletions(-) Modified: CMakeLists.inj === --- CMakeLists.inj 2018-07-16 14:55:33 UTC (rev 359860) +++ CMakeLists.inj 2018-07-16 15:21:01 UTC (rev 359861) @@ -9,6 +9,7 @@ # lines. include(../../Telegram/gyp/PrecompiledHeader.cmake) add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) # vim: ft=cmake # -- debian/CMakeLists.inj end -- Modified: PKGBUILD === --- PKGBUILD2018-07-16 14:55:33 UTC (rev 359860) +++ PKGBUILD2018-07-16 15:21:01 UTC (rev 359861) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.3.7 +pkgver=1.3.10 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -16,16 +16,16 @@ optdepends=('libnotify: desktop notifications') source=( "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver; +"libtgvoip::git+https://github.com/telegramdesktop/libtgvoip; +"variant::git+https://github.com/mapbox/variant; "GSL::git+https://github.com/Microsoft/GSL.git; -"libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git; -"variant::git+https://github.com/mapbox/variant.git; "Catch::git+https://github.com/philsquared/Catch; +"crl::git+https://github.com/telegramdesktop/crl.git; "tg.protocol" "CMakeLists.inj" "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" -"libtgvoip-2.patch" ) sha512sums=('SKIP' 'SKIP' @@ -32,12 +32,13 @@ 'SKIP' 'SKIP' 'SKIP' +'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' - 'aa97c02ff4f1caa152671496aff6bb7162271fbfb86ade7c5b72f1cca3ab1ef92b69a9e9390614d2b84ae43606545b8c8bc2bfd98132d0cf57a8b253bcf2e643' - '72c9cf1f5639c2c090e853d7141cc9f8c295b869f3ce1b998559db136903d37f3a8c6676520cd5d5d228f6e1e6db0ec0b0c7c399a3653f214bf56d9d1c1a25d0' + '2647251940f0d3a2d41ca8a32a592f1ab1e23fe02d3b11d8dc3a54ef34df7c290c9cbf3df76b09970e1cba15c149bc38d49fc824a173d4b21c54edb3c5d5a3da' + '00b4307143cf599859d9b9b6d7ac4acbe8b407da55a1e3833921e113dc3aed8c61f2e5f2c1c37e81a261ba4b9e6f40d9bf5f8c90c20dcf0820cfb73852cb091d' '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' - '251f43bcdfd688a4c7dda082e981569c6cd6332289652576cfdc9f6376eee6e28195ec4a60bcfa002c6358d0f3cbdf215b7d390bbcce2ed560abfc9c606566b5') + '536dfada1a4fbffda32893fb2ac8a0f2412e23ac20a19f032a826cc5e0518b1d35004cba42ee9244e253d34429050e782ffc57ffca4f01b8733a40bc69b98958') prepare() { cd "$srcdir/tdesktop" @@ -46,13 +47,14 @@ git config submodule.Telegram/ThirdParty/variant.url "$srcdir/variant" git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/libtgvoip" git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch" +git config submodule.Telegram/ThirdParty/crl.url "$srcdir/crl" git submodule update + patch -Np1 -i "$srcdir/tdesktop.patch" patch -Np1 -i "$srcdir/no-gtk2.patch" cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch" -# patch -Np1 -i "$srcdir/libtgvoip-2.patch" } build() { Deleted: libtgvoip-2.patch === --- libtgvoip-2.patch 2018-07-16 14:55:33 UTC (rev 359860) +++ libtgvoip-2.patch 2018-07-16 15:21:01 UTC (rev 359861) @@ -1,81 +0,0 @@ -From f2e246c1bfd456646880f4df8062337a53407343 Mon Sep 17 00:00:00 2001 -From: Nicholas Guriev -Date: Thu, 6 Jul 2017 23:19:12 +0300 -Subject: [PATCH 1/2] Remove deprecated call of AES_ctr128_encrypt - - * The AES_ctr128_encrypt function is not available in OpenSSL 1.1.0 - without a special compiler flag - * Fix a small misspelling - VoIPController.cpp | 7 --- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/VoIPController.cpp b/VoIPController.cpp -index 78e9e4b..c81673f 100644
[arch-commits] Commit in telegram-desktop/trunk (4 files)
Date: Wednesday, March 21, 2018 @ 21:33:34 Author: svenstaro Revision: 310268 upgpkg: telegram-desktop 1.2.12-3 Build against openssl 1.1 (FS#57895) Added: telegram-desktop/trunk/libtgvoip-2.patch Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/libtgvoip.patch telegram-desktop/trunk/tdesktop.patch ---+ PKGBUILD | 11 --- libtgvoip-2.patch | 81 libtgvoip.patch |2 - tdesktop.patch|4 +- 4 files changed, 91 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-21 21:20:22 UTC (rev 310267) +++ PKGBUILD2018-03-21 21:33:34 UTC (rev 310268) @@ -6,12 +6,12 @@ pkgname=telegram-desktop pkgver=1.2.12 -pkgrel=2 +pkgrel=3 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; license=('GPL3') -depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl-1.0') +depends=('ffmpeg' 'hicolor-icon-theme' 'minizip' 'openal' 'qt5-base' 'qt5-imageformats' 'openssl') makedepends=('cmake' 'git' 'gyp' 'range-v3' 'python' 'libappindicator-gtk3') optdepends=('libnotify: desktop notifications') source=( @@ -25,6 +25,7 @@ "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" +"libtgvoip-2.patch" ) sha256sums=('SKIP' 'SKIP' @@ -33,9 +34,10 @@ 'SKIP' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' -'36b817ec9843b261af7a246f9ec51feb828203bd90e76aef7383457f23a0d4cb' +'7879740fa0e3c5fbb5e35014c749dce5532acd16d61bd3ddfebb3079cea624df' '8d707debe027c7cb658825501dc30fb3beb57ab21b1b6df2f01c5f76ca39a0e6' -'0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075') +'4dd2b1674b1a5bcfc5b640612278fe3a53b454192fbcc06b7476ff54ed6d2f6d' +'07ca232b91e9ad0fb9c1501b8b83275cc62b00477c7e5edde5e4cfd2852f1f26') prepare() { cd "$srcdir/tdesktop" @@ -50,6 +52,7 @@ cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch" +patch -Np1 -i "$srcdir/libtgvoip-2.patch" } build() { Added: libtgvoip-2.patch === --- libtgvoip-2.patch (rev 0) +++ libtgvoip-2.patch 2018-03-21 21:33:34 UTC (rev 310268) @@ -0,0 +1,81 @@ +From f2e246c1bfd456646880f4df8062337a53407343 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev+Date: Thu, 6 Jul 2017 23:19:12 +0300 +Subject: [PATCH 1/2] Remove deprecated call of AES_ctr128_encrypt + + * The AES_ctr128_encrypt function is not available in OpenSSL 1.1.0 + without a special compiler flag + * Fix a small misspelling +--- + VoIPController.cpp | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/VoIPController.cpp b/VoIPController.cpp +index 78e9e4b..c81673f 100644 +--- a/VoIPController.cpp b/VoIPController.cpp +@@ -102,6 +102,7 @@ bool VoIPController::didInitWin32TimeScale = false; + #ifndef TGVOIP_USE_CUSTOM_CRYPTO + #include + #include ++#include + #include + + void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){ +@@ -131,7 +132,7 @@ void tgvoip_openssl_sha256(uint8_t* msg, size_t len, uint8_t* output){ + void tgvoip_openssl_aes_ctr_encrypt(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num){ + AES_KEY akey; + AES_set_encrypt_key(key, 32*8, ); +- AES_ctr128_encrypt(inout, inout, length, , iv, ecount, num); ++ CRYPTO_ctr128_encrypt(inout, inout, length, , iv, ecount, num, (block128_f) AES_encrypt); + } + + voip_crypto_functions_t VoIPController::crypto={ +@@ -1142,7 +1143,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA + if(!micMuted){ + audioInput->Start(); + if(!audioInput->IsInitialized()){ +- LOGE("Erorr initializing audio capture"); ++ LOGE("Error initializing audio capture"); + lastError=TGVOIP_ERROR_AUDIO_IO; + + SetState(STATE_FAILED); +@@ -1150,7 +1151,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA + } + } + if(!audioOutput->IsInitialized()){ +- LOGE("Erorr initializing audio playback"); ++