Update to tdesktop 4.4.0

No new fixes this time, just offset churn.
This commit is contained in:
kn 2022-12-08 20:23:10 +00:00
parent 455da69de2
commit 794e9f2606
4 changed files with 9 additions and 9 deletions

View File

@ -5,7 +5,7 @@ NOT_FOR_ARCHS = ${BE_ARCHS} i386
COMMENT = Telegram Desktop messenger COMMENT = Telegram Desktop messenger
PORTROACH = limit:-full$$ PORTROACH = limit:-full$$
V = 4.3.4 V = 4.4.0
DISTNAME = tdesktop-${V}-full DISTNAME = tdesktop-${V}-full
PKGNAME = ${DISTNAME:-full=} PKGNAME = ${DISTNAME:-full=}
CATEGORIES = net CATEGORIES = net

View File

@ -1,4 +1,4 @@
SHA256 (tdesktop/cmake-fix-cld3-protobuf-246.patch) = daq13+7bPsFAHF+1moqtJuRKVfmn7K57incP1ntWC9o= SHA256 (tdesktop/cmake-fix-cld3-protobuf-246.patch) = daq13+7bPsFAHF+1moqtJuRKVfmn7K57incP1ntWC9o=
SHA256 (tdesktop/tdesktop-4.3.4-full.tar.gz) = qhHFL3gSxumlzPLjox1Sah21ViwbvLVxqnDWgcqQm5M= SHA256 (tdesktop/tdesktop-4.4.0-full.tar.gz) = 6DhnmXjNMrbq/yzDcmSaBT1S6eh4NGvxPCU5ce0a2tU=
SIZE (tdesktop/cmake-fix-cld3-protobuf-246.patch) = 942 SIZE (tdesktop/cmake-fix-cld3-protobuf-246.patch) = 942
SIZE (tdesktop/tdesktop-4.3.4-full.tar.gz) = 50030732 SIZE (tdesktop/tdesktop-4.4.0-full.tar.gz) = 50076740

View File

@ -3,7 +3,7 @@ XXX bring glibmm268's Glib::ustring and range-v3 together
Index: Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp Index: Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
--- Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp.orig --- Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp.orig
+++ Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -72,12 +72,17 @@ std::unique_ptr<base::Platform::DBus::ServiceWatcher> @@ -75,12 +75,17 @@ std::unique_ptr<base::Platform::DBus::ServiceWatcher>
try { try {
const auto connection = Gio::DBus::Connection::get_sync( const auto connection = Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::SESSION); Gio::DBus::BusType::SESSION);
@ -23,7 +23,7 @@ Index: Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
} catch (...) { } catch (...) {
// avoid service restart loop in sandboxed environments // avoid service restart loop in sandboxed environments
return true; return true;
@@ -126,7 +131,7 @@ void StartServiceAsync(Fn<void()> callback) { @@ -129,7 +134,7 @@ void StartServiceAsync(Fn<void()> callback) {
}; };
const auto errorName = const auto errorName =
@ -32,7 +32,7 @@ Index: Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
if (!ranges::contains(NotSupportedErrors, errorName)) { if (!ranges::contains(NotSupportedErrors, errorName)) {
throw e; throw e;
@@ -148,6 +153,11 @@ bool GetServiceRegistered() { @@ -151,6 +156,11 @@ bool GetServiceRegistered() {
try { try {
const auto connection = Gio::DBus::Connection::get_sync( const auto connection = Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::SESSION); Gio::DBus::BusType::SESSION);
@ -44,7 +44,7 @@ Index: Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
const auto hasOwner = [&] { const auto hasOwner = [&] {
try { try {
@@ -162,8 +172,8 @@ bool GetServiceRegistered() { @@ -165,8 +175,8 @@ bool GetServiceRegistered() {
static const auto activatable = [&] { static const auto activatable = [&] {
try { try {
return ranges::contains( return ranges::contains(

View File

@ -6,7 +6,7 @@ https://github.com/telegramdesktop/tdesktop/pull/25527
Index: Telegram/SourceFiles/platform/linux/specific_linux.cpp Index: Telegram/SourceFiles/platform/linux/specific_linux.cpp
--- Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig --- Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig
+++ Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -243,12 +243,16 @@ void LaunchGApplication() { @@ -244,12 +244,16 @@ void LaunchGApplication() {
const auto activatableNames = [&] { const auto activatableNames = [&] {
try { try {
if (connection) { if (connection) {
@ -25,7 +25,7 @@ Index: Telegram/SourceFiles/platform/linux/specific_linux.cpp
}(); }();
const auto freedesktopNotifications = [&] { const auto freedesktopNotifications = [&] {
@@ -346,9 +350,10 @@ void LaunchGApplication() { @@ -357,9 +361,10 @@ void LaunchGApplication() {
using Window::Notifications::Manager; using Window::Notifications::Manager;
using NotificationId = Manager::NotificationId; using NotificationId = Manager::NotificationId;