[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Thursday, January 23, 2020 @ 15:33:36 Author: farseerfc Revision: 554983 upgpkg: telegram-desktop 1.9.7-1: telegram-desktop 1.9.7 release Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/series Deleted: telegram-desktop/trunk/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch --+ 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch | 25 - PKGBUILD | 19 + series |1 3 files changed, 11 insertions(+), 34 deletions(-) Deleted: 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch === --- 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch2020-01-23 15:33:15 UTC (rev 554982) +++ 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch2020-01-23 15:33:36 UTC (rev 554983) @@ -1,25 +0,0 @@ -From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001 -From: Jiachen YANG -Date: Fri, 4 Oct 2019 16:59:26 +0900 -Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold." - -This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf. - Telegram/lib_ui/ui/style/style_core_font.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - a/Telegram/lib_ui/ui/style/style_core_font.cpp -+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp -@@ -225,9 +225,9 @@ - - f.setPixelSize(size); - if (_flags & FontBold) { -- f.setBold(true); -- //} else if (fontFamilies[family] == "Open Sans Semibold") { -- // f.setWeight(QFont::DemiBold); -+ f.setBold(_flags & FontBold); -+ } else if (fontFamilies[family] == "Open Sans Semibold") { -+ f.setWeight(QFont::DemiBold); - } - f.setItalic(_flags & FontItalic); - f.setUnderline(_flags & FontUnderline); Modified: PKGBUILD === --- PKGBUILD2020-01-23 15:33:15 UTC (rev 554982) +++ PKGBUILD2020-01-23 15:33:36 UTC (rev 554983) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.9.4 -pkgrel=2 +pkgver=1.9.7 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -39,14 +39,13 @@ "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz; telegram-desktop.sh 0005-Use-system-wide-fonts.patch -0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch + #"gcc9-cpp2a.patch::https://github.com/desktop-app/cmake_helpers/commit/67cf2a5abdb01658c1cf852b29e25808dcc02c56.patch; series ) -sha512sums=('0967f60dd978a5fc5ec2501a22e8865afd4ddeaacfd1b0acfb133cd511767ff1c6f03a099aef3de03b0f837c8eccac1caea14c395ee54c8d3ab5b35de7551745' +sha512sums=('7fd2e2ab8813fad187ca711aafc42c1ad76102ee23ce2dbfa4ccc6898b80a152ecbdf842a175b67db05937c099ddf45889ad493a5bac91da9331ee645bb691bf' '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b' 'e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d' - '41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d' - 'd66adb920b318520146cf7a29f13e28e16c0cfb28f4d27ef743a8d7acea4b45b5c62e7dfc3928ec23a97b12dd42845f311aaa7c317df632f7926bdd5bfb8f2b3') + 'bff9dea22b659f37a5e3508e5da381f2cffcc83f4f0aa85d0ef9a9ff5666acb36af70a6396aa9d9610626cf8c81fb4fefb63ee511f94bf58c1c9830d93853ffe') prepare() { cd tdesktop-$pkgver-full @@ -54,6 +53,9 @@ QUILT_PATCHES=.. quilt --quiltrc=/dev/null push -a mkdir build + +#cd cmake +#patch -Np1 -i "$srcdir/gcc9-cpp2a.patch" } build() { @@ -73,7 +75,8 @@ -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \ -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \ -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ --DDESKTOP_APP_SPECIAL_TARGET="" +-DDESKTOP_APP_SPECIAL_TARGET="" \ +-DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" ninja -C build } @@ -82,7 +85,7 @@ install -m755 telegram-desktop.sh "$pkgdir/usr/bin/telegram-desktop" cd tdesktop-$pkgver-full -install -m755 build/bin/Telegram "$pkgdir/usr/bin/telegram-desktop-bin" +install -m755 build/bin/telegram-desktop "$pkgdir/usr/bin/telegram-desktop-bin" install -d "$pkgdir/usr/share/applications" install -m644 lib/xdg/telegramdesktop.desktop "$pkgdir/usr/share/applications/telegramdesktop.desktop" Modified: series === --- series 2020-01-23 15:33:15 UTC (rev 554982) +++ series 2020-01-23
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Tuesday, January 21, 2020 @ 21:02:55 Author: svenstaro Revision: 553336 Remove unused patches Deleted: telegram-desktop/trunk/0001-Dynamic-linking-system-libs.patch telegram-desktop/trunk/0002-Dynamic-linking-system-qt.patch telegram-desktop/trunk/0004-gtk3.patch + 0001-Dynamic-linking-system-libs.patch | 340 --- 0002-Dynamic-linking-system-qt.patch | 165 --- 0004-gtk3.patch| 22 -- 3 files changed, 527 deletions(-) Deleted: 0001-Dynamic-linking-system-libs.patch === --- 0001-Dynamic-linking-system-libs.patch 2020-01-21 20:49:30 UTC (rev 553335) +++ 0001-Dynamic-linking-system-libs.patch 2020-01-21 21:02:55 UTC (rev 553336) @@ -1,340 +0,0 @@ -From: John Zimmermann a/cmake/external/crash_reports/CMakeLists.txt -+++ b/cmake/external/crash_reports/CMakeLists.txt -@@ -7,6 +7,7 @@ - add_library(external_crash_reports INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_crash_reports ALIAS external_crash_reports) - -+if(NOT DESKTOP_APP_DISABLE_CRASH_REPORTS) - if (WIN32 OR LINUX OR build_macstore) - add_subdirectory(breakpad) - target_link_libraries(external_crash_reports -@@ -20,3 +21,4 @@ - desktop-app::external_crashpad - ) - endif() -+endif() a/cmake/external/ffmpeg/CMakeLists.txt -+++ b/cmake/external/ffmpeg/CMakeLists.txt -@@ -7,6 +7,18 @@ - add_library(external_ffmpeg INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_ffmpeg ALIAS external_ffmpeg) - -+if(DESKTOP_APP_USE_SYSTEM_LIBS) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libavutil libswresample libswscale) -+target_link_libraries(external_ffmpeg -+INTERFACE -+${FFMPEG_LIBRARIES} -+) -+target_include_directories(external_ffmpeg SYSTEM -+INTERFACE -+${FFMPEG_INCLUDE_DIRS} -+) -+else() - target_include_directories(external_ffmpeg SYSTEM - INTERFACE - ${libs_loc}/ffmpeg -@@ -36,3 +48,4 @@ - Xrender - ) - endif() -+endif() a/cmake/external/openal/CMakeLists.txt -+++ b/cmake/external/openal/CMakeLists.txt -@@ -7,6 +7,21 @@ - add_library(external_openal INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_openal ALIAS external_openal) - -+if(DESKTOP_APP_USE_SYSTEM_LIBS) -+find_package(OpenAL REQUIRED) -+target_include_directories(external_openal SYSTEM -+INTERFACE -+${OPENAL_INCLUDE_DIR} -+) -+target_link_libraries(external_openal -+INTERFACE -+${OPENAL_LIBRARY} -+) -+target_compile_definitions(external_openal -+INTERFACE -+AL_ALEXT_PROTOTYPES -+) -+else() - if (WIN32) - target_include_directories(external_openal SYSTEM - INTERFACE -@@ -41,3 +56,4 @@ - AL_LIBTYPE_STATIC - AL_ALEXT_PROTOTYPES - ) -+endif() a/cmake/external/openssl/CMakeLists.txt -+++ b/cmake/external/openssl/CMakeLists.txt -@@ -7,7 +7,13 @@ - add_library(external_openssl INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_openssl ALIAS external_openssl) - --if (LINUX) -+if(DESKTOP_APP_USE_SYSTEM_LIBS) -+find_package(OpenSSL REQUIRED) -+target_include_directories(external_openssl SYSTEM -+INTERFACE -+${OPENSSL_INCLUDE_DIR} -+) -+elseif (LINUX) - target_include_directories(external_openssl SYSTEM - INTERFACE - /usr/local/desktop-app/openssl-1.1.1/include -@@ -24,6 +30,13 @@ - ) - endif() - -+if(DESKTOP_APP_USE_SYSTEM_LIBS) -+target_link_libraries(external_openssl -+INTERFACE -+ OpenSSL::Crypto -+OpenSSL::SSL -+) -+else() - if (WIN32) - set(openssl_lib_ext lib) - set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out32$<$:.dbg>) -@@ -45,6 +58,7 @@ - ${openssl_lib_loc}/libssl.${openssl_lib_ext} - ${openssl_lib_loc}/libcrypto.${openssl_lib_ext} - ) -+endif() - - if (LINUX) - if (DESKTOP_APP_USE_GLIBC_WRAPS) a/cmake/external/opus/CMakeLists.txt -+++ b/cmake/external/opus/CMakeLists.txt -@@ -7,6 +7,18 @@ - add_library(external_opus INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_opus ALIAS external_opus) - -+if(DESKTOP_APP_USE_SYSTEM_LIBS) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(OPUS REQUIRED opus) -+target_include_directories(external_opus SYSTEM -+INTERFACE -+${OPUS_INCLUDE_DIRS} -+) -+target_link_libraries(external_opus -+INTERFACE -+${OPUS_LIBRARIES} -+) -+else() - target_include_directories(external_opus SYSTEM - INTERFACE - ${libs_loc}/opus/include -@@ -43,3 +55,4 @@ - opus - ) - endif() -+endif() a/cmake/external/qt/CMakeLists.txt -+++ b/cmake/external/qt/CMakeLists.txt -@@ -15,6 +15,36 @@ - endif() - endif() - -+if(DESKTOP_APP_USE_SYSTEM_LIBS) -+get_target_property(QTCORE_INCLUDE_DIRS Qt5::Core
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Friday, August 9, 2019 @ 19:17:14 Author: farseerfc Revision: 498563 upgpkg: telegram-desktop 1.8.0-1 telegram-desktop 1.8.0 Modified: telegram-desktop/trunk/CMakeLists.inj telegram-desktop/trunk/PKGBUILD Deleted: telegram-desktop/trunk/issue6219.patch -+ CMakeLists.inj |1 PKGBUILD| 15 +--- issue6219.patch | 172 -- 3 files changed, 7 insertions(+), 181 deletions(-) Modified: CMakeLists.inj === --- CMakeLists.inj 2019-08-09 18:54:23 UTC (rev 498562) +++ CMakeLists.inj 2019-08-09 19:17:14 UTC (rev 498563) @@ -11,6 +11,7 @@ add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h) add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h) +add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h) # You can discover new PCHs using this link: # https://github.com/telegramdesktop/tdesktop/search?q=pch_header_q=pch_header Modified: PKGBUILD === --- PKGBUILD2019-08-09 18:54:23 UTC (rev 498562) +++ PKGBUILD2019-08-09 19:17:14 UTC (rev 498563) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.7.14 -pkgrel=3 +pkgver=1.8.0 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -32,7 +32,7 @@ "demibold.patch" "Use-system-wide-font.patch" "tdesktop_lottie_animation_qtdebug.patch" -"issue6219.patch" + "revert-private-headers.patch::https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch; ) sha512sums=('SKIP' 'SKIP' @@ -43,7 +43,7 @@ 'SKIP' 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' - 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' + '16874fabcb0d04d6bf8db1ee2fd77fbd09eeb6acc28bb5fd915d378f7a5ed7ebf4aae01c390e516695572cf9ef0e2cb59493e21a35643fd63ddf3fec446858a6' '3b6a0450f7981c2ce5f90c1ea46d9fb504194609f357b957b5c4a741681d3c531252394df116f8b77780a3a110783c047c9a081f9651e0792e7423573e390392' 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' @@ -50,7 +50,7 @@ '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653' 'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3' - 'f3ec62dfcace74e0b07396427fa6cdfa849c3feab251bdf629512984bbb2ad4b0389a2543ae6d299a5b3788609e4aeabb0dabc1fa51a3a099287c1b199626ec0') + 'e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557') prepare() { cd "$srcdir/tdesktop" @@ -69,11 +69,8 @@ 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 -R -Np1 -i "$srcdir/revert-private-headers.patch" -# backport from https://github.com/telegramdesktop/tdesktop/commit/0710dde4d5526454318b2748331e887c01ecfdce -# as discussed in https://github.com/telegramdesktop/tdesktop/issues/6219 -patch -Np1 -i "$srcdir/issue6219.patch" - # disable static-qt for rlottie sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/tdesktop/Telegram/gyp/lib_rlottie.gyp" Deleted: issue6219.patch === --- issue6219.patch 2019-08-09 18:54:23 UTC (rev 498562) +++ issue6219.patch 2019-08-09 19:17:14 UTC (rev 498563) @@ -1,172 +0,0 @@ -From 0710dde4d5526454318b2748331e887c01ecfdce Mon Sep 17 00:00:00 2001 -From: John Preston -Date: Tue, 9 Jul 2019 13:43:57 +0200 -Subject: [PATCH] Use private Qt color API only in official build. - -Fixes #6219. - .../SourceFiles/ffmpeg/ffmpeg_utility.cpp | 100 -- - Telegram/gyp/lib_ffmpeg.gyp | 6 +- - 2 files changed, 71 insertions(+), 35 deletions(-) - -diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Tuesday, June 4, 2019 @ 05:14:02 Author: farseerfc Revision: 476826 upgpkg: telegram-desktop 1.7.3-1 telegram-desktop 1.7.3 Added: telegram-desktop/trunk/tdesktop_lottie_animation_qtdebug.patch telegram-desktop/trunk/tdesktop_qtlottie_qtdebug.patch Modified: telegram-desktop/trunk/PKGBUILD -+ PKGBUILD| 17 +++-- tdesktop_lottie_animation_qtdebug.patch | 12 tdesktop_qtlottie_qtdebug.patch | 12 3 files changed, 39 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-06-03 22:14:58 UTC (rev 476825) +++ PKGBUILD2019-06-04 05:14:02 UTC (rev 476826) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.7.0 +pkgver=1.7.3 pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -23,6 +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; "tg.protocol" "CMakeLists.inj" "tdesktop.patch" @@ -30,6 +31,8 @@ "libtgvoip.patch" "demibold.patch" "Use-system-wide-font.patch" +"tdesktop_lottie_animation_qtdebug.patch" +"tdesktop_qtlottie_qtdebug.patch" ) sha512sums=('SKIP' 'SKIP' @@ -38,6 +41,7 @@ 'SKIP' 'SKIP' 'SKIP' +'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' '710af6c851aa8535aec8fb32e8c05d934970bab227f935dec0e2fbcad5b8b2ad277793e4226bd1d4e46e77150fa05bc3326cce1118f91de87e1b0e477315523f' @@ -44,7 +48,9 @@ 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' - 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653') + 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653' + '5703b8228ab26f736928b56b90947602e78774648ff354ae10a53ad4535289ac12c8b7a049cabaed7591909246987be403dc470d48dd72a9ec1ce776a2977a66' + 'c101761ff0aa6d4be38d0159bee31d02f66cfda84dbfb614e35e8d1c8f73bd78346636764a823bf1ce33b5364e99ea71330de60e37190f78d55f25a183f0d0cc') prepare() { cd "$srcdir/tdesktop" @@ -55,6 +61,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 submodule update patch -Np1 -i "$srcdir/tdesktop.patch" @@ -61,7 +68,13 @@ patch -Np1 -i "$srcdir/no-gtk2.patch" 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" +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_lottie_animation_qtdebug.patch === --- tdesktop_lottie_animation_qtdebug.patch (rev 0) +++ tdesktop_lottie_animation_qtdebug.patch 2019-06-04 05:14:02 UTC (rev 476826) @@ -0,0 +1,12 @@ +diff --git a/Telegram/SourceFiles/lottie/lottie_animation.cpp b/Telegram/SourceFiles/lottie/lottie_animation.cpp +index cee1bf7bb..c8adfc343 100644 +--- a/Telegram/SourceFiles/lottie/lottie_animation.cpp b/Telegram/SourceFiles/lottie/lottie_animation.cpp +@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include "logs.h" + + #include ++#include + #include + #include + Added: tdesktop_qtlottie_qtdebug.patch === --- tdesktop_qtlottie_qtdebug.patch (rev 0) +++ tdesktop_qtlottie_qtdebug.patch 2019-06-04 05:14:02 UTC (rev 476826) @@ -0,0 +1,12 @@ +diff --git
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Tuesday, December 11, 2018 @ 20:08:01 Author: farseerfc Revision: 415526 upgpkg: telegram-desktop 1.5.1-2 telegram-desktop 1.5.1-2 revert SemiBold font fallback Added: telegram-desktop/trunk/Use-system-wide-font.patch telegram-desktop/trunk/demibold.patch Modified: telegram-desktop/trunk/PKGBUILD + PKGBUILD | 10 -- Use-system-wide-font.patch | 34 ++ demibold.patch | 27 +++ 3 files changed, 69 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-12-11 19:53:28 UTC (rev 415525) +++ PKGBUILD2018-12-11 20:08:01 UTC (rev 415526) @@ -6,7 +6,7 @@ pkgname=telegram-desktop pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -27,6 +27,8 @@ "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" +"demibold.patch" +"Use-system-wide-font.patch" ) sha512sums=('SKIP' 'SKIP' @@ -39,7 +41,9 @@ 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' 'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2' 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' - 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') + 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' + '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0' + 'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653') prepare() { cd "$srcdir/tdesktop" @@ -54,6 +58,8 @@ patch -Np1 -i "$srcdir/tdesktop.patch" patch -Np1 -i "$srcdir/no-gtk2.patch" +patch -R -Np1 -i "$srcdir/demibold.patch" +patch -Np1 -i "$srcdir/Use-system-wide-font.patch" cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch" Added: Use-system-wide-font.patch === --- Use-system-wide-font.patch (rev 0) +++ Use-system-wide-font.patch 2018-12-11 20:08:01 UTC (rev 415526) @@ -0,0 +1,34 @@ +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 +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 +@@ -42,9 +42,6 @@ + ../export_html/js/script.js + + +-../fonts/OpenSans-Regular.ttf +-../fonts/OpenSans-Bold.ttf +-../fonts/OpenSans-Semibold.ttf + ../art/bg.jpg + ../art/bg_initial.jpg + ../art/logo_256.png +--- 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. Added: demibold.patch === --- demibold.patch (rev 0) +++ demibold.patch 2018-12-11 20:08:01 UTC (rev 415526) @@ -0,0 +1,27 @@ +commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf +Author: John Preston +Date: Wed Dec 5 14:42:19 2018 +0400 + +Disable DemiBold fallback for Semibold. + +This reverts changes from commit 089c4ceb30. + +There were complaints that Persian font becomes unreadable :( + +diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp +index a2ab5f89f..d268a71e1 100644 +--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp +@@ -58,9 +58,9 @@
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Monday, December 10, 2018 @ 20:09:02 Author: svenstaro Revision: 414480 upgpkg: telegram-desktop 1.5.0-2 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/no-gtk2.patch telegram-desktop/trunk/tdesktop.patch + PKGBUILD | 15 --- no-gtk2.patch | 11 ++- tdesktop.patch | 17 + 3 files changed, 27 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-12-10 20:05:56 UTC (rev 414479) +++ PKGBUILD2018-12-10 20:09:02 UTC (rev 414480) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.4.3 +pkgver=1.5.0 pkgrel=2 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -37,8 +37,8 @@ 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' - '47c0d1e00401d7899b2ce710c06ceac6caffddbe1a4c85bc407918b43051cba292f6e6131cc0f390a66520e92f0ffa3761f8d973a25986dfe21c54f113062c33' - '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' + 'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2' + 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') prepare() { @@ -66,7 +66,16 @@ export EXTRA_FLAGS="-Winvalid-pch" export CPPFLAGS="$CPPFLAGS $EXTRA_FLAGS" export CXXFLAGS="$CXXFLAGS $EXTRA_FLAGS" + +# Telegram requires us to set API_ID and API_HASH for some reason but they do not provide a way to receive a pair +# See https://github.com/telegramdesktop/tdesktop/commit/65b2db216033aa08b7bc846df27843e566f08981 and +# https://github.com/telegramdesktop/tdesktop/issues/4717 +# The official API_ID seems to be 2040. +# We're going to use the defaults for now. + gyp \ +-Dapi_id=17349 \ +-Dapi_hash=344583e45741c457fe1862106095a5eb \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake Modified: no-gtk2.patch === --- no-gtk2.patch 2018-12-10 20:05:56 UTC (rev 414479) +++ no-gtk2.patch 2018-12-10 20:09:02 UTC (rev 414480) @@ -1,12 +1,13 @@ -diff -Naur tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2017-12-30 11:13:48.0 +0100 -+++ tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2018-01-17 11:41:49.593275952 +0100 -@@ -253,24 +253,12 @@ +diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp +index f8d74fee1..c9d059fa6 100644 +--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp +@@ -240,24 +240,12 @@ void start() { indicatorLoaded = setupAppIndicator(lib_indicator); } } - if (!gtkLoaded || !indicatorLoaded) { -- if (loadLibrary(lib_indicator, "appindicator", 1)) { +- if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) { - if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { - gtkLoaded = indicatorLoaded = false; - gtkLoaded = setupGtkBase(lib_gtk); Modified: tdesktop.patch === --- tdesktop.patch 2018-12-10 20:05:56 UTC (rev 414479) +++ tdesktop.patch 2018-12-10 20:09:02 UTC (rev 414480) @@ -153,10 +153,10 @@ +flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index e29f348c8..122ff0f5d 100644 +index a757d085f..122ff0f5d 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp -@@ -15,13 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) +@@ -15,14 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC @@ -169,6 +169,7 @@
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Monday, October 1, 2018 @ 06:50:07 Author: svenstaro Revision: 388730 upgpkg: telegram-desktop 1.4.0-2 Modified: telegram-desktop/trunk/CMakeLists.inj telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/tdesktop.patch + CMakeLists.inj |7 - PKGBUILD |6 - tdesktop.patch | 314 --- 3 files changed, 8 insertions(+), 319 deletions(-) Modified: CMakeLists.inj === --- CMakeLists.inj 2018-10-01 06:15:53 UTC (rev 388729) +++ CMakeLists.inj 2018-10-01 06:50:07 UTC (rev 388730) @@ -1,4 +1,3 @@ -# - debian/CMakeLists.inj begin - # The text will be put into the appropriate CMakeLists by the PKGBUILD # Avoid rpath compiler parameter @@ -9,7 +8,11 @@ # lines. include(../../Telegram/gyp/PrecompiledHeader.cmake) add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h) add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) +add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h) +# You can discover new PCHs using this link: +# https://github.com/telegramdesktop/tdesktop/search?q=pch_header_q=pch_header + # vim: ft=cmake -# -- debian/CMakeLists.inj end -- Modified: PKGBUILD === --- PKGBUILD2018-10-01 06:15:53 UTC (rev 388729) +++ PKGBUILD2018-10-01 06:50:07 UTC (rev 388730) @@ -6,7 +6,7 @@ pkgname=telegram-desktop pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -36,8 +36,8 @@ 'SKIP' 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' - '0a2de8fc761e1222f622235c4023f5092179986750f3de53039eca9f4ea43a789f0cf408f2958d5e0dae70b85796d79de018901376344a22f2dcf915f06b6fb9' - 'cd4c6c931d55e5d414e46ea1d9dd4fbcba152d7ac57247162cf33cb74d69f48bed43d735eb6a188cb33eaab0232daea0ec4ae017e18bb05f5a1a1acc83446f91' + 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' + '47c0d1e00401d7899b2ce710c06ceac6caffddbe1a4c85bc407918b43051cba292f6e6131cc0f390a66520e92f0ffa3761f8d973a25986dfe21c54f113062c33' '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') Modified: tdesktop.patch === --- tdesktop.patch 2018-10-01 06:15:53 UTC (rev 388729) +++ tdesktop.patch 2018-10-01 06:50:07 UTC (rev 388730) @@ -8,187 +8,6 @@ -../etc/qt_linux.conf -diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h -index d9a5517bf..050af045e 100644 a/Telegram/SourceFiles/app.h -+++ b/Telegram/SourceFiles/app.h -@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include "base/assertion.h" - #include "data/data_types.h" - #include "data/data_peer.h" - -diff --git a/Telegram/SourceFiles/base/algorithm.h b/Telegram/SourceFiles/base/algorithm.h -index 0369859db..0d389d2fa 100644 a/Telegram/SourceFiles/base/algorithm.h -+++ b/Telegram/SourceFiles/base/algorithm.h -@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #pragma once - -+#include -+#include -+#include -+ - namespace base { - - template -diff --git a/Telegram/SourceFiles/base/concurrent_timer.cpp b/Telegram/SourceFiles/base/concurrent_timer.cpp -index 4f9fb82f8..126dcc000 100644 a/Telegram/SourceFiles/base/concurrent_timer.cpp -+++ b/Telegram/SourceFiles/base/concurrent_timer.cpp -@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include - #include -+#include -+#include - - using namespace base::details; - -diff --git a/Telegram/SourceFiles/base/concurrent_timer.h b/Telegram/SourceFiles/base/concurrent_timer.h -index b279b1d1e..dd8f560e7 100644 a/Telegram/SourceFiles/base/concurrent_timer.h -+++ b/Telegram/SourceFiles/base/concurrent_timer.h -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #include "base/binary_guard.h" -+#include "base/basic_types.h" - #include - #include - #include -diff --git a/Telegram/SourceFiles/base/observer.cpp b/Telegram/SourceFiles/base/observer.cpp -index 1c1245071..1507633ac 100644 a/Telegram/SourceFiles/base/observer.cpp -+++
[arch-commits] Commit in telegram-desktop/trunk (3 files)
Date: Sunday, September 2, 2018 @ 19:12:29 Author: svenstaro Revision: 376079 upgpkg: telegram-desktop 1.3.13-1 Added: telegram-desktop/trunk/401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch telegram-desktop/trunk/46946c73236285649950071632beb3f3e855b2ea.patch Modified: telegram-desktop/trunk/PKGBUILD + 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch | 27 +++ 46946c73236285649950071632beb3f3e855b2ea.patch | 27 +++ PKGBUILD | 12 +++--- 3 files changed, 63 insertions(+), 3 deletions(-) Added: 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch === --- 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch (rev 0) +++ 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch 2018-09-02 19:12:29 UTC (rev 376079) @@ -0,0 +1,27 @@ +From 401e1166f9de4c4a19aba79f9afcd611eaa6e30d Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Fri, 31 Aug 2018 00:28:27 +0300 +Subject: [PATCH] Workaround internal compiler error in GCC + +Closes: #5111 +--- + Telegram/SourceFiles/apiwrap.cpp | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp +index 3301b6f04..c3e3c6f16 100644 +--- a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp +@@ -2390,7 +2390,11 @@ void ApiWrap::requestFileReference( + + request(std::move(data)).done([=](const auto ) { + const auto parsed = Data::GetFileReferences(result); +- for (const auto &[origin, reference] : parsed) { ++ for (const auto : parsed) { ++ // Unpack here the parsed pair by hand to workaround a GCC bug. ++ // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87122 ++ const auto = p.first; ++ const auto = p.second; + const auto documentId = base::get_if( + ); + if (documentId) { Added: 46946c73236285649950071632beb3f3e855b2ea.patch === --- 46946c73236285649950071632beb3f3e855b2ea.patch (rev 0) +++ 46946c73236285649950071632beb3f3e855b2ea.patch 2018-09-02 19:12:29 UTC (rev 376079) @@ -0,0 +1,27 @@ +From 46946c73236285649950071632beb3f3e855b2ea Mon Sep 17 00:00:00 2001 +From: John Preston +Date: Mon, 27 Aug 2018 14:34:18 +0300 +Subject: [PATCH] Use correct SHA1_ functions. + +Fixes #5103. +--- + Telegram/SourceFiles/base/openssl_help.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Telegram/SourceFiles/base/openssl_help.h b/Telegram/SourceFiles/base/openssl_help.h +index 0ad4916be..9d776b3da 100644 +--- a/Telegram/SourceFiles/base/openssl_help.h b/Telegram/SourceFiles/base/openssl_help.h +@@ -388,9 +388,9 @@ template < + inline bytes::vector Sha1(Args &&...args) { + return details::Sha( + SHA_CTX(), +- SHA_Init, +- SHA_Update, +- SHA_Final, ++ SHA1_Init, ++ SHA1_Update, ++ SHA1_Final, + args...); + } + Modified: PKGBUILD === --- PKGBUILD2018-09-02 18:43:18 UTC (rev 376078) +++ PKGBUILD2018-09-02 19:12:29 UTC (rev 376079) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.3.10 -pkgrel=2 +pkgver=1.3.13 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/; @@ -26,6 +26,8 @@ "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" +"46946c73236285649950071632beb3f3e855b2ea.patch" +"401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch" ) sha512sums=('SKIP' 'SKIP' @@ -37,7 +39,9 @@ '2647251940f0d3a2d41ca8a32a592f1ab1e23fe02d3b11d8dc3a54ef34df7c290c9cbf3df76b09970e1cba15c149bc38d49fc824a173d4b21c54edb3c5d5a3da' '00b4307143cf599859d9b9b6d7ac4acbe8b407da55a1e3833921e113dc3aed8c61f2e5f2c1c37e81a261ba4b9e6f40d9bf5f8c90c20dcf0820cfb73852cb091d' '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' - 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') + 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' + 'e441175afe31d875ba9699274e2c0153d594a4e94e4dae7134d2ee170ad4468b93972b47f801197d88cf3350cc6d9ef6243419dcf1e18a12184cff1e5cdb617c' +