haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-09-08 22:31:02 +10:00
parent 3312566687
commit e344c648db
4 changed files with 142 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
net-im/telegram-desktop/patches/telegram_desktop-1.8.2-libtgvoip.patchset → net-im/telegram-desktop/patches/telegram_desktop-1.8.3-libtgvoip.patchset
View File

0
net-im/telegram-desktop/patches/telegram_desktop-1.8.2-systemqt.patch → net-im/telegram-desktop/patches/telegram_desktop-1.8.3-systemqt.patch
View File

148
net-im/telegram-desktop/patches/telegram_desktop-1.8.2.patchset → net-im/telegram-desktop/patches/telegram_desktop-1.8.3.patchset
View File

@@ -1,4 +1,4 @@
From f519c3f4892c3de9b8fb54179fb8fa19566ca159 Mon Sep 17 00:00:00 2001 From 64a7e0393fa1d982a1c22c95e642651ad667c16f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 10 Aug 2019 12:08:14 +1000 Date: Sat, 10 Aug 2019 12:08:14 +1000
Subject: Add Haiku support Subject: Add Haiku support
@@ -185,7 +185,7 @@ index b5a6d7f..8223fad 100644
} // namespace Core } // namespace Core
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index bff6dcd..64406eb 100644 index ad19757..246e121 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp --- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -503,6 +503,8 @@ bool ParseCommonMap( @@ -503,6 +503,8 @@ bool ParseCommonMap(
@@ -2722,10 +2722,10 @@ index d9147d6..16c9d3f 100644
'variables': { 'variables': {
'qrc_files': [ 'qrc_files': [
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index 40b147d..6a9d8a9 100644 index c247030..b741ff7 100644
--- a/Telegram/gyp/telegram_sources.txt --- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt
@@ -601,6 +601,20 @@ @@ -615,6 +615,20 @@
<(src_loc)/platform/linux/notifications_manager_linux.h <(src_loc)/platform/linux/notifications_manager_linux.h
<(src_loc)/platform/linux/specific_linux.cpp <(src_loc)/platform/linux/specific_linux.cpp
<(src_loc)/platform/linux/specific_linux.h <(src_loc)/platform/linux/specific_linux.h
@@ -2765,10 +2765,10 @@ index bd46332..d85a403 100644
'include_dirs': [ 'include_dirs': [
'<(libs_loc)/openssl/include' '<(libs_loc)/openssl/include'
-- --
2.21.0 2.23.0
From afe6392f70794a86a73e0b469201487022141592 Mon Sep 17 00:00:00 2001 From 976c52d85db9e4e41a07cd79a3c3c522bdb1721d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 10 Aug 2019 19:46:28 +1000 Date: Sat, 10 Aug 2019 19:46:28 +1000
Subject: Fix build Subject: Fix build
@@ -2788,5 +2788,139 @@ index 4a722b8..e987503 100644
/* Debian maintainer: this function is taken from qfiledialog.cpp */ /* Debian maintainer: this function is taken from qfiledialog.cpp */
-- --
2.21.0 2.23.0
From aa5f580cd6369eb29bb00780fd5957a732d4c1a8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 8 Sep 2019 22:27:11 +1000
Subject: Fix path for range-v3 submodule
diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp
index b9ada53..a9a5fa8 100644
--- a/Telegram/gyp/lib_ffmpeg.gyp
+++ b/Telegram/gyp/lib_ffmpeg.gyp
@@ -37,7 +37,7 @@
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
'<(libs_loc)/ffmpeg',
- '<(libs_loc)/range-v3/include',
+ '<(submodules_loc)/range/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
diff --git a/Telegram/gyp/lib_mtproto.gyp b/Telegram/gyp/lib_mtproto.gyp
index b592cb7..4a401d9 100644
--- a/Telegram/gyp/lib_mtproto.gyp
+++ b/Telegram/gyp/lib_mtproto.gyp
@@ -47,7 +47,7 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
- '<(libs_loc)/range-v3/include',
+ '<(submodules_loc)/range/include',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
diff --git a/Telegram/gyp/tests/common_test.gypi b/Telegram/gyp/tests/common_test.gypi
index ab9ed3c..e549088 100644
--- a/Telegram/gyp/tests/common_test.gypi
+++ b/Telegram/gyp/tests/common_test.gypi
@@ -15,7 +15,7 @@
'<(submodules_loc)/variant/include',
'<(submodules_loc)/Catch/include',
'<(submodules_loc)/crl/src',
- '<(libs_loc)/range-v3/include',
+ '<(submodules_loc)/range/include',
],
'sources': [
'<(src_loc)/base/tests_main.cpp',
--
2.23.0
From 669bd6648ab763f34ed1e3763cdb041b9d93c2c7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 8 Sep 2019 22:28:17 +1000
Subject: Fix for notification api changes
diff --git a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp
index 9b3a71a..fd96efa 100644
--- a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp
+++ b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp
@@ -185,27 +185,32 @@ void Manager::clearNotification(PeerId peerId, MsgId msgId) {
Manager::~Manager() = default;
-void Manager::doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, \
- const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) {
- _private->showNotification(peer, msgId, title, subtitle, msg, hideNameAndPhoto, hideReplyButton);
+void Manager::doShowNativeNotification(
+ not_null<PeerData*> peer,
+ MsgId msgId,
+ const QString &title,
+ const QString &subtitle,
+ const QString &msg,
+ bool hideNameAndPhoto,
+ bool hideReplyButton) {
+ _private->showNotification(
+ peer,
+ msgId,
+ title,
+ subtitle,
+ msg,
+ hideNameAndPhoto,
+ hideReplyButton);
}
void Manager::doClearAllFast() {
_private->clearAll();
}
-void Manager::doClearFromHistory(History *history) {
+void Manager::doClearFromHistory(not_null<History*> history) {
_private->clearFromHistory(history);
}
-void Manager::onBeforeNotificationActivated(PeerId peerId, MsgId msgId) {
- _private->beforeNotificationActivated(peerId, msgId);
-}
-
-void Manager::onAfterNotificationActivated(PeerId peerId, MsgId msgId) {
- _private->afterNotificationActivated(peerId, msgId);
-}
-
bool Manager::hasActionsSupport() const {
return _private->hasActionsSupport();
}
diff --git a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
index 25c8e26..d905787 100644
--- a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
+++ b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
@@ -75,12 +75,16 @@ public:
~Manager();
protected:
- void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, \
- const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
+ void doShowNativeNotification(
+ not_null<PeerData*> peer,
+ MsgId msgId,
+ const QString &title,
+ const QString &subtitle,
+ const QString &msg,
+ bool hideNameAndPhoto,
+ bool hideReplyButton) override;
void doClearAllFast() override;
- void doClearFromHistory(History *history) override;
- void onBeforeNotificationActivated(PeerId peerId, MsgId msgId) override;
- void onAfterNotificationActivated(PeerId peerId, MsgId msgId) override;
+ void doClearFromHistory(not_null<History*> history) override;
bool hasActionsSupport() const;
--
2.23.0

2
net-im/telegram-desktop/telegram_desktop-1.8.2.recipe → net-im/telegram-desktop/telegram_desktop-1.8.3.recipe
View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2019 Telegram"
LICENSE="GNU GPL v3" LICENSE="GNU GPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="bbacd3aa6ae5f78321346e9bff0b202e8aa64fccafcb06e5e2777c2f0cd908c6" CHECKSUM_SHA256="09ed75681583a509636ae3fc185fcb5e29ae6a2f6bf06082420833e25829e09d"
SOURCE_FILENAME="tdesktop-$portVersion.tar.gz" SOURCE_FILENAME="tdesktop-$portVersion.tar.gz"
SOURCE_DIR="tdesktop-$portVersion" SOURCE_DIR="tdesktop-$portVersion"
srcGitRev_2="d4a0f719ffd8d29e88474f67abc9fc862661c3b9" srcGitRev_2="d4a0f719ffd8d29e88474f67abc9fc862661c3b9"