Merge pull request #1 from telegramdesktop/dev

pull

Author: wubenqi

.github/workflows/linux.yml

@@ -31,8 +31,9 @@ jobs:
       CMAKE_VER: "3.16.3"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
-      MANUAL_CACHING: "4"
+      MANUAL_CACHING: "6"
       DOC_PATH: "docs/building-cmake.md"
+      AUTO_CACHING: "1"
 
     steps:
       - name: Get repository name.
@@ -43,7 +44,20 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Disable man for further package installs.
+        run: |
+          cfgFile="/etc/dpkg/dpkg.cfg.d/no_man"
+          sudo touch $cfgFile
+          p() {
+            sudo echo "path-exclude=/usr/share/$1/*" >> $cfgFile
+          }
+
+          p man
+          p locale
+          p doc
+
       - name: First set up.
+        shell: bash
         run: |
           cd ..
           mv $REPO_NAME temp
@@ -55,13 +69,13 @@ jobs:
           sudo apt-get install software-properties-common -y && \
           sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev \
           libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
-          autoconf automake build-essential libass-dev libfreetype6-dev \
+          autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
           libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
-          libvorbis-dev libenchant-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
+          libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
           libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
           libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
-          libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev bison \
-          libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html yasm \
+          libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
+          libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html bison yasm \
           zlib1g-dev xutils-dev python-xcbgen chrpath gperf wget -y --force-yes && \
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
           sudo apt-get update && \
@@ -75,6 +89,10 @@ jobs:
 
           gcc --version > CACHE_KEY.txt
           echo $MANUAL_CACHING >> CACHE_KEY.txt
+          if [ "$AUTO_CACHING" == "1" ]; then
+            thisFile=$REPO_NAME/.github/workflows/linux.yml
+            echo `md5sum $thisFile | cut -c -32` >> CACHE_KEY.txt
+          fi
           md5cache=$(md5sum CACHE_KEY.txt | cut -c -32)
           echo ::set-env name=CACHE_KEY::$md5cache
 
@@ -122,9 +140,8 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/xiph/opus
+          git clone -b v1.3 --depth=1 $GIT/xiph/opus
           cd opus
-          git checkout v1.3
           ./autogen.sh
           ./configure
           make -j$(nproc)
@@ -142,16 +159,20 @@ jobs:
           ./autogen.sh --enable-static
           make -j$(nproc)
           sudo make install
+          cd ..
+          rm -rf libva
 
       - name: Libvdpau.
         run: |
           cd $LibrariesPath
 
-          git clone https://gitlab.freedesktop.org/vdpau/libvdpau.git --depth=1 -b libvdpau-1.2
+          git clone -b libvdpau-1.2 --depth=1 https://gitlab.freedesktop.org/vdpau/libvdpau.git
           cd libvdpau
           ./autogen.sh --enable-static
           make -j$(nproc)
           sudo make install
+          cd ..
+          rm -rf libvdpau
 
       - name: FFmpeg cache.
         id: cache-ffmpeg
@@ -267,6 +288,8 @@ jobs:
 
           make -j$(nproc)
           sudo make install
+          cd ..
+          rm -rf ffmpeg
       - name: FFmpeg install.
         run: |
           cd $LibrariesPath
@@ -293,18 +316,20 @@ jobs:
           ./configure
           make -j$(nproc)
           sudo make install
+          cd ..
+          rm -rf portaudio
 
       - name: OpenAL Soft.
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/kcat/openal-soft.git
-          cd openal-soft
-          git checkout openal-soft-1.19.1
-          cd build
+          git clone -b openal-soft-1.19.1 --depth=1 $GIT/kcat/openal-soft.git
+          cd openal-soft/build
           cmake -D LIBTYPE:STRING=STATIC ..
           make -j$(nproc)
           sudo make install
+          cd -
+          rm -rf openal-soft
 
       - name: OpenSSL cache.
         id: cache-openssl
@@ -317,12 +342,15 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/openssl/openssl openssl_$OPENSSL_VER
-          cd openssl_$OPENSSL_VER
-          git checkout OpenSSL_1_1_1-stable
+          opensslDir=openssl_${OPENSSL_VER}
+          git clone -b OpenSSL_${OPENSSL_VER}-stable --depth=1 \
+            $GIT/openssl/openssl $opensslDir
+          cd $opensslDir
           ./config --prefix=$LibrariesPath/openssl-cache
           make -j$(nproc)
-          sudo make install
+          sudo make install_sw
+          cd ..
+          rm -rf $opensslDir
       - name: OpenSSL install.
         run: |
           cd $LibrariesPath
@@ -333,12 +361,25 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/xkbcommon/libxkbcommon.git
+          git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
           cd libxkbcommon
-          git checkout xkbcommon-0.8.4
           ./autogen.sh
           make -j$(nproc)
           sudo make install
+          cd ..
+          rm -rf libxkbcommon
+
+      - name: Libwayland.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland
+          cd wayland
+          ./autogen.sh --enable-static --disable-documentation
+          make -j$(nproc)
+          sudo make install
+          cd ..
+          rm -rf wayland
 
       - name: Qt 5.12.5 cache.
         id: cache-qt
@@ -351,15 +392,12 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone git://code.qt.io/qt/qt5.git qt_$QT
-          cd qt_$QT
-          perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
-          git checkout v5.12.5
-          git submodule update qtbase
-          git submodule update qtimageformats
-          git submodule update qtsvg
+          git clone -b v5.12.5 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
+          cd qt_${QT}
+          perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
+          git submodule update qtbase qtwayland qtimageformats qtsvg
           cd qtbase
