Skip to content
Permalink
Browse files

v1.5.7

  • Loading branch information...
Sea-n committed Jan 21, 2019
1 parent 2519eaf commit 86783898397b6cf32d0dc9c2f733dfbd4701ed29
Showing 1,365 changed files with 109,883 additions and 48,678 deletions.
@@ -27,7 +27,7 @@ GOTO:EOF
call:logInfo "Clone dependencies repository"
git clone -q --depth 1 --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
cd %LIB_DIR%
git clone https://github.com/Microsoft/Range-V3-VS2015 range-v3
git clone https://github.com/ericniebler/range-v3
if exist prepare.bat (
call prepare.bat
) else (
@@ -48,14 +48,38 @@ GOTO:EOF
git submodule init
git submodule update
cd %SRC_DIR%\Telegram
call gyp\refresh.bat
call gyp\refresh.bat --api-id 17349 --api-hash 344583e45741c457fe1862106095a5eb
GOTO:EOF

:configureBuild
call:logInfo "Configuring build"
call:logInfo "Build version: %BUILD_VERSION%"
set TDESKTOP_BUILD_DEFINES=

echo %BUILD_VERSION% | findstr /C:"disable_register_custom_scheme">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
)

echo %BUILD_VERSION% | findstr /C:"disable_crash_reports">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_CRASH_REPORTS
)

echo %BUILD_VERSION% | findstr /C:"disable_network_proxy">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_NETWORK_PROXY
)

echo %BUILD_VERSION% | findstr /C:"disable_desktop_file_generation">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
)

echo %BUILD_VERSION% | findstr /C:"disable_unity_integration">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_UNITY_INTEGRATION
)

echo %BUILD_VERSION% | findstr /C:"disable_gtk_integration">nul && (
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_GTK_INTEGRATION
)

if not "%TDESKTOP_BUILD_DEFINES%" == "" (
set "TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES:~1%"
)
@@ -24,6 +24,8 @@ If we find issues with your pull request, we may suggest some changes and improv

It's Telegreat, we sometimes merge any pull requests that have new feature implementations, translations to new languages and those which introduce any new user interface elements.

If you have a translations-related contribution, check out [Translations platform][translate].

Telegram Desktop is not a standalone application but a part of [Telegram project][telegram], so all the decisions about the features, languages, user experience, user interface and the design are made inside Telegram team, often according to some roadmap which is not public. But third-party Telegreat can :P

## Build instructions
@@ -33,7 +35,7 @@ environments.

## Pull upstream changes into your fork regularly

Telegreat is advancing quickly. It is therefore critical that you pull upstream changes into your fork on a regular basis. Nothing is worse than putting in a days of hard work into a pull request only to have it rejected because it has diverged too far from upstram.
Telegreat Desktop is advancing quickly. It is therefore critical that you pull upstream changes into your fork on a regular basis. Nothing is worse than putting in a days of hard work into a pull request only to have it rejected because it has diverged too far from upstream.

To pull in upstream changes:

@@ -113,3 +115,4 @@ Before you submit a pull request, please test your changes. Verify that Telegrea
[pr]: https://github.com/Sea-n/tdesktop/compare
[build_instructions]: https://github.com/Sea-n/tdesktop/blob/master/README.md#build-instructions
[closing-issues-via-commit-messages]: https://help.github.com/articles/closing-issues-via-commit-messages/
[translate]: https://translations.telegram.org
@@ -22,8 +22,5 @@ Tell us what happens instead
**Used theme**:

<details><summary><b>Logs</b>:</summary>
Insert logs here (if necessary)

<!-- You can type `debugmode` in settings and then see ~/.TelegramDesktop/DebugLogs/log_...txt for log files.
Type `debugmode` in settings again to disable logs. -->
Insert log.txt here (if necessary)
</details>
@@ -50,8 +50,19 @@ ipch/
project.xcworkspace
xcuserdata

