From 38815c1ca8a2aadd96f219d153c4f0e53591155e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 20 Sep 2021 11:16:21 +0400 Subject: [PATCH 01/12] Backport fonts hook from snapcraft extensions --- snap/snapcraft.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a543830bb..352af577c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -42,7 +42,16 @@ apps: slots: - tdesktop-mpris +hooks: + configure: + command-chain: + - bin/hooks-configure-desktop + plugs: + - desktop + plugs: + desktop: + mount-host-font-cache: false # Support for common GTK themes # https://forum.snapcraft.io/t/how-to-use-the-system-gtk-theme-via-the-gtk-common-themes-snap/6235 gsettings: From b2df781b7625596a0019f8fcd0da246c94158d1a Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 20 Sep 2021 16:05:25 +0400 Subject: [PATCH 02/12] Fix icon for Quit Telegram taskbar item in snap --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 352af577c..772a1961a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -143,7 +143,7 @@ parts: snapcraftctl set-version "$version" - sed -i 's|^Icon=.*|Icon=${SNAP}/meta/gui/icon.png|g' lib/xdg/telegramdesktop.desktop + sed -i 's|^Icon=telegram$|Icon=${SNAP}/meta/gui/icon.png|g' lib/xdg/telegramdesktop.desktop override-build: | snapcraftctl build rm -rf "$SNAPCRAFT_PART_INSTALL/usr/share/icons" From c1be1ca4ae5d58dae963957278bb1db2a7f0b75c Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 21 Sep 2021 18:11:24 +0400 Subject: [PATCH 03/12] Add ./build/prepare/linux.sh which builds docker. --- Telegram/build/prepare/linux.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 Telegram/build/prepare/linux.sh diff --git a/Telegram/build/prepare/linux.sh b/Telegram/build/prepare/linux.sh new file mode 100755 index 000000000..9aec7cfe3 --- /dev/null +++ b/Telegram/build/prepare/linux.sh @@ -0,0 +1,7 @@ +set -e +FullExecPath=$PWD +pushd `dirname $0` > /dev/null +FullScriptPath=`pwd` +popd > /dev/null + +./build/docker/centos_env/prepare.sh From a4b5b6e370c8b940c9f347e8b6d1185daaec81c2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 21 Sep 2021 21:29:37 +0400 Subject: [PATCH 04/12] Fix crash in lottie destructor. Fixes #16985. --- Telegram/lib_lottie | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie index 6fe29a2df..d134c0361 160000 --- a/Telegram/lib_lottie +++ b/Telegram/lib_lottie @@ -1 +1 @@ -Subproject commit 6fe29a2dfe8904559d31e3c9df5d51e9ed123011 +Subproject commit d134c0361ef96b5061c2719a0e984eaaed2c1a81 From eaa4c5e5b180f2810ca8c3f7496d49285cb7f167 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 22 Sep 2021 12:42:46 +0400 Subject: [PATCH 05/12] Fix caching by making a fake dir ThirdParty/gyp. --- Telegram/build/prepare/prepare.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 697794a18..6b41a0d0b 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -396,6 +396,7 @@ depends:patches/gyp.diff git apply $LIBS_DIR/patches/gyp.diff mac: python3 -m pip install git+https://github.com/nodejs/gyp-next@v0.10.0 + mkdir gyp """, 'ThirdParty') stage('yasm', """ From cf7693335213676ca09c0efec11dd73eb7918a61 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 22 Sep 2021 14:02:01 +0400 Subject: [PATCH 06/12] Fix saving tray "Toggle notifications" on relaunch. Fixes https://bugs.telegram.org/c/9509 --- Telegram/SourceFiles/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 8e5d3c95b..6171fdd8e 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -779,7 +779,7 @@ void MainWindow::toggleDisplayNotifyFromTray() { settings.setRememberedFlashBounceNotifyFromTray(false); } } - account().session().saveSettings(); + Core::App().saveSettingsDelayed(); using Change = Window::Notifications::ChangeType; auto ¬ifications = Core::App().notifications(); notifications.notifySettingsChanged(Change::DesktopEnabled); From 2f5bed2899d43092a7aa5c436b62565dca3dbd38 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 23 Sep 2021 17:37:29 +0400 Subject: [PATCH 07/12] Skip "contact joined" toast if disabled in Settings. The chats still appear (they are server-side), but skip the toast. --- Telegram/SourceFiles/data/data_types.h | 3 +++ Telegram/SourceFiles/history/history_item.cpp | 11 +++++++++++ Telegram/SourceFiles/history/history_item.h | 1 + Telegram/SourceFiles/history/history_service.cpp | 2 ++ .../SourceFiles/window/notifications_manager.cpp | 12 ++++-------- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h index 680ce3aa8..dc257df8e 100644 --- a/Telegram/SourceFiles/data/data_types.h +++ b/Telegram/SourceFiles/data/data_types.h @@ -341,6 +341,9 @@ enum class MessageFlag : uint32 { // Fake message for some UI element. FakeHistoryItem = (1U << 27), + + // Contact sign-up message, notification should be skipped for Silent. + IsContactSignUp = (1U << 28), }; inline constexpr bool is_flag_type(MessageFlag) { return true; } using MessageFlags = base::flags; diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 553bf54aa..b37aad5ad 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -459,6 +459,17 @@ bool HistoryItem::isScheduled() const { && (_flags & MessageFlag::IsOrWasScheduled); } +bool HistoryItem::skipNotification() const { + if (isSilent() && (_flags & MessageFlag::IsContactSignUp)) { + return true; + } else if (const auto forwarded = Get()) { + if (forwarded->imported) { + return true; + } + } + return false; +} + void HistoryItem::destroy() { _history->destroyMessage(this); } diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index 813c2e734..feaa262de 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -109,6 +109,7 @@ public: [[nodiscard]] bool isAdminLogEntry() const; [[nodiscard]] bool isFromScheduled() const; [[nodiscard]] bool isScheduled() const; + [[nodiscard]] bool skipNotification() const; void addLogEntryOriginal( WebPageId localId, diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp index 8775b3c02..f5eed00d6 100644 --- a/Telegram/SourceFiles/history/history_service.cpp +++ b/Telegram/SourceFiles/history/history_service.cpp @@ -554,6 +554,8 @@ void HistoryService::applyAction(const MTPMessageAction &action) { _flags |= MessageFlag::IsGroupEssential; }, [&](const MTPDmessageActionChannelMigrateFrom &) { _flags |= MessageFlag::IsGroupEssential; + }, [&](const MTPDmessageActionContactSignUp &) { + _flags |= MessageFlag::IsContactSignUp; }, [](const auto &) { }); } diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index d5f54c917..7a720bfca 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -98,25 +98,21 @@ System::SkipState System::skipNotification( not_null item) const { const auto history = item->history(); const auto notifyBy = item->specialNotificationPeer(); - if (App::quitting() || !history->currentNotification()) { + if (App::quitting() + || !history->currentNotification() + || item->skipNotification()) { return { SkipState::Skip }; } else if (!Core::App().settings().notifyFromAll() && &history->session().account() != &Core::App().domain().active()) { return { SkipState::Skip }; } - const auto scheduled = item->out() && item->isFromScheduled(); - - if (const auto forwarded = item->Get()) { - if (forwarded->imported) { - return { SkipState::Skip }; - } - } history->owner().requestNotifySettings(history->peer); if (notifyBy) { history->owner().requestNotifySettings(notifyBy); } + const auto scheduled = item->out() && item->isFromScheduled(); if (history->owner().notifyMuteUnknown(history->peer)) { return { SkipState::Unknown, item->isSilent() }; } else if (!history->owner().notifyIsMuted(history->peer)) { From 5c44b851fecde1f93d998e838fb13483b36209b1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 23 Sep 2021 17:39:39 +0400 Subject: [PATCH 08/12] One more attempt to fix crashes on context loss. --- Telegram/lib_ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegram/lib_ui b/Telegram/lib_ui index d81997194..29cfdad44 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit d81997194e74b2e0c207cc9dd7cafde845fcf390 +Subproject commit 29cfdad44c22cb653fe756e4e1fba0f172fb3ca7 From 132f127f3fc78b32cb204338dd3b24cdaea18543 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 24 Sep 2021 08:44:22 +0400 Subject: [PATCH 09/12] Add some assertions to debug a crash. --- .../editor/photo_editor_common.cpp | 2 ++ .../storage/storage_media_prepare.cpp | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/editor/photo_editor_common.cpp b/Telegram/SourceFiles/editor/photo_editor_common.cpp index 3d9b94427..4caa14e83 100644 --- a/Telegram/SourceFiles/editor/photo_editor_common.cpp +++ b/Telegram/SourceFiles/editor/photo_editor_common.cpp @@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Editor { QImage ImageModified(QImage image, const PhotoModifications &mods) { + Expects(!image.isNull()); + if (!mods) { return image; } diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp index a52010fee..bcd583d70 100644 --- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp +++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp @@ -40,6 +40,8 @@ bool HasExtensionFrom(const QString &file, const QStringList &extensions) { bool ValidPhotoForAlbum( const Image &image, const QString &mime) { + Expects(!image.data.isNull()); + if (image.animated || Core::IsMimeSticker(mime) || (!mime.isEmpty() && !mime.startsWith(u"image/"))) { @@ -228,6 +230,8 @@ PreparedList PrepareMediaFromImage( QImage &&image, QByteArray &&content, int previewWidth) { + Expects(!image.isNull()); + auto result = PreparedList(); auto file = PreparedFile(QString()); file.content = content; @@ -288,6 +292,7 @@ void PrepareDetails(PreparedFile &file, int previewWidth) { using Song = PreparedFileInformation::Song; if (const auto image = std::get_if( &file.information->media)) { + Assert(!image->data.isNull()); if (ValidPhotoForAlbum(*image, file.information->filemime)) { UpdateImageDetails(file, previewWidth); file.type = PreparedFile::Type::Photo; @@ -317,14 +322,18 @@ void UpdateImageDetails(PreparedFile &file, int previewWidth) { if (!image) { return; } - const auto &preview = image->modifications + Assert(!image->data.isNull()); + auto preview = image->modifications ? Editor::ImageModified(image->data, image->modifications) : image->data; + Assert(!preview.isNull()); file.shownDimensions = PrepareShownDimensions(preview); - file.preview = Images::prepareOpaque(preview.scaledToWidth( - std::min(previewWidth, style::ConvertScale(preview.width())) - * cIntRetinaFactor(), - Qt::SmoothTransformation)); + const auto scaled = preview.scaledToWidth( + (std::min(previewWidth, style::ConvertScale(preview.width())) + * cIntRetinaFactor()), + Qt::SmoothTransformation); + Assert(!scaled.isNull()); + file.preview = Images::prepareOpaque(scaled); Assert(!file.preview.isNull()); file.preview.setDevicePixelRatio(cRetinaFactor()); } From b47692e9201d947166db7ec5f057f05925077201 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 24 Sep 2021 08:46:52 +0400 Subject: [PATCH 10/12] Update patches revision. --- Telegram/build/docker/centos_env/Dockerfile | 2 +- Telegram/build/prepare/prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index a0d636fc5..94cf06538 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -29,7 +29,7 @@ ENV LibrariesPath /usr/src/Libraries WORKDIR $LibrariesPath FROM builder AS patches -RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 01779db1de +RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 9d2a07ba8b FROM builder AS extra-cmake-modules diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 6b41a0d0b..714eb0bc9 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -379,7 +379,7 @@ def runStages(): stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 1a1d9e6d2c + git checkout 9d2a07ba8b """) stage('depot_tools', """ From ec064a904db57a4b5f1efd436a90078013540019 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 24 Sep 2021 08:47:02 +0400 Subject: [PATCH 11/12] Version 3.1.1. - Crash fixes. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 4 ++++ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 19f45b6c0..eb8e6e53f 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="3.1.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 82ed99f56..e72b0f946 100644 --- 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 3,1,0,0 - PRODUCTVERSION 3,1,0,0 + FILEVERSION 3,1,1,0 + PRODUCTVERSION 3,1,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "3.1.0.0" + VALUE "FileVersion", "3.1.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "3.1.0.0" + VALUE "ProductVersion", "3.1.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 8afe4f568..28fd0f6ea 100644 --- 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 3,1,0,0 - PRODUCTVERSION 3,1,0,0 + FILEVERSION 3,1,1,0 + PRODUCTVERSION 3,1,1,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", "3.1.0.0" + VALUE "FileVersion", "3.1.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "3.1.0.0" + VALUE "ProductVersion", "3.1.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 085566f2b..108bf3ce3 100644 --- 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 = 3001000; -constexpr auto AppVersionStr = "3.1"; +constexpr auto AppVersion = 3001001; +constexpr auto AppVersionStr = "3.1.1"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 7ae599adc..acb6ca62b 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 3001000 +AppVersion 3001001 AppVersionStrMajor 3.1 -AppVersionStrSmall 3.1 -AppVersionStr 3.1.0 +AppVersionStrSmall 3.1.1 +AppVersionStr 3.1.1 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 3.1 +AppVersionOriginal 3.1.1 diff --git a/changelog.txt b/changelog.txt index 47df8a626..63bc49baf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +3.1.1 (24.09.21) + +- Crash fixes. + 3.1 (19.09.21) - Some animated emoji now have extra effects. From 0984e631fa09d606083f190c92ffde1800d3fc46 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 24 Sep 2021 22:43:30 +0400 Subject: [PATCH 12/12] Use opus built with cmake on Windows --- .github/workflows/win.yml | 14 +++++++++----- Telegram/build/prepare/prepare.py | 15 ++++++++++----- cmake | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 30e66c408..d860a75f0 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -259,12 +259,16 @@ jobs: - name: Opus. if: steps.cache-opus.outputs.cache-hit != 'true' run: | - git clone %GIT%/telegramdesktop/opus.git + git clone -b v1.3.1 %GIT%/xiph/opus.git cd opus - git checkout tdesktop - cd win32\VS2015 - msbuild -m opus.sln /property:Configuration=Debug /property:Platform="Win32" - msbuild -m opus.sln /property:Configuration=Release /property:Platform="Win32" + cmake -B out . ^ + -A Win32 ^ + -DCMAKE_INSTALL_PREFIX=%LibrariesPath%/local/opus ^ + -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^ + -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" + cmake --build out --config Debug + cmake --build out --config Release + cmake --install out --config Release - name: Rnnoise. run: | diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 714eb0bc9..bcd6aaedc 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -379,7 +379,7 @@ def runStages(): stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 9d2a07ba8b + git checkout 52e847920f """) stage('depot_tools', """ @@ -499,13 +499,18 @@ mac: """) stage('opus', """ - git clone -b td-v1.3.1 https://github.com/telegramdesktop/opus.git + git clone -b v1.3.1 https://github.com/xiph/opus.git cd opus win: - cd win32\\VS2015 - msbuild opus.sln /property:Configuration=Debug /property:Platform="%WIN32X64%" + cmake -B out . ^ + -A %WIN32X64% ^ + -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local/opus ^ + -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^ + -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" + cmake --build out --config Debug release: - msbuild opus.sln /property:Configuration=Release /property:Platform="%WIN32X64%" + cmake --build out --config Release + cmake --install out --config Release mac: ./autogen.sh CFLAGS="$MIN_VER $UNGUARDED" CPPFLAGS="$MIN_VER $UNGUARDED" LDFLAGS="$MIN_VER" ./configure --prefix=$USED_PREFIX diff --git a/cmake b/cmake index dbc1e4fb3..1dacc0ac4 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit dbc1e4fb358faeda2abec4f32336eab1d7552922 +Subproject commit 1dacc0ac4fe2a5cb0237e7c89fe5dd8906e1593f