Skip to content

Commit

Permalink
net-im/telegram-desktop: update to 4.15.1 release (+)
Browse files Browse the repository at this point in the history
Regenerate necessary patches.
  • Loading branch information
osokin committed Mar 9, 2024
1 parent efcbe2a commit f5d8edb
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 8 deletions.
2 changes: 1 addition & 1 deletion net-im/telegram-desktop/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORTNAME= telegram-desktop
DISTVERSION= 4.15.0
DISTVERSION= 4.15.1
CATEGORIES= net-im
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
DISTNAME= tdesktop-${DISTVERSION}-full
Expand Down
6 changes: 3 additions & 3 deletions net-im/telegram-desktop/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1708302033
SHA256 (tdesktop-4.15.0-full.tar.gz) = 8b0caed85f4876a83c6ece2e4c956589a9548fbca6b951fb99b8d55985fd6112
SIZE (tdesktop-4.15.0-full.tar.gz) = 68286818
TIMESTAMP = 1709916913
SHA256 (tdesktop-4.15.1-full.tar.gz) = 4c61b0b1408827444fedc445d3ab6977ec68975f43a4d9d50ea01e58c117f5c1
SIZE (tdesktop-4.15.1-full.tar.gz) = 69531645
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- Telegram/SourceFiles/platform/linux/integration_linux.cpp.orig 2024-03-08 23:40:11 UTC
+++ Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -27,6 +27,7 @@ namespace Platform {
namespace {

using namespace gi::repository;
+namespace GObject = gi::repository::GObject;

class Application : public Gio::impl::ApplicationImpl {
public:
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig 2024-03-08 21:33:12 UTC
+++ Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -55,6 +55,7 @@ https://github.com/telegramdesktop/tdesktop/blob/maste
namespace {

using namespace gi::repository;
+namespace GObject = gi::repository::GObject;
namespace Gio = gi::repository::Gio;
using namespace Platform;
using Platform::internal::WaylandIntegration;
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp.orig 2024-03-08 22:07:09 UTC
+++ Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
@@ -30,6 +30,7 @@ namespace base::Platform {
namespace {

using namespace gi::repository;
+namespace GObject = gi::repository::GObject;

void PortalShowInFolder(const QString &filepath, Fn<void()> fail) {
XdpOpenURI::OpenURIProxy::new_for_bus(
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- Telegram/lib_base/base/platform/linux/base_linux_dbus_utilities.cpp.orig 2024-03-08 22:01:55 UTC
+++ Telegram/lib_base/base/platform/linux/base_linux_dbus_utilities.cpp
@@ -12,6 +12,7 @@ namespace base::Platform::DBus {
namespace {

using namespace gi::repository;
+namespace GObject = gi::repository::GObject;

gi::result<XdgDBus::DBus> MakeInterface(const GDBusConnection *connection) {
return XdgDBus::DBusProxy::new_sync(
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp.orig 2024-03-08 22:11:02 UTC
+++ Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
@@ -26,6 +26,7 @@ namespace base::Platform {
namespace {

using namespace gi::repository;
+namespace GObject = gi::repository::GObject;

#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
constexpr auto kResetScreenSaverTimeout = 10 * crl::time(1000);
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp.orig 2024-03-08 21:53:47 UTC
+++ Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp
@@ -22,6 +22,7 @@ namespace base::Platform {
namespace {

using namespace gi::repository;
+namespace GObject = gi::repository::GObject;

void SnapDefaultHandler(const QString &protocol) {
Snapcraft::SettingsProxy::new_for_bus(
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- cmake/external/glib/cppgir/tools/genutils.hpp.orig 2023-12-20 18:54:36 UTC
--- cmake/external/glib/cppgir/tools/genutils.hpp.orig 2024-03-06 19:25:51 UTC
+++ cmake/external/glib/cppgir/tools/genutils.hpp
@@ -4,6 +4,7 @@
#include "common.hpp"
Expand All @@ -7,4 +7,4 @@
+#include <sstream>
#include <regex>
#include <set>
#include <string>
#include <sstream>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- cmake/external/qt/CMakeLists.txt.orig 2023-09-13 17:06:28 UTC
--- cmake/external/qt/CMakeLists.txt.orig 2024-03-08 11:07:18 UTC
+++ cmake/external/qt/CMakeLists.txt
@@ -16,6 +16,8 @@ if (DESKTOP_APP_USE_PACKAGED)
Qt::CorePrivate
Expand Down Expand Up @@ -29,7 +29,7 @@
${qt_loc}/include/QtWidgets/${qt_version}/QtWidgets
)

@@ -92,6 +97,12 @@ set(common_qt_libs
@@ -97,6 +102,12 @@ set(common_qt_libs
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Gui
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core
)
Expand Down

0 comments on commit f5d8edb

Please sign in to comment.