kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse source
This commit is contained in:
Eric Kotato 2019-11-08 19:36:21 +03:00
commit 0b617729b1
14 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor/install.bat
View file

@ -63,7 +63,7 @@ GOTO:EOF
)
echo %BUILD_VERSION% | findstr /C:"disable_crash_reports">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_CRASH_REPORTS
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,DESKTOP_APP_DISABLE_CRASH_REPORTS
)
echo %BUILD_VERSION% | findstr /C:"disable_network_proxy">nul && (

2
.travis/build.sh
View file

@ -107,7 +107,7 @@ build() {
fi
if [[ $BUILD_VERSION == *"disable_crash_reports"* ]]; then
GYP_DEFINES+=",TDESKTOP_DISABLE_CRASH_REPORTS"
GYP_DEFINES+=",DESKTOP_APP_DISABLE_CRASH_REPORTS"
fi
if [[ $BUILD_VERSION == *"disable_network_proxy"* ]]; then

34
Telegram/SourceFiles/core/crash_reports.cpp
View file

@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <new>
#include <mutex>
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
// see https://blog.inventic.eu/2012/08/qt-and-google-breakpad/
#ifdef Q_OS_WIN
@ -49,7 +49,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#endif // Q_OS_LINUX64 || Q_OS_LINUX32
#endif // !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS
namespace CrashReports {
namespace {
@ -60,7 +60,7 @@ using AnnotationRefs = std::map<std::string, const QString*>;
Annotations ProcessAnnotations;
AnnotationRefs ProcessAnnotationRefs;
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
QString ReportPath;
FILE *ReportFile = nullptr;
@ -317,7 +317,7 @@ bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context,
}
#endif // !Q_OS_MAC || MAC_USE_BREAKPAD
#endif // !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS
} // namespace
@ -341,7 +341,7 @@ QString PlatformString() {
}
void StartCatching(not_null<Core::Launcher*> launcher) {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
ProcessAnnotations["Binary"] = cExeName().toUtf8().constData();
ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData();
ProcessAnnotations["Version"] = (cAlphaVersion() ? qsl("%1 alpha").arg(cAlphaVersion()) : (AppBetaVersion ? qsl("%1 beta") : qsl("%1")).arg(AppVersion)).toUtf8().constData();
@ -401,21 +401,21 @@ void StartCatching(not_null<Core::Launcher*> launcher) {
-1
);
#endif // Q_OS_LINUX64 || Q_OS_LINUX32
#endif // !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS
}
void FinishCatching() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
#if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD
delete base::take(BreakpadExceptionHandler);
#endif // !Q_OS_MAC || MAC_USE_BREAKPAD
#endif // !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS
}
StartResult Start() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
ReportPath = cWorkingDir() + qsl("tdata/working");
#ifdef Q_OS_WIN
@ -441,12 +441,12 @@ StartResult Start() {
return lastdump;
}
#endif // !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS
return Restart();
}
Status Restart() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
if (ReportFile) {
return Started;
}
@ -495,13 +495,13 @@ Status Restart() {
LOG(("FATAL: Could not open '%1' for writing!").arg(ReportPath));
return CantOpen;
#else // !TDESKTOP_DISABLE_CRASH_REPORTS
#else // !DESKTOP_APP_DISABLE_CRASH_REPORTS
return Started;
#endif // else for !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // else for !DESKTOP_APP_DISABLE_CRASH_REPORTS
}
void Finish() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
FinishCatching();
if (ReportFile) {
@ -514,7 +514,7 @@ void Finish() {
unlink(ReportPath.toUtf8().constData());
#endif // else for Q_OS_WIN
}
#endif // !TDESKTOP_DISABLE_CRASH_REPORTS
#endif // !DESKTOP_APP_DISABLE_CRASH_REPORTS
}
void SetAnnotation(const std::string &key, const QString &value) {
@ -564,7 +564,7 @@ void SetAnnotationRef(const std::string &key, const QString *valuePtr) {
}
}
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
dump::~dump() {
if (ReportFile) {
@ -629,6 +629,6 @@ const dump &operator<<(const dump &stream, double num) {
return stream;
}
#endif // TDESKTOP_DISABLE_CRASH_REPORTS
#endif // DESKTOP_APP_DISABLE_CRASH_REPORTS
} // namespace CrashReports

4
Telegram/SourceFiles/core/crash_reports.h
View file

@ -15,7 +15,7 @@ namespace CrashReports {
QString PlatformString();
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
struct dump {
~dump();
@ -28,7 +28,7 @@ const dump &operator<<(const dump &stream, unsigned long num);
const dump &operator<<(const dump &stream, unsigned long long num);
const dump &operator<<(const dump &stream, double num);
#endif // TDESKTOP_DISABLE_CRASH_REPORTS
#endif // DESKTOP_APP_DISABLE_CRASH_REPORTS
enum Status {
CantOpen,

4
Telegram/SourceFiles/platform/mac/specific_mac.mm
View file

@ -57,10 +57,10 @@ QRect psDesktopRect() {
}
void psWriteDump() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
double v = objc_appkitVersion();
CrashReports::dump() << "OS-Version: " << v;
#endif // TDESKTOP_DISABLE_CRASH_REPORTS
#endif // DESKTOP_APP_DISABLE_CRASH_REPORTS
}
void psDeleteDir(const QString &dir) {

4
Telegram/SourceFiles/platform/win/specific_win.cpp
View file

@ -563,7 +563,7 @@ void psSendToMenu(bool send, bool silent) {
}
void psWriteDump() {
#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
#ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
PROCESS_MEMORY_COUNTERS data = { 0 };
if (Dlls::GetProcessMemoryInfo
&& Dlls::GetProcessMemoryInfo(
@ -584,7 +584,7 @@ void psWriteDump() {
<< (data.PagefileUsage / mb)
<< " MB (current)\n";
}
#endif // TDESKTOP_DISABLE_CRASH_REPORTS
#endif // DESKTOP_APP_DISABLE_CRASH_REPORTS
}
bool psLaunchMaps(const Data::LocationPoint &point) {

1
Telegram/gyp/Telegram.gyp
View file

@ -50,7 +50,6 @@
'ko',
'pt-BR',
],
'build_defines%': '',
'list_sources_command': 'python <(submodules_loc)/lib_base/gyp/list_sources.py --input <(DEPTH)/telegram/sources.txt --replace src_loc=<(src_loc)',
'pch_source': '<(src_loc)/stdafx.cpp',
'pch_header': '<(src_loc)/stdafx.h',

2
Telegram/gyp/helpers

@ -1 +1 @@
Subproject commit 6c8965430be14476168adc53efce554a5535be73
Subproject commit 1b346350ead307c8d7015a9b4fd6a8af06e0efd2

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 33f64d6d9de493acb287154a557f25bd8eb50bb4
Subproject commit a94ad7f817c1e1aeb242843d90f2bac313daab7a

2
docs/building-cmake.md
View file

@ -44,7 +44,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3

4
docs/building-msvc.md
View file

@ -32,7 +32,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ../
git clone https://chromium.googlesource.com/external/gyp
cd gyp
@ -64,7 +64,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ..
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3 range-v3

8
docs/building-osx.md
View file

@ -33,7 +33,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@ -50,7 +50,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
@ -213,12 +213,12 @@ Go to ***BuildPath*** and run
git clone https://chromium.googlesource.com/crashpad/crashpad.git
cd crashpad
git checkout feb3aa3923
git apply ../../patches/crashpad.diff
git apply ../patches/crashpad.diff
cd third_party/mini_chromium
git clone https://chromium.googlesource.com/chromium/mini_chromium
cd mini_chromium
git checkout 7c5b0c1ab4
git apply ../../../../../patches/mini_chromium.diff
git apply ../../../../patches/mini_chromium.diff
cd ../../gtest
git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest
cd gtest

8
docs/building-xcode.md
View file

@ -33,7 +33,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@ -50,7 +50,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout b0ec5df
git checkout 4aa377c
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
@ -213,12 +213,12 @@ Go to ***BuildPath*** and run
git clone https://chromium.googlesource.com/crashpad/crashpad.git
cd crashpad
git checkout feb3aa3923
git apply ../../patches/crashpad.diff
git apply ../patches/crashpad.diff
cd third_party/mini_chromium
git clone https://chromium.googlesource.com/chromium/mini_chromium
cd mini_chromium
git checkout 7c5b0c1ab4
git apply ../../../../../patches/mini_chromium.diff
git apply ../../../../patches/mini_chromium.diff
cd ../../gtest
git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest
cd gtest

14
snap/snapcraft.yaml
View file

@ -308,16 +308,14 @@ parts:
- xutils-dev
- bison
- python-xcbgen
configflags:
- --disable-x11
prime: [-./*]
qt:
plugin: qtbuilder
qt-version: 5.6.2
qt-version: 5.12.5
qt-source-git: https://code.qt.io/qt/qt5.git
qt-submodules: ['qtbase', 'qtimageformats']
qt-patches-path: Telegram/Patches
qt-patches-base-url: https://raw.githubusercontent.com/desktop-app/patches/master
qt-extra-plugins:
- platforminputcontexts:
- https://github.com/telegramdesktop/fcitx.git
@ -336,6 +334,7 @@ parts:
- libpulse-dev
- libssl-dev
- libx11-xcb-dev
- libxcb-xkb-dev
- libxcb-icccm4-dev
- libxcb-image0-dev
- libxcb-keysyms1-dev
@ -356,14 +355,13 @@ parts:
- -qt-zlib
- -qt-libpng
- -qt-libjpeg
- -qt-freetype
- -qt-harfbuzz
- -qt-pcre
- -qt-xcb
- -qt-xkbcommon-x11
- -no-gstreamer
- -no-gtkstyle
- -no-gtk
- -no-mirclient
- -system-freetype
- -fontconfig
- -no-opengl
- -static
- -dbus-runtime