Version 4.3.4.

- Fix OpenGL regression in Qt and language detection.
Update patches on Linux
2022-11-25 12:21:45 +01:00 · 2022-11-25 12:20:12 +01:00 · 2022-11-25 12:20:12 +01:00 · 2022-11-25 12:20:12 +01:00 · 2022-11-25 12:20:12 +01:00 · 2022-11-25 12:20:12 +01:00
16 changed files with 60 additions and 38 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -51,7 +51,7 @@ jobs:

    defaults:
      run:
-        shell: scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}
+        shell: scl enable rh-python38 -- scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash --noprofile --norc -eo pipefail {0}

    strategy:
      matrix:
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,6 +100,3 @@
 [submodule "Telegram/ThirdParty/cld3"]
 	path = Telegram/ThirdParty/cld3
 	url = https://github.com/google/cld3.git
-[submodule "Telegram/ThirdParty/sonnet"]
-	path = Telegram/ThirdParty/sonnet
-	url = https://github.com/KDE/sonnet.git
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
  <Identity Name="TelegramMessengerLLP.TelegramDesktop"
    ProcessorArchitecture="ARCHITECTURE"
    Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.3.3.0" />
+    Version="4.3.4.0" />
  <Properties>
    <DisplayName>Telegram Desktop</DisplayName>
    <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,3,3,0
- PRODUCTVERSION 4,3,3,0
+ FILEVERSION 4,3,4,0
+ PRODUCTVERSION 4,3,4,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram FZ-LLC"
            VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.3.3.0"
+            VALUE "FileVersion", "4.3.4.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2022"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.3.3.0"
+            VALUE "ProductVersion", "4.3.4.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,3,3,0
- PRODUCTVERSION 4,3,3,0
+ FILEVERSION 4,3,4,0
+ PRODUCTVERSION 4,3,4,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram FZ-LLC"
            VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.3.3.0"
+            VALUE "FileVersion", "4.3.4.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2022"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.3.3.0"
+            VALUE "ProductVersion", "4.3.4.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 4003003;
-constexpr auto AppVersionStr = "4.3.3";
+constexpr auto AppVersion = 4003004;
+constexpr auto AppVersionStr = "4.3.4";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
--- a/Telegram/ThirdParty/sonnet
+++ b/Telegram/ThirdParty/sonnet
--- a/Telegram/build/docker/build.sh
+++ b/Telegram/build/docker/build.sh
@@ -15,10 +15,6 @@ if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
  exit
 fi

-Run () {
-  scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- "$@"
-}
-
 HomePath="$FullScriptPath/../.."
 cd $HomePath

@@ -30,10 +26,10 @@ if [ ! -f "/usr/bin/cmake" ]; then
  ln -s cmake3 /usr/bin/cmake
 fi

-Run ./configure.sh
+./configure.sh

 cd $ProjectPath
-Run cmake --build . --config Release --target Telegram
+cmake --build . --config Release --target Telegram
 cd $ReleasePath

 echo "$BinaryName build complete!"
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -21,7 +21,7 @@ ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/loc
 RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
 	&& yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm \
 	&& yum -y install centos-release-scl \
-	&& yum -y install git python3-pip autoconf automake libtool patch \
+	&& yum -y install git rh-python38-python-pip autoconf automake libtool patch \
 		fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
 		pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel \
 		libdrm-devel vulkan-devel gtk3-devel \
@@ -31,15 +31,15 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 		llvm-toolset-7.0-llvm-devel \
 	&& yum clean all

-RUN python3 -m pip install meson ninja
-
 # Fix a bug with argument naming in CentOS 7 glibc
 RUN sed -i 's/char \*__block/char */' /usr/include/unistd.h

-SHELL [ "bash", "-c", ". /opt/rh/devtoolset-10/enable; exec bash -c \"$@\"", "-s"]
+SHELL [ "bash", "-c", ". /opt/rh/rh-python38/enable; . /opt/rh/devtoolset-10/enable; exec bash -c \"$@\"", "-s"]

 WORKDIR {{ LibrariesPath }}

+RUN python3 -m pip install meson ninja
+
 RUN mkdir /opt/cmake \
 	&& curl -sSLo {{ CMAKE_FILE }} {{ GIT }}/Kitware/CMake/releases/download/v{{ CMAKE_VER }}/{{ CMAKE_FILE }} \
 	&& sh {{ CMAKE_FILE }} --prefix=/opt/cmake --skip-license \
