diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | libtgvoip.patch | 7 | ||||
| -rw-r--r-- | tdesktop.patch | 6 |
4 files changed, 18 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = telegram-desktop-systemqt-notoemoji pkgdesc = Experimental build of Telegram Desktop (using system Qt, emojis replaced with those from Noto Color Emoji) - pkgver = 1.1.10 + pkgver = 1.1.11 pkgrel = 1 url = https://desktop.telegram.org/ install = telegram-desktop.install @@ -29,10 +29,10 @@ pkgbase = telegram-desktop-systemqt-notoemoji optdepends = libappindicator-gtk2: AppIndicator tray icon provides = telegram-desktop conflicts = telegram-desktop - source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.1.10 + source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.1.11 source = GSL::git+https://github.com/Microsoft/GSL.git#commit=16a6a41690325433976d843e13ec676d6f9ab091 source = variant::git+https://github.com/mapbox/variant#tag=v1.1.3 - source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git#commit=ccf715b626246990bf57068102bc04014f4ac385 + source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git#commit=757a5d8ec31aadcf387ac3cb135256152c18de1c source = telegramdesktop.desktop source = tg.protocol source = CMakeLists.inj @@ -50,8 +50,8 @@ pkgbase = telegram-desktop-systemqt-notoemoji sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17 sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82 - sha256sums = 0aa02c2dc2cb4a32519de43a9f188d924b9a3458fdd941e733a17d54ec3db8ed - sha256sums = 3d72e09b9054ff75785a85c9f24ee82d48a2b9bf0ce8515156717b20157a45b3 + sha256sums = 6d54c8b51b2224c75c15d1e147855a6f22b96848ca3413330882ca6243dd05cb + sha256sums = 640ef297f5977de78dab17789390e628b8f7a8a495529c24da8a43693f3fae23 sha256sums = fccd084805b4621e3614d2a0584bb78a0ad44f502a79b4a4534e901881677555 sha256sums = 668a2371c3dae8e95187f0c9f8fec9b0e535157482747d2f9c6034c6b9eefa16 sha256sums = d84537063ccf42904ab35ea2624263419f7d17671d24b17d02d02020d9af8be2 @@ -7,7 +7,7 @@ _emoji_res_commit="db4c66e311a160b3f849d6c76890932c50701bf8" pkgname=telegram-desktop-systemqt-notoemoji -pkgver=1.1.10 +pkgver=1.1.11 pkgrel=1 pkgdesc='Experimental build of Telegram Desktop (using system Qt, emojis replaced with those from Noto Color Emoji)' arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ provides=('telegram-desktop') install="telegram-desktop.install" _variant_ver="1.1.3" _GSL_commit="16a6a41690325433976d843e13ec676d6f9ab091" -_libtgvoip_commit="ccf715b626246990bf57068102bc04014f4ac385" +_libtgvoip_commit="757a5d8ec31aadcf387ac3cb135256152c18de1c" source=( "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver" "GSL::git+https://github.com/Microsoft/GSL.git#commit=${_GSL_commit}" @@ -48,8 +48,8 @@ sha256sums=('SKIP' '41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17' 'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb' '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82' - '0aa02c2dc2cb4a32519de43a9f188d924b9a3458fdd941e733a17d54ec3db8ed' - '3d72e09b9054ff75785a85c9f24ee82d48a2b9bf0ce8515156717b20157a45b3' + '6d54c8b51b2224c75c15d1e147855a6f22b96848ca3413330882ca6243dd05cb' + '640ef297f5977de78dab17789390e628b8f7a8a495529c24da8a43693f3fae23' 'fccd084805b4621e3614d2a0584bb78a0ad44f502a79b4a4534e901881677555' '668a2371c3dae8e95187f0c9f8fec9b0e535157482747d2f9c6034c6b9eefa16' 'd84537063ccf42904ab35ea2624263419f7d17671d24b17d02d02020d9af8be2' diff --git a/libtgvoip.patch b/libtgvoip.patch index afb96146ef40..91c3740bfcc9 100644 --- a/libtgvoip.patch +++ b/libtgvoip.patch @@ -2,7 +2,7 @@ diff --git a/libtgvoip.gyp b/libtgvoip.gyp index 58dc6bf..98a09d7 100644 --- a/libtgvoip.gyp +++ b/libtgvoip.gyp -@@ -13,7 +13,7 @@ +@@ -13,11 +13,12 @@ 'variables': { 'tgvoip_src_loc': '.', 'official_build_target%': '', @@ -11,3 +11,8 @@ index 58dc6bf..98a09d7 100644 }, 'include_dirs': [ '<(tgvoip_src_loc)/webrtc_dsp', + '<(linux_path_opus_include)', ++ '/usr/include/openssl-1.0' + ], + 'direct_dependent_settings': { + 'include_dirs': [ diff --git a/tdesktop.patch b/tdesktop.patch index 3cc78e087422..be5edec2e756 100644 --- a/tdesktop.patch +++ b/tdesktop.patch @@ -262,7 +262,7 @@ index 80160d16..8789e874 100644 '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 81c13a18..56066400 100644 +index 81c13a18..99af0edb 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -27,25 +27,21 @@ @@ -492,10 +492,10 @@ index 2c464928..b505a67d 100644 ], 'configurations': { diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index bfc18fdc..5d210e9f 100644 +index fbe63ec5..475210b3 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -578,14 +578,7 @@ +@@ -580,14 +580,7 @@ <(src_loc)/structs.cpp <(src_loc)/structs.h |