haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-05-10 16:16:42 +10:00
parent 9fd7284ae5
commit 21fdd591d9
4 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
net-im/telegram-desktop/patches/telegram_desktop-1.6.7-libtgvoip.patchset → net-im/telegram-desktop/patches/telegram_desktop-1.7.0-libtgvoip.patchset
View File

0
net-im/telegram-desktop/patches/telegram_desktop-1.6.7-systemqt.patch → net-im/telegram-desktop/patches/telegram_desktop-1.7.0-systemqt.patch
View File

68
net-im/telegram-desktop/patches/telegram_desktop-1.6.7.patchset → net-im/telegram-desktop/patches/telegram_desktop-1.7.0.patchset
View File

@@ -1,6 +1,6 @@
From 052e0947f4a9e1f27667dfdf2523eae17def0dbf Mon Sep 17 00:00:00 2001
From 07c1320bd65a97c888d695a15bbb94ffa66e0b19 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 15 Apr 2019 20:31:29 +1000
Date: Fri, 10 May 2019 14:06:04 +1000
Subject: Add Haiku support
@@ -155,7 +155,7 @@ index a7a150d..d95a157 100644
auto box = Box<EditAdminBox>(
channel,
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index faf45cd..ea4691f 100644
index 1b63208..41a1017 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -5,6 +5,7 @@ the official desktop application for the Telegram messaging service.
@@ -178,7 +178,7 @@ index faf45cd..ea4691f 100644
namespace Core {
namespace {
@@ -230,6 +236,10 @@ int Launcher::exec() {
@@ -266,6 +272,10 @@ int Launcher::exec() {
// I don't know why path is not in QT_PLUGIN_PATH by default
QCoreApplication::addLibraryPath("/usr/lib/qt/plugins");
@@ -189,7 +189,7 @@ index faf45cd..ea4691f 100644
// without this Telegram doesn't start on Ubuntu 17.04 due GTK errors
setenv("QT_STYLE_OVERRIDE", "qwerty", false);
// Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943
@@ -331,6 +341,9 @@ void Launcher::prepareSettings() {
@@ -367,6 +377,9 @@ void Launcher::prepareSettings() {
case dbipMacOld:
gPlatformString = qsl("MacOSold");
break;
@@ -199,8 +199,8 @@ index faf45cd..ea4691f 100644
case dbipLinux64:
gPlatformString = qsl("Linux64bit");
break;
@@ -447,7 +460,16 @@ int Launcher::executeApplication() {
Sandbox sandbox(this, _argc, _argv);
@@ -484,7 +497,16 @@ int Launcher::executeApplication() {
Sandbox sandbox(this, arguments.count(), arguments.values());
MainQueueProcessor processor;
base::ConcurrentTimerEnvironment environment;
+#ifdef __HAIKU__
@@ -251,7 +251,7 @@ index 4626702..2ef702b 100644
enum DBIPeerReportSpamStatus {
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index c2f0b70..36520a3 100644
index 65caf6a..e20356e 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -226,7 +226,8 @@ Image ParseMaxImage(
@@ -285,10 +285,10 @@ index c2f0b70..36520a3 100644
const auto peerId = (!data.is_out()
&& data.has_from_id()
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index e937538..b45f493 100644
index d7b3bbd..a6c8ec3 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -741,7 +741,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
@@ -742,7 +742,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
Expects(_userpicsProcess != nullptr);
result.match([&](const auto &data) {
@@ -298,7 +298,7 @@ index e937538..b45f493 100644
_userpicsProcess->lastSlice = true;
}
loadUserpicsFiles(Data::ParseUserpicsSlice(
@@ -1278,7 +1279,8 @@ void ApiWrap::requestMessagesSlice() {
@@ -1280,7 +1281,8 @@ void ApiWrap::requestMessagesSlice() {
result.match([&](const MTPDmessages_messagesNotModified &data) {
error("Unexpected messagesNotModified received.");
}, [&](const auto &data) {
@@ -309,7 +309,7 @@ index e937538..b45f493 100644
}
loadMessagesFiles(Data::ParseMessagesSlice(
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 84c9af0..5e343c6 100644
index 3778e69..98e7ecc 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> launcher) {
@@ -322,10 +322,10 @@ index 84c9af0..5e343c6 100644
if (!cWorkingDir().isEmpty()) {
// This value must come from TelegramForcePortable
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index a74fa6d..26959b5 100644
index 0ac3579..14dbbc7 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -99,6 +99,7 @@ void EnumeratePlaybackDevices() {
@@ -100,6 +100,7 @@ void EnumeratePlaybackDevices() {
void EnumerateCaptureDevices() {
auto deviceNames = QStringList();
auto devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER);
@@ -333,7 +333,7 @@ index a74fa6d..26959b5 100644
Assert(devices != nullptr);
while (*devices != 0) {
auto deviceName8Bit = QByteArray(devices);
@@ -107,7 +108,7 @@ void EnumerateCaptureDevices() {
@@ -108,7 +109,7 @@ void EnumerateCaptureDevices() {
devices += deviceName8Bit.size() + 1;
}
LOG(("Audio Capture Devices: %1").arg(deviceNames.join(';')));
@@ -780,7 +780,7 @@ index 0000000..54073f5
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
new file mode 100644
index 0000000..af88932
index 0000000..ae1a9d2
--- /dev/null
+++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
@@ -0,0 +1,128 @@
@@ -845,8 +845,8 @@ index 0000000..af88932
+
+ trayIcon->setIcon(icon);
+ trayIcon->setToolTip(str_const_toString(AppName));
+ connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
+ connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(showFromTray()));
+ attachToTrayIcon(trayIcon);
+ App::wnd()->updateTrayMenu();
+ }
+ updateIconCounters();
@@ -2135,7 +2135,7 @@ index 9c697fc..36ddf56 100644
#include <rpl/rpl.h>
#include <string>
diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp
index c01dcc8..bca6501 100644
index dbe104f..86ef116 100644
--- a/Telegram/SourceFiles/settings.cpp
+++ b/Telegram/SourceFiles/settings.cpp
@@ -73,6 +73,8 @@ DBIPlatform gPlatform = dbipWindows;
@@ -2194,7 +2194,7 @@ index 7f5c191..649255c 100644
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftello(stream)
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index 07193cf..e9244d0 100644
index b5263e6..a565cd7 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -61,6 +61,7 @@
@@ -2621,10 +2621,10 @@ index d9147d6..16c9d3f 100644
'variables': {
'qrc_files': [
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index f7bd4ee..a650ce0 100644
index 3d20ee0..2109899 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -564,6 +564,18 @@
@@ -568,6 +568,18 @@
<(src_loc)/platform/linux/notifications_manager_linux.h
<(src_loc)/platform/linux/specific_linux.cpp
<(src_loc)/platform/linux/specific_linux.h
@@ -2664,29 +2664,3 @@ index 622462e..e3ba800 100644
--
2.21.0
From fb43d97275c97a6215165bb70f9a1869005b9a91 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 9 May 2019 16:01:42 +1000
Subject: Fix window activation by trayicon click
diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
index af88932..62aa0fe 100644
--- a/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
+++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp
@@ -58,9 +58,9 @@ void MainWindow::psSetupTrayIcon() {
auto icon = QIcon(App::pixmapFromImageInPlace(Core::App().logoNoMargin()));
trayIcon->setIcon(icon);
- trayIcon->setToolTip(str_const_toString(AppName));
- connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
+ trayIcon->setToolTip(str_const_toString(AppName));
connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(showFromTray()));
+ attachToTrayIcon(trayIcon);
App::wnd()->updateTrayMenu();
}
updateIconCounters();
--
2.21.0

4
net-im/telegram-desktop/telegram_desktop-1.6.7.recipe → net-im/telegram-desktop/telegram_desktop-1.7.0.recipe
View File

@@ -3,9 +3,9 @@ DESCRIPTION="Unofficial build of the original Telegram client for Haiku."
HOMEPAGE="https://www.telegram.org/"
COPYRIGHT="2013-2019 Telegram"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="77f4cf6507d1ebc26eaef472aa4817cc57a77c5e3065f6b2afa294530f0633a1"
CHECKSUM_SHA256="3be1f6979da9dd0061f27ad5082f96633a4dfde078b1406554b13d5e9674a8bb"
SOURCE_FILENAME="tdesktop-$portVersion.tar.gz"
SOURCE_DIR="tdesktop-$portVersion"
srcGitRev_2="e7010506210fbb3a6704d7ac1276b3334f9ab6c9"