Updated to 4.12.2.

forkgram · Dec 1, 2023 · 92bd3da · 92bd3da
2 parents da67de0 + 85f5621
commit 92bd3da
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 25 deletions.
diff --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.12.1.0" />
+    Version="4.12.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

diff --git 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,12,1,0
- PRODUCTVERSION 4,12,1,0
+ FILEVERSION 4,12,2,0
+ PRODUCTVERSION 4,12,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", ""
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.12.1.0"
+            VALUE "FileVersion", "4.12.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.12.1.0"
+            VALUE "ProductVersion", "4.12.2.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git 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,12,1,0
- PRODUCTVERSION 4,12,1,0
+ FILEVERSION 4,12,2,0
+ PRODUCTVERSION 4,12,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", ""
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.12.1.0"
+            VALUE "FileVersion", "4.12.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.12.1.0"
+            VALUE "ProductVersion", "4.12.2.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/SourceFiles/core/fork_settings.cpp b/Telegram/SourceFiles/core/fork_settings.cpp
@@ -98,9 +98,11 @@ void ForkSettings::addFromSerialized(const QByteArray &serialized) {
 			>> emojiPopupOnClick
 			>> mentionByNameDisabled
 			>> primaryUnmutedMessages
-			>> addToMenuRememberMedia
 			;
 	}
+	if (!stream.atEnd()) {
+		stream >> addToMenuRememberMedia;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::ForkSettings::constructFromSerialized()"));

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
@@ -40,8 +40,9 @@ namespace {
 
 base::options::toggle OptionForceWaylandFractionalScaling({
 	.id = kOptionForceWaylandFractionalScaling,
-	.name = "Force enable fractional-scale-v1",
-	.description = "Enable fractional-scale-v1 on Wayland without "
+	.name = "Enable xdg-output fractional scaling",
+	.description = "Enable xdg-output based fractional scaling on Wayland. "
+		"This works without fractional-scale-v1 and without "
 		"precise High DPI scaling. "
 		"Requires Qt with Desktop App Toolkit patches.",
 	.scope = [] {

diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
@@ -24,7 +24,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 = 4012001;
-constexpr auto AppVersionStr = "4.12.1";
+constexpr auto AppVersion = 4012002;
+constexpr auto AppVersionStr = "4.12.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -181,6 +181,15 @@ PossibleItemReactionsRef LookupPossibleReactions(
 			}
 			return true;
 		});
+		if (allowed.type == AllowedReactionsType::Some) {
+			for (const auto &id : allowed.some) {
+				if (!added.contains(id)) {
+					if (const auto temp = reactions->lookupTemporary(id)) {
+						result.recent.push_back(temp);
+					}
+				}
+			}
+		}
 		result.customAllowed = (allowed.type == AllowedReactionsType::All)
 			&& premiumPossible;
 	}

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
@@ -54,7 +54,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 9c97723dce353833f54d644d0403b047ee148f6e \
+	&& git fetch --depth=1 origin 8b95f2787ee69f3ff16a62c68b39bb8bb3d0fa68 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
@@ -703,7 +703,22 @@ RUN git clone -b xkbcommon-1.6.0 --depth=1 {{ GIT }}/xkbcommon/libxkbcommon.git
 	&& cd .. \
 	&& rm -rf libxkbcommon
 
+FROM builder AS glib
+RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \
+	&& cd glib \
+	&& meson build \
+		--buildtype=plain \
+		--default-library=both \
+		-Dtests=false \
+		-Dmm-common:use-network=true \
+	&& meson compile -C build \
+	&& DESTDIR="{{ LibrariesPath }}/glib-cache" meson install -C build \
+	&& cd .. \
+	&& rm -rf glib
+
 FROM patches AS glibmm
+COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
+
 RUN git clone -b 2.78.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
 	&& cd glibmm \
 	&& git apply ../patches/glibmm.patch \
@@ -715,15 +730,14 @@ RUN git clone -b 2.78.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
 		-Dsigc++-3.0:build-documentation=false \
 		-Dsigc++-3.0:build-examples=false \
 		-Dsigc++-3.0:validation=false \
-		-Dglib:tests=false \
 		-Dmm-common:use-network=true \
 	&& meson compile -C build \
 	&& DESTDIR="{{ LibrariesPath }}/glibmm-cache" meson install -C build \
 	&& cd .. \
 	&& rm -rf glibmm
 
 FROM builder AS gobject-introspection
-COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
+COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
 
 RUN git clone -b 1.78.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \
 	&& cd gobject-introspection \
@@ -880,6 +894,7 @@ COPY --link --from=ffmpeg {{ LibrariesPath }}/ffmpeg-cache /
 COPY --link --from=openal {{ LibrariesPath }}/openal-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
+COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
 COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
 COPY --link --from=gobject-introspection {{ LibrariesPath }}/gobject-introspection-cache /
 COPY --link --from=qt {{ LibrariesPath }}/qt-cache /

diff --git a/Telegram/build/version b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4012001
+AppVersion         4012002
 AppVersionStrMajor 4.12
-AppVersionStrSmall 4.12.1
-AppVersionStr      4.12.1
+AppVersionStrSmall 4.12.2
+AppVersionStr      4.12.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.12.1
+AppVersionOriginal 4.12.2
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+4.12.2 (01.12.23)
+
+- Fix choosing custom reactions in channels.
+- Fix crash on launch using old hardware. (Windows)
+
 4.12.1 (01.12.23)
 
 - Fix assertion violation with imported messages.

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -259,6 +259,26 @@ parts:
     after:
       - mozjpeg
 
+  glib:
+    source: https://github.com/GNOME/glib.git
+    source-depth: 1
+    source-tag: 2.78.1
+    plugin: meson
+    build-packages:
+      - mm-common
+      - ninja-build
+    meson-parameters:
+      - --buildtype=release
+      - --prefix=/usr
+      - --strip
+      - -Dtests=false
+    prime:
+      - -./usr/include
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
+    after:
+      - meson-deps
+
   glibmm:
     source: https://github.com/GNOME/glibmm.git
     source-depth: 1
@@ -277,14 +297,13 @@ parts:
       - -Dsigc++-3.0:build-documentation=false
       - -Dsigc++-3.0:build-examples=false
       - -Dsigc++-3.0:validation=false
-      - -Dglib:tests=false
-      - -Dglib:introspection=disabled
     prime:
       - -./usr/include
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
     after:
       - meson-deps
+      - glib
 
   libjxl:
     source: https://github.com/libjxl/libjxl.git
@@ -523,7 +542,7 @@ parts:
       - -./usr/mkspecs
       - -./usr/modules
     after:
-      - glibmm
+      - glib
       - mozjpeg
       - patches
 
@@ -608,5 +627,5 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a
     after:
       - ffmpeg
-      - glibmm
+      - glib
       - mozjpeg