-          git apply ../../patches/qtbase_$QT.diff
+          git apply ../../patches/qtbase_${QT}.diff
           cd src/plugins/platforminputcontexts
           git clone $GIT/desktop-app/fcitx.git
           git clone $GIT/desktop-app/hime.git
@@ -379,16 +417,18 @@ jobs:
           -qt-xcb \
           -system-freetype \
           -fontconfig \
-          -no-opengl \
           -no-gtk \
           -static \
+          -dbus-runtime \
           -openssl-linked \
           -I "$OPENSSL_PREFIX/include" OPENSSL_LIBS="$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -ldl -lpthread" \
           -nomake examples \
           -nomake tests
 
           make -j$(nproc)
           sudo make install
+          cd ..
+          rm -rf qt_${QT}
       - name: Qt 5.12.5 install.
         run: |
           cd $LibrariesPath
@@ -439,6 +479,8 @@ jobs:
           make -j$(nproc) dump_syms
 
           mv dump_syms $BreakpadCache/
+          cd ..
+          rm -rf gyp breakpad
       - name: Breakpad install.
         run: |
           cd $LibrariesPath

.github/workflows/mac.yml

@@ -26,15 +26,17 @@ jobs:
       GIT: "https://github.com"
       PREFIX: "/usr/local/macos"
       MACOSX_DEPLOYMENT_TARGET: "10.12"
-      XZ: "xz-5.0.5"
+      XZ: "xz-5.2.4"
       QT: "5_12_5"
       OPENSSL_VER: "1_1_1"
       QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.5"
-      LIBICONV_VER: "libiconv-1.15"
+      LIBICONV_VER: "libiconv-1.16"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "2"
       DOC_PATH: "docs/building-xcode.md"
+      AUTO_CACHING: "1"
+
     steps:
       - name: Get repository name.
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
@@ -61,6 +63,10 @@ jobs:
           echo $MIN_MAC >> CACHE_KEY.txt
           echo $PREFIX >> CACHE_KEY.txt
           echo $MANUAL_CACHING >> CACHE_KEY.txt
+          if [ "$AUTO_CACHING" == "1" ]; then
+            thisFile=$REPO_NAME/.github/workflows/mac.yml
+            echo `md5 -q $thisFile` >> CACHE_KEY.txt
+          fi
           echo ::set-env name=CACHE_KEY::`md5 -q CACHE_KEY.txt`
 
           echo ::add-path::$PWD/Libraries/depot_tools

.github/workflows/snap.yml

@@ -47,10 +47,6 @@ jobs:
           md5cache=$(md5sum CMAKE_CACHE_KEY.txt | cut -c -32)
           echo ::set-env name=CMAKE_CACHE_KEY::$md5cache
 
-          awk -v RS="" -v ORS="\n\n" '/^  enchant:/' snap/snapcraft.yaml > ENCHANT_CACHE_KEY.txt
-          md5cache=$(md5sum ENCHANT_CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=ENCHANT_CACHE_KEY::$md5cache
-
       - name: CMake cache.
         id: cache-cmake
         uses: actions/cache@v1
@@ -62,17 +58,6 @@ jobs:
         if: steps.cache-cmake.outputs.cache-hit != 'true'
         run: snapcraft build --destructive-mode cmake
 
-      - name: Enchant cache.
-        id: cache-enchant
-        uses: actions/cache@v1
-        with:
-          path: parts/enchant
-          key: ${{ runner.OS }}-enchant-${{ env.CACHE_KEY }}-${{ env.ENCHANT_CACHE_KEY }}
-
-      - name: Enchant build.
-        if: steps.cache-enchant.outputs.cache-hit != 'true'
-        run: snapcraft build --destructive-mode enchant
-
       - name: Telegram Desktop snap build.
         if: env.ONLY_CACHE == 'false'
         run: snapcraft --destructive-mode
@@ -95,5 +80,5 @@ jobs:
 
       - name: Remove unneeded directories for cache.
         run: |
-          rm -rf parts/{cmake,enchant}/{build,src,ubuntu}
-          rm -rf parts/{cmake,enchant}/state/{stage,prime}
+          rm -rf parts/cmake/{build,src,ubuntu}
+          rm -rf parts/cmake/state/{stage,prime}

.github/workflows/win.yml

@@ -30,6 +30,8 @@ jobs:
       ONLY_CACHE: "false"
       MANUAL_CACHING: "2"
       DOC_PATH: "docs/building-msvc.md"
+      AUTO_CACHING: "1"
+
     steps:
       - name: Get repository name.
         shell: bash
@@ -69,6 +71,10 @@ jobs:
       - name: Generate cache key.
         shell: bash
         run: |
+          if [ "$AUTO_CACHING" == "1" ]; then
+            thisFile=$REPO_NAME/.github/workflows/win.yml
+            echo `md5sum $thisFile | awk '{ print $1 }'` >> CACHE_KEY.txt
+          fi
           echo ::set-env name=CACHE_KEY::`md5sum CACHE_KEY.txt | awk '{ print $1 }'`
 
       - name: Choco installs.

.gitmodules

@@ -64,3 +64,6 @@
 [submodule "Telegram/ThirdParty/libdbusmenu-qt"]
 	path = Telegram/ThirdParty/libdbusmenu-qt
 	url = https://github.com/desktop-app/libdbusmenu-qt.git
+[submodule "Telegram/ThirdParty/hunspell"]
+	path = Telegram/ThirdParty/hunspell
+	url = https://github.com/hunspell/hunspell

README.md

@@ -48,8 +48,8 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
 ## Build instructions
 
 * [Visual Studio 2019][msvc]
-* [Xcode 10][xcode]
-* [GYP/CMake on GNU/Linux][cmake]
+* [Xcode 11][xcode]
+* [CMake on GNU/Linux][cmake]
 
 [//]: # (LINKS)
 [telegram]: https://telegram.org