diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | always_pin_without_notify.patch | 28 | ||||
| -rw-r--r-- | always_send_as_photo_or_album.patch | 38 |
4 files changed, 52 insertions, 39 deletions
@@ -1,6 +1,6 @@ pkgbase = telegram-desktop-udf-patched pkgdesc = Telegram Desktop client with several personal patches - pkgver = 2.4.4 + pkgver = 2.4.7 pkgrel = 1 url = https://desktop.telegram.org/ arch = x86_64 @@ -27,21 +27,23 @@ pkgbase = telegram-desktop-udf-patched optdepends = ttf-opensans: default Open Sans font family provides = telegram-desktop conflicts = telegram-desktop - source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.4.4/tdesktop-2.4.4-full.tar.gz + source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.4.7/tdesktop-2.4.7-full.tar.gz source = Use-tg_owt-webrtc-fork.patch source = Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch + source = Add_external_jpeg.patch::https://github.com/desktop-app/cmake_helpers/commit/ed9fa2e798a1f175840479417d760c51181959b8.patch source = always_delete_for_everyone.patch source = always_clear_history_for_everyone.patch source = always_pin_without_notify.patch source = always_send_as_photo_or_album.patch source = force_gtk_integration.patch - sha512sums = db212cc9aef7de21e4e4fa30fdabb88224cda5ab164935de118cab507af730f5773602f8cd7acd83a53daa5bf35fe28fdb18fb192c01e2e484069a9ac69c7c57 + sha512sums = 712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993 sha512sums = 071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43 sha512sums = b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6 + sha512sums = 3891f191f720e77d463365d1415ff8c20866d0d898909dcbe757d334c582c38975d47c33e82ae54e3cfbce7f46c257e9f2eb76b673a76c37446ecf1e9a9c681b sha512sums = e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015 sha512sums = 4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3 - sha512sums = b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30 - sha512sums = cab2d1d07275dcb2ee98e2642c8f90ee241e5dae43b88286a9617f5baf9bcc1a7c80a28fb6e812a92a4a039bb773b3069fbba38c5f5049da29e9993e4e4241e3 + sha512sums = fb69ecf4de4c57f4f226be6e704ceb811916715c23a5908d8c2d21970676df64c86b58123429b55c43dafea89f92da33119fa71988df6912f8fcd07ba2c8579c + sha512sums = fbf1c8311ead2a63471fcf5a17156ca4b5d1b582c7cd838fd97fafeca79146670d0a73805a144a9a0ab12a33ec5a0ec4c5cbeb07c6a9e3878fe293edd428b91c sha512sums = 17faeff3ee56edd63be658c3730dbbed26437cb9bf0a9890d16cae26fd500aaab738b66de57b573903a5bd727dafe65105e151b08d7a6d8c426c148e754a7114 pkgname = telegram-desktop-udf-patched @@ -10,7 +10,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop-udf-patched -pkgver=2.4.4 +pkgver=2.4.7 pkgrel=1 pkgdesc='Telegram Desktop client with several personal patches' arch=('x86_64') @@ -29,6 +29,7 @@ source=( "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz" "Use-tg_owt-webrtc-fork.patch" "Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch" + "Add_external_jpeg.patch::https://github.com/desktop-app/cmake_helpers/commit/ed9fa2e798a1f175840479417d760c51181959b8.patch" # Custom patches "always_delete_for_everyone.patch" "always_clear_history_for_everyone.patch" @@ -37,24 +38,26 @@ source=( "force_gtk_integration.patch" ) sha512sums=( - 'db212cc9aef7de21e4e4fa30fdabb88224cda5ab164935de118cab507af730f5773602f8cd7acd83a53daa5bf35fe28fdb18fb192c01e2e484069a9ac69c7c57' + '712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993' '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43' 'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6' + '3891f191f720e77d463365d1415ff8c20866d0d898909dcbe757d334c582c38975d47c33e82ae54e3cfbce7f46c257e9f2eb76b673a76c37446ecf1e9a9c681b' # Custom patches 'e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015' '4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3' - 'b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30' - 'cab2d1d07275dcb2ee98e2642c8f90ee241e5dae43b88286a9617f5baf9bcc1a7c80a28fb6e812a92a4a039bb773b3069fbba38c5f5049da29e9993e4e4241e3' + 'fb69ecf4de4c57f4f226be6e704ceb811916715c23a5908d8c2d21970676df64c86b58123429b55c43dafea89f92da33119fa71988df6912f8fcd07ba2c8579c' + 'fbf1c8311ead2a63471fcf5a17156ca4b5d1b582c7cd838fd97fafeca79146670d0a73805a144a9a0ab12a33ec5a0ec4c5cbeb07c6a9e3878fe293edd428b91c' '17faeff3ee56edd63be658c3730dbbed26437cb9bf0a9890d16cae26fd500aaab738b66de57b573903a5bd727dafe65105e151b08d7a6d8c426c148e754a7114' ) prepare() { cd tdesktop-$pkgver-full/cmake + patch -R -Np1 -i ${srcdir}/Add_external_jpeg.patch patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt - cd .. + cd "$srcdir/tdesktop-$pkgver-full" # custom patches patch -Np1 -i "$srcdir/always_delete_for_everyone.patch" patch -Np1 -i "$srcdir/always_clear_history_for_everyone.patch" diff --git a/always_pin_without_notify.patch b/always_pin_without_notify.patch index d99abd1795c2..fc7b39eeecc5 100644 --- a/always_pin_without_notify.patch +++ b/always_pin_without_notify.patch @@ -1,15 +1,21 @@ -Description: Deselects the "Notify all members" checkbox by default - diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp -index c80aea98b..8ae53cddc 100644 +index 9623410..dc8f52c 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp -@@ -401,7 +401,7 @@ void PinMessageBox::prepare() { - addButton(tr::lng_cancel(), [this] { closeBox(); }); - - if (_peer->isChat() || _peer->isMegagroup()) { -- _notify.create(this, tr::lng_pinned_notify(tr::now), true, st::defaultBoxCheckbox); -+ _notify.create(this, tr::lng_pinned_notify(tr::now), false, st::defaultBoxCheckbox); +@@ -481,14 +481,14 @@ void PinMessageBox::prepare() { + tr::now, + lt_user, + _peer->shortName()), +- false, ++ true, + st::defaultBoxCheckbox); + _checkbox = _pinForPeer; + } else if (!_pinningOld && (_peer->isChat() || _peer->isMegagroup())) { + _notify.create( + this, + tr::lng_pinned_notify(tr::now), +- true, ++ false, + st::defaultBoxCheckbox); + _checkbox = _notify; } - - auto height = st::boxPadding.top() + _text->height() + st::boxPadding.bottom(); diff --git a/always_send_as_photo_or_album.patch b/always_send_as_photo_or_album.patch index ce55615f9b54..24bfaf8ed150 100644 --- a/always_send_as_photo_or_album.patch +++ b/always_send_as_photo_or_album.patch @@ -1,23 +1,25 @@ -Description: Disables loading the previous way media was sent, so it always selects either -photo or album by default. - diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp +index e7d1f80..ffbb2ab 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp -@@ -1947,14 +1947,6 @@ - ? SendFilesWay::Album - : SendFilesWay::Photos; - } -- const auto way = Core::App().settings().sendFilesWay(); -- if (way == SendFilesWay::Files) { -- return way; -- } else if (way == SendFilesWay::Album) { -- return _list.albumIsPossible -- ? SendFilesWay::Album -- : SendFilesWay::Photos; +@@ -424,17 +424,9 @@ void SendFilesBox::openDialogToAddFileToAlbum() { + + void SendFilesBox::initSendWay() { + _sendWay = [&] { +- auto result = Core::App().settings().sendFilesWay(); +- if (_sendLimit == SendLimit::One) { +- result.setGroupFiles(true); +- return result; +- } else if (_list.overrideSendImagesAsPhotos == false) { +- result.setSendImagesAsPhotos(false); +- return result; +- } else if (_list.overrideSendImagesAsPhotos == true) { +- result.setSendImagesAsPhotos(true); +- return result; - } -- return (_list.albumIsPossible && !_albumPhotosCount) -+ return _list.albumIsPossible - ? SendFilesWay::Album - : SendFilesWay::Photos; ++ auto result = SendFilesWay(); ++ result.setGroupFiles(true); ++ result.setSendImagesAsPhotos(true); + return result; }(); + _sendWay.changes( |