parts
prime
stage
*.snap
.snapcraft
/snap/gui/*.png
/snap/gui/*.desktop
/snap/plugins/__pycache__

/Telegram/*.user.*
*.pro.user
/Linux/
/Telegram/Makefile
*.*~

/TelegramPrivate/
@@ -13,3 +13,6 @@
[submodule "Telegram/ThirdParty/crl"]
path = Telegram/ThirdParty/crl
url = https://github.com/telegramdesktop/crl.git
[submodule "Telegram/ThirdParty/xxHash"]
path = Telegram/ThirdParty/xxHash
url = https://github.com/Cyan4973/xxHash.git
@@ -10,6 +10,10 @@ cache:
env:
matrix:
- BUILD_VERSION=""
- BUILD_VERSION="disable_register_custom_scheme"
- BUILD_VERSION="disable_crash_reports"
- BUILD_VERSION="disable_network_proxy"
- BUILD_VERSION="disable_desktop_file_generation"
- BUILD_VERSION="disable_unity_integration"
- BUILD_VERSION="disable_gtk_integration"

@@ -60,17 +64,3 @@ before_install:

script:
- .travis/build.sh

before_deploy:
- git config --local user.name "Sean"
- git config --local user.email "sean@sean.taipei"

deploy:
provider: releases
api_key: ""
file_glob: true
file: out/*
skip_cleanup: false
on:
branch: dev
repo: Sea-n/Telegreat
@@ -17,7 +17,7 @@ XKB_PATH="$BUILD/libxkbcommon"
XKB_CACHE_VERSION="3"

QT_PATH="$BUILD/qt"
QT_CACHE_VERSION="3"
QT_CACHE_VERSION="4"
QT_PATCH="$UPSTREAM/Telegram/Patches/qtbase_${QT_VERSION//\./_}.diff"

BREAKPAD_PATH="$BUILD/breakpad"
@@ -40,11 +40,11 @@ FFMPEG_PATH="$BUILD/ffmpeg"
FFMPEG_CACHE_VERSION="3"

OPENAL_PATH="$BUILD/openal-soft"
OPENAL_CACHE_VERSION="3"
OPENAL_CACHE_VERSION="4"

GYP_DEFINES=""

[[ ! $MAKE_ARGS ]] && MAKE_ARGS="-j3"
[[ ! $MAKE_ARGS ]] && MAKE_ARGS="--silent -j4"

run() {
# Move files to subdir
@@ -100,10 +100,6 @@ build() {
fi

# Configure the build
if [[ $BUILD_VERSION == *"disable_autoupdate"* ]]; then
GYP_DEFINES+=",TDESKTOP_DISABLE_AUTOUPDATE"
fi

if [[ $BUILD_VERSION == *"disable_register_custom_scheme"* ]]; then
GYP_DEFINES+=",TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
fi
@@ -476,10 +472,12 @@ buildOpenAL() {
rm -rf "$EXTERNAL/openal-soft"
fi
cd $OPENAL_PATH
rm -rf *
sudo rm -rf *

cd "$EXTERNAL"
git clone https://github.com/kcat/openal-soft.git
cd openal-soft
git checkout openal-soft-1.19.1

cd "$EXTERNAL/openal-soft/build"
cmake \
@@ -585,10 +583,10 @@ buildCustomQt() {
info_msg "Downloading and building patched qt"

if [ -d "$EXTERNAL/qt${QT_VERSION}" ]; then
rm -rf "$EXTERNAL/qt${QT_VERSION}"
sudo rm -rf "$EXTERNAL/qt${QT_VERSION}"
fi
cd $QT_PATH
rm -rf *
sudo rm -rf *

cd "$EXTERNAL"
git clone git://code.qt.io/qt/qt5.git qt${QT_VERSION}
@@ -606,6 +604,7 @@ buildCustomQt() {
cd "$EXTERNAL/qt${QT_VERSION}/qtbase/src/plugins/platforminputcontexts"
git clone https://github.com/telegramdesktop/fcitx.git
git clone https://github.com/telegramdesktop/hime.git
git clone https://github.com/telegramdesktop/nimf.git
cd ../../../..

./configure -prefix $QT_PATH -release -opensource -confirm-license -qt-zlib \
@@ -673,10 +672,12 @@ buildGYP() {
}

buildTelegram() {
travisStartFold "Build tdesktop"
travisStartFold "Build Telegreat"

cd "$UPSTREAM/Telegram/gyp"
"$GYP_PATH/gyp" \
-Dapi_id=17349 \
-Dapi_hash=344583e45741c457fe1862106095a5eb \
-Dbuild_defines=${GYP_DEFINES:1} \
-Dlinux_path_xkbcommon=$XKB_PATH \
-Dlinux_path_va=$VA_PATH \
@@ -688,17 +689,20 @@ buildTelegram() {
-Dlinux_path_breakpad=$BREAKPAD_PATH \
-Dlinux_path_libexif_lib=/usr/local/lib \
-Dlinux_path_opus_include=/usr/include/opus \
-Dlinux_lib_ssl=-lssl \
-Dlinux_lib_crypto=-lcrypto \
-Dlinux_lib_icu=-licuuc\ -licutu\ -licui18n \
--depth=. --generator-output=.. --format=cmake -Goutput_dir=../out \
Telegreat.gyp
cd "$UPSTREAM/out/Release"
cd "$UPSTREAM/out/Debug"

export ASM="gcc"
cmake .
make $MAKE_ARGS
}

check() {
local filePath="$UPSTREAM/out/Release/Telegreat"
local filePath="$UPSTREAM/out/Debug/Telegreat"
if test -f "$filePath"; then
success_msg "Build successfully done! :)"

@@ -42,8 +42,7 @@ travisStartFold() {
travisEndFold
fi

# echo "travis_fold:start:$NAME"
echo "START $NAME"
echo "travis_fold:start:$NAME"
sameLineInfoMessage "$TITLE"

TRAVIS_LAST_FOLD="$NAME"
@@ -54,8 +53,7 @@ travisEndFold() {
return
fi

# echo "travis_fold:end:$TRAVIS_LAST_FOLD"
echo "END $TRAVIS_LAST_FOLD"
echo "travis_fold:end:$TRAVIS_LAST_FOLD"
TRAVIS_LAST_FOLD=""
}

2 LEGAL
@@ -1,7 +1,7 @@
This file is part of Telegram Desktop,
the official desktop application for the Telegram messaging service.

Copyright (c) 2014-2018 John Preston, https://desktop.telegram.org
Copyright (c) 2014-2019 John Preston, https://desktop.telegram.org

Telegram Desktop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -10,8 +10,10 @@ The source code is published under GPLv3 with OpenSSL exception, the license is

* Windows XP - Windows 10 (**not** RT)
* Mac OS X 10.8 - Mac OS X 10.11
* Ubuntu 12.04 - Ubuntu 18.04
* Fedora 22 - Fedora 24
* Mac OS X 10.6 - Mac OS X 10.7 (separate build)
* Ubuntu 12.04 - Ubuntu 18.10
* Fedora 22 - Fedora 29
* [Snappy](https://snapcraft.io/telegram-desktop)

## Third-party

@@ -25,7 +27,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
* Google Crashpad ([Apache License 2.0](https://chromium.googlesource.com/crashpad/crashpad/+/master/LICENSE))
* GYP ([BSD License](https://github.com/bnoordhuis/gyp/blob/master/LICENSE))
* Ninja ([Apache License 2.0](https://github.com/ninja-build/ninja/blob/master/COPYING))
* OpenAL Soft ([LGPL](http://kcat.strangesoft.net/openal.html))
* OpenAL Soft ([LGPL](https://github.com/kcat/openal-soft/blob/master/COPYING))
* Opus codec ([BSD License](http://www.opus-codec.org/license/))
* FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html))
* Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
@@ -34,11 +36,12 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
* Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
* Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
* Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt))
* xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))

## Build instructions

* [Visual Studio 2017][msvc]
* [Xcode 9][xcode]
* [Xcode 10][xcode]
* [GYP/CMake on GNU/Linux][cmake]

## Links

0 comments on commit 8678389

Please sign in to comment.
You can’t perform that action at this time.