mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Telegram: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -1,5 +1,5 @@
|
||||
|
||||
resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
|
||||
resource app_flags B_MULTIPLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
@@ -16,20 +16,19 @@ resource app_version {
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource vector_icon {
|
||||
$"6E6369660604005A0500020106033D93E83F25EBBEE3073D47E348E5CA47621C"
|
||||
$"00C0E5FFC30698FFFF055CC805F102000602BA6C443B6D6F3A833D398D6D4BD8"
|
||||
$"904DC08F00888A85FFB0B2AE05C4070207375FB843CE80445764584E54CF55C9"
|
||||
$"897460D3F9CA8775646E6873666B69656B6A6A5F6E3E773F773C77406FC039D2"
|
||||
$"8E346D0204B454C190B454C991B454B98FC2D2B312BAD1B312CAD3B312D150C1"
|
||||
$"90D150B98FD150C991C2D2D00ECAD3D00EBAD1D00E0A08BD13B904D0EEBB14BF"
|
||||
$"76C965BC40C6D5B582CA40B954C275BCD4C187BAF4BE820A03BB01BE6FD12FBB"
|
||||
$"02BD2EB9250A03BBFEC63ABF76C93BD09BBB160A03D0C0BB40B971C27CB5A4CA"
|
||||
$"110A03BAF4BE68BCDFC17AD0D9BB1D090A000100023EE9780000000000003EA3"
|
||||
$"FE41B2B14532B50A010101023F28320000000000003F1EC9C24BDB36864D0A02"
|
||||
$"0101023EEFE40000000000003EE67BB99B69420C9F0A030102023F5FC2000000"
|
||||
$"0000003F3403C2809BBB8D630A010102123F5FC20000000000003F3403C2809B"
|
||||
$"BB8D6301178522040A030103023F5FC20000000000003F3403C2809BBB8D630A"
|
||||
$"040104023F5FC20000000000003F3403C2809BBB8D630A030105023F5FC20000"
|
||||
$"000000003F3403C2809BBB8D630A050106023F5FC20000000000003F3403C280"
|
||||
$"9BBB8D63"
|
||||
$"6E6369660604005A0500020106023F2D01ABB6552BBE233F33AF499EC5487829"
|
||||
$"0092B8EBFF1E5AA005F102000602BA6C443B6D6F3A833D398D6D4BD8904DC08F"
|
||||
$"00888A85FFB0B2AE05C4070207375FB843CE80445764584E54CF55C9897460D3"
|
||||
$"F9CA8775646E6873666B69656B6A6A5F6E3E773F773C77406FC039D28E346D02"
|
||||
$"04B454C190B454C991B454B98FC2D2B312BAD1B312CAD3B312D150C190D150B9"
|
||||
$"8FD150C991C2D2D00ECAD3D00EBAD1D00E0A08BD13B904D0EEBB14BF76C965BC"
|
||||
$"40C6D5B582CA40B954C275BCD4C187BAF4BE820A03BB01BE6FD12FBB02BD2EB9"
|
||||
$"250A03BBFEC63ABF76C93BD09BBB160A03D0C0BB40B971C27CB5A4CA110A03BA"
|
||||
$"F4BE68BCDFC17AD0D9BB1D090A000100023EE9780000000000003EA3FE41B2B1"
|
||||
$"4532B50A010101023F28320000000000003F1EC9C24BDB36864D0A020101023E"
|
||||
$"EFE40000000000003EE67BB99B69420C9F0A030102023F5FC20000000000003F"
|
||||
$"3403C2809BBB8D630A010102123F5FC20000000000003F3403C2809BBB8D6301"
|
||||
$"178522040A030103023F5FC20000000000003F3403C2809BBB8D630A04010402"
|
||||
$"3F5FC20000000000003F3403C2809BBB8D630A030105023F5FC2000000000000"
|
||||
$"3F3403C2809BBB8D630A050106023F5FC20000000000003F3403C2809BBB8D63"
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
|
||||
index 0554fa17..3ea02740 100644
|
||||
index 0554fa1..3ea0274 100644
|
||||
--- a/Telegram/Resources/qrc/telegram_linux.qrc
|
||||
+++ b/Telegram/Resources/qrc/telegram_linux.qrc
|
||||
@@ -1,5 +1,4 @@
|
||||
@@ -9,10 +9,10 @@ index 0554fa17..3ea02740 100644
|
||||
</qresource>
|
||||
</RCC>
|
||||
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
|
||||
index bf21d14d..6b63016e 100644
|
||||
index 2078858..1a70da9 100644
|
||||
--- a/Telegram/SourceFiles/core/launcher.cpp
|
||||
+++ b/Telegram/SourceFiles/core/launcher.cpp
|
||||
@@ -44,9 +44,10 @@ void Launcher::init() {
|
||||
@@ -37,9 +37,10 @@ void Launcher::init() {
|
||||
|
||||
QCoreApplication::setApplicationName(qsl("TelegramDesktop"));
|
||||
|
||||
@@ -25,7 +25,7 @@ index bf21d14d..6b63016e 100644
|
||||
|
||||
initHook();
|
||||
}
|
||||
@@ -64,6 +65,13 @@ int Launcher::exec() {
|
||||
@@ -57,6 +58,13 @@ int Launcher::exec() {
|
||||
Logs::start(this); // must be started before Platform is started
|
||||
Platform::start(); // must be started before QApplication is created
|
||||
|
||||
@@ -40,10 +40,10 @@ index bf21d14d..6b63016e 100644
|
||||
|
||||
DEBUG_LOG(("Telegram finished, result: %1").arg(result));
|
||||
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
|
||||
index e9e349be..d82963fa 100644
|
||||
index 6f93d69..df185d5 100644
|
||||
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
|
||||
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
|
||||
@@ -30,7 +30,7 @@ extern "C" {
|
||||
@@ -17,7 +17,7 @@ extern "C" {
|
||||
} // extern "C"
|
||||
|
||||
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
|
||||
@@ -153,10 +153,10 @@ index 00000000..4a722b8d
|
||||
+ flags |= QTextItem::StrikeOut;
|
||||
+}
|
||||
diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
index b975c7a8..f2f876b3 100644
|
||||
index e29f348..122ff0f 100644
|
||||
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
|
||||
@@ -15,13 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
|
||||
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
|
||||
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
|
||||
#elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC
|
||||
@@ -171,10 +171,10 @@ index b975c7a8..f2f876b3 100644
|
||||
-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
|
||||
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
|
||||
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
|
||||
index 7d34a19b..a4b3d31a 100644
|
||||
index 944f584..887c198 100644
|
||||
--- a/Telegram/SourceFiles/ui/text/text.cpp
|
||||
+++ b/Telegram/SourceFiles/ui/text/text.cpp
|
||||
@@ -1707,11 +1707,11 @@ private:
|
||||
@@ -1750,11 +1750,11 @@ private:
|
||||
if (item == -1)
|
||||
return;
|
||||
|
||||
@@ -190,10 +190,10 @@ index 7d34a19b..a4b3d31a 100644
|
||||
auto blockIndex = _lineStartBlock;
|
||||
auto currentBlock = _t->_blocks[blockIndex].get();
|
||||
diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
|
||||
index a10b5393..4e1eb62d 100644
|
||||
index 2959cec..04ad006 100644
|
||||
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
|
||||
+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
|
||||
@@ -333,6 +333,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
|
||||
@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
|
||||
|
||||
QStackTextEngine engine(part, blockFont->f);
|
||||
BlockParser parser(&engine, this, minResizeWidth, _from, part);
|
||||
@@ -204,10 +204,10 @@ index a10b5393..4e1eb62d 100644
|
||||
CrashReports::ClearAnnotationRef("CrashString");
|
||||
}
|
||||
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
|
||||
index dacb848a..f64c9b66 100644
|
||||
index 0f610cb..b005589 100644
|
||||
--- a/Telegram/SourceFiles/ui/twidget.cpp
|
||||
+++ b/Telegram/SourceFiles/ui/twidget.cpp
|
||||
@@ -248,9 +248,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
|
||||
@@ -227,9 +227,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
|
||||
, button
|
||||
, QGuiApplication::mouseButtons() | button
|
||||
, QGuiApplication::keyboardModifiers()
|
||||
@@ -220,10 +220,10 @@ index dacb848a..f64c9b66 100644
|
||||
ev.setTimestamp(getms());
|
||||
QGuiApplication::sendEvent(windowHandle, &ev);
|
||||
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
|
||||
index 5d6830e9..c3f08d3f 100644
|
||||
index a0e1e04..bd9bce0 100644
|
||||
--- a/Telegram/gyp/PrecompiledHeader.cmake
|
||||
+++ b/Telegram/gyp/PrecompiledHeader.cmake
|
||||
@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
|
||||
@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input)
|
||||
set(_compiler_FLAGS "@${_pch_c_flags_file}")
|
||||
add_custom_command(
|
||||
OUTPUT "${_output_c}"
|
||||
@@ -232,7 +232,7 @@ index 5d6830e9..c3f08d3f 100644
|
||||
DEPENDS "${_pchfile}" "${_pch_c_flags_file}"
|
||||
IMPLICIT_DEPENDS C "${_pch_header}"
|
||||
COMMENT "Precompiling ${_name} for ${_target} (C)")
|
||||
@@ -123,7 +123,7 @@ function(add_precompiled_header _target _input)
|
||||
@@ -125,7 +125,7 @@ function(add_precompiled_header _target _input)
|
||||
set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
|
||||
add_custom_command(
|
||||
OUTPUT "${_output_cxx}"
|
||||
@@ -240,18 +240,19 @@ index 5d6830e9..c3f08d3f 100644
|
||||
+ COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
|
||||
DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
|
||||
IMPLICIT_DEPENDS CXX "${_pch_header}"
|
||||
COMMENT "Precompiling ${_name} for ${_target} (C++)")
|
||||
COMMENT "Precompiling header ${_name} for ${_target} (C++)")
|
||||
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
|
||||
index 84a06153..fd7ca47f 100644
|
||||
index 65917d9..d91e55c 100644
|
||||
--- a/Telegram/gyp/Telegram.gyp
|
||||
+++ b/Telegram/gyp/Telegram.gyp
|
||||
@@ -82,13 +82,11 @@
|
||||
@@ -74,14 +74,12 @@
|
||||
'codegen.gyp:codegen_numbers',
|
||||
'codegen.gyp:codegen_style',
|
||||
'tests/tests.gyp:tests',
|
||||
- 'utils.gyp:Updater',
|
||||
'../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
|
||||
'crl.gyp:crl',
|
||||
'lib_export.gyp:lib_export',
|
||||
],
|
||||
|
||||
'defines': [
|
||||
@@ -259,7 +260,7 @@ index 84a06153..fd7ca47f 100644
|
||||
'AL_ALEXT_PROTOTYPES',
|
||||
'TGVOIP_USE_CXX11_LIB',
|
||||
'<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
|
||||
@@ -97,15 +95,7 @@
|
||||
@@ -90,15 +88,7 @@
|
||||
'include_dirs': [
|
||||
'<(src_loc)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -277,10 +278,10 @@ index 84a06153..fd7ca47f 100644
|
||||
'<(submodules_loc)/GSL/include',
|
||||
'<(submodules_loc)/variant/include',
|
||||
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
|
||||
index dea127a3..62c95e68 100644
|
||||
index 0b783ec..3f91776 100644
|
||||
--- a/Telegram/gyp/qt.gypi
|
||||
+++ b/Telegram/gyp/qt.gypi
|
||||
@@ -27,25 +27,21 @@
|
||||
@@ -14,25 +14,21 @@
|
||||
[ 'build_macold', {
|
||||
'qt_version%': '5.3.2',
|
||||
}, {
|
||||
@@ -308,7 +309,7 @@ index dea127a3..62c95e68 100644
|
||||
}]
|
||||
]
|
||||
},
|
||||
@@ -85,32 +81,13 @@
|
||||
@@ -72,32 +68,13 @@
|
||||
],
|
||||
}],
|
||||
[ 'build_linux', {
|
||||
@@ -344,7 +345,7 @@ index dea127a3..62c95e68 100644
|
||||
],
|
||||
}],
|
||||
],
|
||||
@@ -140,11 +117,6 @@
|
||||
@@ -127,11 +104,6 @@
|
||||
# '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))'
|
||||
# where [sources] contains all your source files
|
||||
'qt_moc_list_sources_arg': '--moc-prefix SHARED_INTERMEDIATE_DIR/<(_target_name)/moc/moc_',
|
||||
@@ -356,7 +357,7 @@ index dea127a3..62c95e68 100644
|
||||
},
|
||||
|
||||
'configurations': {
|
||||
@@ -193,14 +165,14 @@
|
||||
@@ -180,14 +152,14 @@
|
||||
},
|
||||
|
||||
'include_dirs': [
|
||||
@@ -379,7 +380,7 @@ index dea127a3..62c95e68 100644
|
||||
],
|
||||
'library_dirs': [
|
||||
'<(qt_loc)/lib',
|
||||
@@ -225,17 +197,10 @@
|
||||
@@ -212,17 +184,10 @@
|
||||
],
|
||||
'libraries': [
|
||||
'<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
|
||||
@@ -398,7 +399,7 @@ index dea127a3..62c95e68 100644
|
||||
'-lglib-2.0',
|
||||
'-lpthread',
|
||||
],
|
||||
@@ -243,7 +208,6 @@
|
||||
@@ -230,7 +195,6 @@
|
||||
'<(qt_loc)/mkspecs/linux-g++',
|
||||
],
|
||||
'ldflags': [
|
||||
@@ -407,10 +408,10 @@ index dea127a3..62c95e68 100644
|
||||
'-rdynamic',
|
||||
],
|
||||
diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
|
||||
index fae668dc..99e184a3 100644
|
||||
index 464d3c8..f350da8 100644
|
||||
--- a/Telegram/gyp/qt_moc.gypi
|
||||
+++ b/Telegram/gyp/qt_moc.gypi
|
||||
@@ -25,7 +25,7 @@
|
||||
@@ -12,7 +12,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
|
||||
],
|
||||
'action': [
|
||||
@@ -420,10 +421,10 @@ index fae668dc..99e184a3 100644
|
||||
# Silence "Note: No relevant classes found. No output generated."
|
||||
'--no-notes',
|
||||
diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
|
||||
index eebc6967..19a346fe 100644
|
||||
index f5624a8..1129a95 100644
|
||||
--- a/Telegram/gyp/qt_rcc.gypi
|
||||
+++ b/Telegram/gyp/qt_rcc.gypi
|
||||
@@ -28,7 +28,7 @@
|
||||
@@ -15,7 +15,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
|
||||
],
|
||||
'action': [
|
||||
@@ -433,10 +434,10 @@ index eebc6967..19a346fe 100644
|
||||
'-no-compress',
|
||||
'<(RULE_INPUT_PATH)',
|
||||
diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
|
||||
index b93bace4..0fcdfd56 100644
|
||||
index 17219fa..6853b5c 100644
|
||||
--- a/Telegram/gyp/settings_linux.gypi
|
||||
+++ b/Telegram/gyp/settings_linux.gypi
|
||||
@@ -24,7 +24,6 @@
|
||||
@@ -11,7 +11,6 @@
|
||||
'linux_common_flags': [
|
||||
'-pipe',
|
||||
'-Wall',
|
||||
@@ -453,10 +454,10 @@ index b93bace4..0fcdfd56 100644
|
||||
],
|
||||
'cflags_c': [
|
||||
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
|
||||
index f6918c22..50f0d8c7 100644
|
||||
index 01231c4..00a9c08 100644
|
||||
--- a/Telegram/gyp/telegram_linux.gypi
|
||||
+++ b/Telegram/gyp/telegram_linux.gypi
|
||||
@@ -33,10 +33,11 @@
|
||||
@@ -20,10 +20,11 @@
|
||||
'linux_path_va%': '/usr/local',
|
||||
'linux_path_vdpau%': '/usr/local',
|
||||
'linux_path_breakpad%': '/usr/local',
|
||||
@@ -469,7 +470,7 @@ index f6918c22..50f0d8c7 100644
|
||||
'/usr/local/include',
|
||||
'<(linux_path_ffmpeg)/include',
|
||||
'<(linux_path_openal)/include',
|
||||
@@ -45,6 +46,7 @@
|
||||
@@ -32,6 +33,7 @@
|
||||
'<(linux_path_range)/include',
|
||||
],
|
||||
'library_dirs': [
|
||||
@@ -477,7 +478,7 @@ index f6918c22..50f0d8c7 100644
|
||||
'/usr/local/lib',
|
||||
'<(linux_path_ffmpeg)/lib',
|
||||
'<(linux_path_openal)/lib',
|
||||
@@ -53,25 +55,15 @@
|
||||
@@ -40,25 +42,15 @@
|
||||
'<(linux_path_breakpad)/lib',
|
||||
],
|
||||
'libraries': [
|
||||
@@ -512,16 +513,14 @@ index f6918c22..50f0d8c7 100644
|
||||
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
|
||||
],
|
||||
'cflags_cc': [
|
||||
@@ -99,7 +91,7 @@
|
||||
@@ -87,16 +79,14 @@
|
||||
},
|
||||
},
|
||||
'conditions': [
|
||||
- [ '"<!(uname -p)" == "x86_64"', {
|
||||
+ [ '"<!(uname -m)" == "x86_64"', {
|
||||
# 32 bit version can't be linked with debug info or LTO,
|
||||
# virtual memory exhausted :(
|
||||
'cflags_c': [ '-g' ],
|
||||
@@ -118,10 +110,8 @@
|
||||
- [ '"<!(uname -p)" != "x86_64"', {
|
||||
+ [ '"<!(uname -m)" != "x86_64"', {
|
||||
'ldflags': [
|
||||
'-Wl,-wrap,__divmoddi4',
|
||||
],
|
||||
}], ['not_need_gtk!="True"', {
|
||||
'cflags_cc': [
|
||||
@@ -535,10 +534,10 @@ index f6918c22..50f0d8c7 100644
|
||||
}]
|
||||
],
|
||||
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
|
||||
index 5d2f627e..defd475d 100644
|
||||
index 7a10328..397d2a2 100644
|
||||
--- a/Telegram/gyp/telegram_sources.txt
|
||||
+++ b/Telegram/gyp/telegram_sources.txt
|
||||
@@ -713,14 +713,7 @@
|
||||
@@ -797,14 +797,7 @@
|
||||
<(emoji_suggestions_loc)/emoji_suggestions.cpp
|
||||
<(emoji_suggestions_loc)/emoji_suggestions.h
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f2b8da872bbe986e8024770dc7754c5fd3462fa0 Mon Sep 17 00:00:00 2001
|
||||
From 82f4b94d124679b5491a33aa36554e84239754c8 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 10 Jun 2018 10:41:50 +1000
|
||||
Subject: Add haiku support
|
||||
@@ -157,7 +157,7 @@ index dfc7fa0..38c6308 100644
|
||||
|
||||
namespace base {
|
||||
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
|
||||
index c21bd67..f366c99 100644
|
||||
index 1a70da9..4b7f531 100644
|
||||
--- a/Telegram/SourceFiles/core/launcher.cpp
|
||||
+++ b/Telegram/SourceFiles/core/launcher.cpp
|
||||
@@ -60,6 +60,10 @@ int Launcher::exec() {
|
||||
@@ -182,7 +182,7 @@ index c21bd67..f366c99 100644
|
||||
gPlatformString = qsl("Linux64bit");
|
||||
break;
|
||||
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
|
||||
index e60635c..d52aad2 100644
|
||||
index e8236c4..c2858d6 100644
|
||||
--- a/Telegram/SourceFiles/core/update_checker.cpp
|
||||
+++ b/Telegram/SourceFiles/core/update_checker.cpp
|
||||
@@ -630,6 +630,7 @@ bool ParseCommonMap(
|
||||
@@ -194,10 +194,10 @@ index e60635c..d52aad2 100644
|
||||
case dbipLinux32: return "linux32";
|
||||
}
|
||||
diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h
|
||||
index b4acd52..b435482 100644
|
||||
index 1e71dd3..ca8542f 100644
|
||||
--- a/Telegram/SourceFiles/core/utils.h
|
||||
+++ b/Telegram/SourceFiles/core/utils.h
|
||||
@@ -443,6 +443,7 @@ enum DBIPlatform {
|
||||
@@ -429,6 +429,7 @@ enum DBIPlatform {
|
||||
dbipLinux64 = 2,
|
||||
dbipLinux32 = 3,
|
||||
dbipMacOld = 4,
|
||||
@@ -206,10 +206,10 @@ index b4acd52..b435482 100644
|
||||
|
||||
enum DBIPeerReportSpamStatus {
|
||||
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
|
||||
index 24ec0cf..1e4992c 100644
|
||||
index 74edb3e..bcf4875 100644
|
||||
--- a/Telegram/SourceFiles/logs.cpp
|
||||
+++ b/Telegram/SourceFiles/logs.cpp
|
||||
@@ -335,7 +335,7 @@ void start(not_null<Core::Launcher*> launcher) {
|
||||
@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> launcher) {
|
||||
if (cBetaVersion()) {
|
||||
SetDebugEnabled(true);
|
||||
workingDirChosen = true;
|
||||
@@ -1754,10 +1754,10 @@ 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 73ed391..57b4dc8 100644
|
||||
index d91e55c..221ef96 100644
|
||||
--- a/Telegram/gyp/Telegram.gyp
|
||||
+++ b/Telegram/gyp/Telegram.gyp
|
||||
@@ -58,6 +58,7 @@
|
||||
@@ -61,6 +61,7 @@
|
||||
'telegram_win.gypi',
|
||||
'telegram_mac.gypi',
|
||||
'telegram_linux.gypi',
|
||||
@@ -1765,7 +1765,7 @@ index 73ed391..57b4dc8 100644
|
||||
'qt.gypi',
|
||||
'qt_moc.gypi',
|
||||
'qt_rcc.gypi',
|
||||
@@ -83,11 +84,12 @@
|
||||
@@ -88,11 +89,12 @@
|
||||
'include_dirs': [
|
||||
'<(src_loc)',
|
||||
'<(SHARED_INTERMEDIATE_DIR)',
|
||||
@@ -2154,10 +2154,10 @@ index 77b126d..6c27563 100644
|
||||
'variables': {
|
||||
'qrc_files': [
|
||||
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
|
||||
index 2202031..76dd1d8 100644
|
||||
index 397d2a2..ed4097a 100644
|
||||
--- a/Telegram/gyp/telegram_sources.txt
|
||||
+++ b/Telegram/gyp/telegram_sources.txt
|
||||
@@ -492,6 +492,18 @@
|
||||
@@ -507,6 +507,18 @@
|
||||
<(src_loc)/platform/linux/notifications_manager_linux.h
|
||||
<(src_loc)/platform/linux/specific_linux.cpp
|
||||
<(src_loc)/platform/linux/specific_linux.h
|
||||
@@ -2198,7 +2198,7 @@ index 622462e..e3ba800 100644
|
||||
2.16.4
|
||||
|
||||
|
||||
From 795c07344ae1a7583e9d960d43ac1b5ee66abb41 Mon Sep 17 00:00:00 2001
|
||||
From 042db473e1606d45a8321ef80c0f79c29d42f348 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 10 Jun 2018 14:50:46 +1000
|
||||
Subject: Adapt code to new API
|
||||
@@ -2259,3 +2259,91 @@ index b303e1d..1928257 100644
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From ee9f560bfa453cb74eb685528de59aedaa295a7e Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 28 Jun 2018 00:02:04 +1000
|
||||
Subject: Fix range include path
|
||||
|
||||
|
||||
diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp
|
||||
index 0d368e2..847f82b 100644
|
||||
--- a/Telegram/gyp/lib_export.gyp
|
||||
+++ b/Telegram/gyp/lib_export.gyp
|
||||
@@ -44,7 +44,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',
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From c538dff42b5a7e7459956cbda33922e73a1ced48 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 28 Jun 2018 00:03:23 +1000
|
||||
Subject: gcc7 segfault on this code
|
||||
|
||||
|
||||
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
|
||||
index e684899..e4b318b 100644
|
||||
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
|
||||
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
|
||||
@@ -179,13 +179,13 @@ Image ParseMaxImage(
|
||||
result.width = data.vw.v;
|
||||
result.height = data.vh.v;
|
||||
result.file.location = ParseLocation(data.vlocation);
|
||||
- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
|
||||
- result.file.content = data.vbytes.v;
|
||||
- result.file.size = result.file.content.size();
|
||||
- } else {
|
||||
- result.file.content = QByteArray();
|
||||
- result.file.size = data.vsize.v;
|
||||
- }
|
||||
+// if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
|
||||
+// result.file.content = data.vbytes.v;
|
||||
+// result.file.size = result.file.content.size();
|
||||
+// } else {
|
||||
+// result.file.content = QByteArray();
|
||||
+// result.file.size = data.vsize.v;
|
||||
+// }
|
||||
maxArea = area;
|
||||
}
|
||||
});
|
||||
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
|
||||
index 987bad8..6e8b1f4 100644
|
||||
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
|
||||
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
|
||||
@@ -610,9 +610,9 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
|
||||
Expects(_userpicsProcess != nullptr);
|
||||
|
||||
result.match([&](const auto &data) {
|
||||
- if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
|
||||
- _userpicsProcess->lastSlice = true;
|
||||
- }
|
||||
+// if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
|
||||
+// _userpicsProcess->lastSlice = true;
|
||||
+// }
|
||||
loadUserpicsFiles(Data::ParseUserpicsSlice(
|
||||
data.vphotos,
|
||||
_userpicsProcess->processed));
|
||||
@@ -1018,9 +1018,9 @@ void ApiWrap::requestMessagesSlice() {
|
||||
result.match([&](const MTPDmessages_messagesNotModified &data) {
|
||||
error("Unexpected messagesNotModified received.");
|
||||
}, [&](const auto &data) {
|
||||
- if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
|
||||
- _chatProcess->lastSlice = true;
|
||||
- }
|
||||
+// if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
|
||||
+// _chatProcess->lastSlice = true;
|
||||
+// }
|
||||
loadMessagesFiles(Data::ParseMessagesSlice(
|
||||
_chatProcess->context,
|
||||
data.vmessages,
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@@ -7,7 +7,7 @@ REVISION="1"
|
||||
|
||||
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz"
|
||||
SOURCE_DIR="tdesktop-$portVersion"
|
||||
CHECKSUM_SHA256="cbb30bad15496848beda2db3481700a7292de6c453ee616cc62a2189a32dd7d8"
|
||||
CHECKSUM_SHA256="1bf32ca02022741bfc43a4b7d9e48089260064ef94b56d247e21ec2962410096"
|
||||
|
||||
COMMIT_2="6ba1241cfef6c3ddf4e50e82f67afde0abc02285"
|
||||
SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$COMMIT_2.zip"
|
||||
@@ -25,9 +25,9 @@ COMMIT_5="5ca44b68721833ae3731802ed99af67c6f38a53a"
|
||||
SOURCE_URI_5="https://github.com/philsquared/Catch/archive/$COMMIT_5.zip"
|
||||
CHECKSUM_SHA256_5="bec93e64dea2dd0c6662a75a81cdd1747a753ccd86025ef436b7d2fac3b408d2"
|
||||
|
||||
COMMIT_6="f893c36427993e22181c8b3ec382dedb5563dc08"
|
||||
COMMIT_6="9bc641f2d4ab140a84aea64c7f2d4669f7633246"
|
||||
SOURCE_URI_6="https://github.com/telegramdesktop/crl/archive/$COMMIT_6.zip"
|
||||
CHECKSUM_SHA256_6="275d26711f8eadc3ee8fbdb97ce750a6c8a08adf35f99726c267c6e12256fa26"
|
||||
CHECKSUM_SHA256_6="563424b0a56c8a3c7b05d82a0e3551a467051057b53e8f7e68f4815921e6953a"
|
||||
|
||||
COMMIT_7="4b10be9cbadd7d0880437f48f875185589fd86d3"
|
||||
SOURCE_URI_7="https://github.com/ericniebler/range-v3/archive/$COMMIT_7.zip"
|
||||
@@ -100,7 +100,7 @@ BUILD_PREREQUIRES="
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
{
|
||||
sed -i "s|@HAIKU_HEADERS@|/system/$relativeIncludeDir|" Telegram/gyp/telegram_haiku.gypi
|
||||
sed -i "s|@HAIKU_HEADERS@|/system/$relativeIncludeDir|" Telegram/gyp/qt.gypi
|
||||
sed -i "s|@HAIKU_LIBS@|/system/$relativeLibDir|" Telegram/gyp/telegram_haiku.gypi
|
||||
Reference in New Issue
Block a user