@@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS
 FROM builder AS patches
 RUN git clone {{ GIT }}/desktop-app/patches.git \
 	&& cd patches \
-	&& git checkout 4f755b92cb \
+	&& git checkout c1f8effd69 \
 	&& rm -rf .git

 FROM builder AS nasm
@@ -825,4 +825,5 @@ COPY --link --from=webrtc_debug {{ LibrariesPath }}/tg_owt/out/Debug tg_owt/out/

 WORKDIR ../tdesktop
 VOLUME [ "/usr/src/tdesktop" ]
+ENTRYPOINT [ "scl", "enable", "rh-python38", "--", "scl", "enable", "llvm-toolset-7.0", "--", "scl", "enable", "devtoolset-10", "--" ]
 CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]
--- a/Telegram/build/docker/centos_env/build.sh
+++ b/Telegram/build/docker/centos_env/build.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash
+#!/bin/bash

 cd Telegram
 ./configure.sh "$@"
--- a/Telegram/build/docker/centos_env/run.sh
+++ b/Telegram/build/docker/centos_env/run.sh
@@ -15,7 +15,7 @@ fi

 Command="$1"
 if [ "$Command" == "" ]; then
-  Command="scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash"
+  Command="bash"
 fi

 docker run -it --rm --cpus=8 --memory=22g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4003003
+AppVersion         4003004
 AppVersionStrMajor 4.3
-AppVersionStrSmall 4.3.3
-AppVersionStr      4.3.3
+AppVersionStrSmall 4.3.4
+AppVersionStr      4.3.4
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.3.3
+AppVersionOriginal 4.3.4
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.3.4 (25.11.22)
+
+- Fix OpenGL regression in Qt and language detection.
+
 4.3.3 (23.11.22)

 - Fix an issue with media auto-download on Windows.
--- a/2
+++ b/2
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -15,7 +15,9 @@ architectures:

 apps:
  telegram-desktop:
-    command: bin/desktop-launch telegram-desktop
+    command: usr/bin/telegram-desktop
+    command-chain:
+      - bin/desktop-launch
    common-id: org.telegram.desktop
    desktop: usr/share/applications/org.telegram.desktop.desktop
    environment:
@@ -158,6 +160,7 @@ parts:
      - mozjpeg
      - openal
      - openssl
+      - protobuf
      - rnnoise
      - webrtc

@@ -217,8 +220,8 @@ parts:
    source-tag: 2.72.1
    plugin: meson
    build-packages:
-      - curl
      - meson
+      - mm-common
      - ninja-build
      - libglib2.0-dev
      - libxml-parser-perl
@@ -232,7 +235,6 @@ parts:
      - -Dsigc++-3.0:build-documentation=false
      - -Dsigc++-3.0:build-examples=false
      - -Dsigc++-3.0:validation=false
-      - -Dmm-common:use-network=true
    prime:
      - -./usr/include
      - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
@@ -338,6 +340,29 @@ parts:
      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
      - -./usr/share

+  protobuf:
+    source: https://github.com/protocolbuffers/protobuf.git
+    source-depth: 1
+    source-tag: v21.9
+    plugin: cmake
+    build-packages:
+      - zlib1g-dev
+    stage-packages:
+      - zlib1g
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DBUILD_SHARED_LIBS=ON
+      - -Dprotobuf_BUILD_TESTS=OFF
+      - -Dprotobuf_BUILD_LIBPROTOC=ON
+    prime:
+      - -./usr/bin
+      - -./usr/include
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET/cmake
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
+
  qt:
    plugin: nil
    build-packages:
Author	SHA1	Message	Date
John Preston	b474db2106	Version 4.3.4. - Fix OpenGL regression in Qt and language detection.	2022-11-25 12:21:45 +01:00
Ilya Fedin	ca408828c1	Update patches on Linux	2022-11-25 12:20:12 +01:00
Ilya Fedin	d63e483615	Use command-chain for desktop-launch in snap	2022-11-25 12:20:12 +01:00
Ilya Fedin	bea3e5d48f	Add mm-common to glibmm build-packages	2022-11-25 12:20:12 +01:00
Ilya Fedin	8b20c27ba7	Add protobuf to snap	2022-11-25 12:20:12 +01:00
Ilya Fedin	e561f93d44	Revert "Implement sonnet-based language detection backend" This reverts commit `4b2d8b0c53`.	2022-11-25 12:20:12 +01:00
Ilya Fedin	5df4dd36a7	Update Python to 3.8 in Docker	2022-11-25 11:14:15 +01:00