From decd02e437f2955ebed3893ae830d7376b7a6ec9 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Thu, 11 Jan 2024 17:33:15 +0100 Subject: [PATCH] automatic version update by autodist [release 4.14.4-1mamba;Wed Jan 10 2024] --- telegram-1.5.15-libtgvoip.patch | 18 - telegram-1.5.15-no-gtk2.patch | 29 - telegram-1.5.15-tdesktop.patch | 539 ------------------ ...m-2.7.4-add_missing_include_optional.patch | 10 - telegram-2.7.4-fix-webview-includes.patch | 12 - telegram-4.0.2-fix-tgcalls-cstdint.patch | 12 - telegram.spec | 26 +- 7 files changed, 7 insertions(+), 639 deletions(-) delete mode 100644 telegram-1.5.15-libtgvoip.patch delete mode 100644 telegram-1.5.15-no-gtk2.patch delete mode 100644 telegram-1.5.15-tdesktop.patch delete mode 100644 telegram-2.7.4-add_missing_include_optional.patch delete mode 100644 telegram-2.7.4-fix-webview-includes.patch delete mode 100644 telegram-4.0.2-fix-tgcalls-cstdint.patch diff --git a/telegram-1.5.15-libtgvoip.patch b/telegram-1.5.15-libtgvoip.patch deleted file mode 100644 index 8e838df..0000000 --- a/telegram-1.5.15-libtgvoip.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/libtgvoip.gyp b/libtgvoip.gyp -index 52fbea1..9a4dfb7 100644 ---- a/libtgvoip.gyp -+++ b/libtgvoip.gyp -@@ -13,11 +13,12 @@ - 'variables': { - 'tgvoip_src_loc': '.', - 'official_build_target%': '', -- 'linux_path_opus_include%': '<(DEPTH)/../../../Libraries/opus/include', -+ 'linux_path_opus_include%': '/usr/include/opus', - }, - 'include_dirs': [ - '<(tgvoip_src_loc)/webrtc_dsp', - '<(linux_path_opus_include)', -+ '/usr/include/openssl' - ], - 'direct_dependent_settings': { - 'include_dirs': [ diff --git a/telegram-1.5.15-no-gtk2.patch b/telegram-1.5.15-no-gtk2.patch deleted file mode 100644 index 29f3bb9..0000000 --- a/telegram-1.5.15-no-gtk2.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp -index f8d74fee1..c9d059fa6 100644 ---- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp -+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp -@@ -240,24 +240,12 @@ void start() { - indicatorLoaded = setupAppIndicator(lib_indicator); - } - } -- if (!gtkLoaded || !indicatorLoaded) { -- if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) { -- if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { -- gtkLoaded = indicatorLoaded = false; -- gtkLoaded = setupGtkBase(lib_gtk); -- indicatorLoaded = setupAppIndicator(lib_indicator); -- } -- } -- } - - // If no appindicator, try at least load gtk. - if (!gtkLoaded && !indicatorLoaded) { - if (loadLibrary(lib_gtk, "gtk-3", 0)) { - gtkLoaded = setupGtkBase(lib_gtk); - } -- if (!gtkLoaded && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { -- gtkLoaded = setupGtkBase(lib_gtk); -- } - } - - if (gtkLoaded) { diff --git a/telegram-1.5.15-tdesktop.patch b/telegram-1.5.15-tdesktop.patch deleted file mode 100644 index c976d64..0000000 --- a/telegram-1.5.15-tdesktop.patch +++ /dev/null @@ -1,539 +0,0 @@ -diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc -index 0554fa179..3ea027406 100644 ---- a/Telegram/Resources/qrc/telegram_linux.qrc -+++ b/Telegram/Resources/qrc/telegram_linux.qrc -@@ -1,5 +1,4 @@ - - -- ../etc/qt_linux.conf - - -diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index d4bdadc17..8a420c74b 100644 ---- a/Telegram/SourceFiles/core/launcher.cpp -+++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -39,9 +39,10 @@ void Launcher::init() { - - QApplication::setApplicationName(qsl("TelegramDesktop")); - --#ifndef OS_MAC_OLD -+#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -+ // Retina display support is working fine, others are not. - QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); --#endif // OS_MAC_OLD -+#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 - - initHook(); - } -@@ -59,6 +60,13 @@ int Launcher::exec() { - Logs::start(this); // must be started before Platform is started - Platform::start(); // must be started before QApplication is created - -+ // I don't know why path is not in QT_PLUGIN_PATH by default -+ QCoreApplication::addLibraryPath("/usr/lib/qt/plugins"); -+ // without this Telegram doesn't start on Ubuntu 17.04 due GTK errors -+ setenv("QT_STYLE_OVERRIDE", "qwerty", false); -+ // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943 -+ unsetenv("QT_QPA_PLATFORMTHEME"); -+ - auto result = executeApplication(); - - DEBUG_LOG(("Telegram finished, result: %1").arg(result)); -diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp -new file mode 100644 -index 000000000..4a722b8d7 ---- /dev/null -+++ b/Telegram/SourceFiles/qt_functions.cpp -@@ -0,0 +1,94 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2015 The Qt Company Ltd. -+** Contact: http://www.qt.io/licensing/ -+** -+** This file contains some parts of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL21$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see http://www.qt.io/terms-conditions. For further -+** information use the contact form at http://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 or version 3 as published by the Free -+** Software Foundation and appearing in the file LICENSE.LGPLv21 and -+** LICENSE.LGPLv3 included in the packaging of this file. Please review the -+** following information to ensure the GNU Lesser General Public License -+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** As a special exception, The Qt Company gives you certain additional -+** rights. These rights are described in The Qt Company LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/* TODO: find a dynamic library with these symbols. */ -+ -+/* Debian maintainer: this function is taken from qfiledialog.cpp */ -+/* -+ Makes a list of filters from ;;-separated text. -+ Used by the mac and windows implementations -+*/ -+QStringList qt_make_filter_list(const QString &filter) -+{ -+ QString f(filter); -+ -+ if (f.isEmpty()) -+ return QStringList(); -+ -+ QString sep(QLatin1String(";;")); -+ int i = f.indexOf(sep, 0); -+ if (i == -1) { -+ if (f.indexOf(QLatin1Char('\n'), 0) != -1) { -+ sep = QLatin1Char('\n'); -+ i = f.indexOf(sep, 0); -+ } -+ } -+ -+ return f.split(sep); -+} -+ -+/* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */ -+QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format) -+ : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format), -+ num_chars(numChars), chars(chars_), logClusters(0), f(font), glyphs(g), fontEngine(fe) -+{ -+} -+ -+/* Debian maintainer: this method is also taken from qtextengine.cpp */ -+// Fix up flags and underlineStyle with given info -+void QTextItemInt::initWithScriptItem(const QScriptItem &si) -+{ -+ // explicitly initialize flags so that initFontAttributes can be called -+ // multiple times on the same TextItem -+ flags = 0; -+ if (si.analysis.bidiLevel %2) -+ flags |= QTextItem::RightToLeft; -+ ascent = si.ascent; -+ descent = si.descent; -+ -+ if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) { -+ underlineStyle = charFormat.underlineStyle(); -+ } else if (charFormat.boolProperty(QTextFormat::FontUnderline) -+ || f->d->underline) { -+ underlineStyle = QTextCharFormat::SingleUnderline; -+ } -+ -+ // compat -+ if (underlineStyle == QTextCharFormat::SingleUnderline) -+ flags |= QTextItem::Underline; -+ -+ if (f->d->overline || charFormat.fontOverline()) -+ flags |= QTextItem::Overline; -+ if (f->d->strikeOut || charFormat.fontStrikeOut()) -+ flags |= QTextItem::StrikeOut; -+} -diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index a757d085f..122ff0f5d 100644 ---- a/Telegram/SourceFiles/qt_static_plugins.cpp -+++ b/Telegram/SourceFiles/qt_static_plugins.cpp -@@ -15,14 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) - Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) - Q_IMPORT_PLUGIN(QGenericEnginePlugin) - #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC --Q_IMPORT_PLUGIN(QWebpPlugin) --Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) --Q_IMPORT_PLUGIN(QConnmanEnginePlugin) --Q_IMPORT_PLUGIN(QGenericEnginePlugin) --Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin) --Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) --Q_IMPORT_PLUGIN(NimfInputContextPlugin) - #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX -diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp -index 944f58479..887c1982f 100644 ---- a/Telegram/SourceFiles/ui/text/text.cpp -+++ b/Telegram/SourceFiles/ui/text/text.cpp -@@ -1750,11 +1750,11 @@ private: - if (item == -1) - return; - --#ifdef OS_MAC_OLD -+#if defined(OS_MAC_OLD) || QT_VERSION < QT_VERSION_CHECK(5, 6, 0) - auto end = _e->findItem(line.from + line.length - 1); --#else // OS_MAC_OLD -+#else - auto end = _e->findItem(line.from + line.length - 1, item); --#endif // OS_MAC_OLD -+#endif - - auto blockIndex = _lineStartBlock; - auto currentBlock = _t->_blocks[blockIndex].get(); -diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp -index 2959cec77..04ad00645 100644 ---- a/Telegram/SourceFiles/ui/text/text_block.cpp -+++ b/Telegram/SourceFiles/ui/text/text_block.cpp -@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi - - QStackTextEngine engine(part, blockFont->f); - BlockParser parser(&engine, this, minResizeWidth, _from, part); -+ QTextLayout layout(part, blockFont->f); -+ layout.beginLayout(); -+ layout.createLine(); - - CrashReports::ClearAnnotationRef("CrashString"); - } -diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp -index 71f318229..461f52278 100644 ---- a/Telegram/SourceFiles/ui/twidget.cpp -+++ b/Telegram/SourceFiles/ui/twidget.cpp -@@ -233,9 +233,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton - , button - , QGuiApplication::mouseButtons() | button - , QGuiApplication::keyboardModifiers() --#ifndef OS_MAC_OLD -+#if !defined(OS_MAC_OLD) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) - , Qt::MouseEventSynthesizedByApplication --#endif // OS_MAC_OLD -+#endif - ); - ev.setTimestamp(getms()); - QGuiApplication::sendEvent(windowHandle, &ev); -diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake -index a0e1e0489..223113081 100644 ---- a/Telegram/gyp/PrecompiledHeader.cmake -+++ b/Telegram/gyp/PrecompiledHeader.cmake -@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input) - set(_compiler_FLAGS "@${_pch_c_flags_file}") - add_custom_command( - OUTPUT "${_output_c}" -- COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}" -+ COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} "$(C_DEFINES)" "$(C_INCLUDES)" "$(C_FLAGS)" -x c-header -o "${_output_c}" -c "${_pchfile}" - DEPENDS "${_pchfile}" "${_pch_c_flags_file}" - IMPLICIT_DEPENDS C "${_pch_header}" - COMMENT "Precompiling ${_name} for ${_target} (C)") -@@ -125,7 +125,7 @@ function(add_precompiled_header _target _input) - set(_compiler_FLAGS "@${_pch_cpp_flags_file}") - add_custom_command( - OUTPUT "${_output_cxx}" -- COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}" -+ COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}" - DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}" - IMPLICIT_DEPENDS CXX "${_pch_header}" - COMMENT "Precompiling header ${_name} for ${_target} (C++)") -diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index 1cab5ae29..465e8276a 100644 ---- a/Telegram/gyp/Telegram.gyp -+++ b/Telegram/gyp/Telegram.gyp -@@ -75,7 +75,6 @@ - 'codegen.gyp:codegen_numbers', - 'codegen.gyp:codegen_style', - 'tests/tests.gyp:tests', -- 'utils.gyp:Updater', - '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', - 'crl.gyp:crl', - 'lib_base.gyp:lib_base', -@@ -84,7 +83,6 @@ - ], - - 'defines': [ -- 'AL_LIBTYPE_STATIC', - 'AL_ALEXT_PROTOTYPES', - 'TGVOIP_USE_CXX11_LIB', - 'XXH_INLINE_ALL', -@@ -94,16 +92,8 @@ - 'include_dirs': [ - '<(src_loc)', - '<(SHARED_INTERMEDIATE_DIR)', -- '<(libs_loc)/breakpad/src', -- '<(libs_loc)/lzma/C', -- '<(libs_loc)/zlib', -- '<(libs_loc)/ffmpeg', -- '<(libs_loc)/openal-soft/include', -- '<(libs_loc)/opus/include', -- '<(libs_loc)/range-v3/include', -- '<(minizip_loc)', -- '<(sp_media_key_tap_loc)', - '<(emoji_suggestions_loc)', -+ '/usr/include/minizip', - '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', - '<(submodules_loc)/crl/src', -diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 0b783ec21..3f917765a 100644 ---- a/Telegram/gyp/qt.gypi -+++ b/Telegram/gyp/qt.gypi -@@ -14,25 +14,21 @@ - [ 'build_macold', { - 'qt_version%': '5.3.2', - }, { -- 'qt_version%': '5.6.2', -+ 'qt_version%': ' /dev/null --libs <@(pkgconfig_libs))', - ], - 'cflags_cc': [ -@@ -97,9 +89,8 @@ - ], - }], ['not_need_gtk!="True"', { - 'cflags_cc': [ -- ' /dev/null --cflags gtk+-2.0)', -- ' /dev/null --cflags glib-2.0)', -- ' /dev/null --cflags dee-1.0)', -+ ' /dev/null --cflags appindicator3-0.1)', -+ ' /dev/null --cflags gtk+-3.0)', - ], - }], [' -+#include - - namespace base { - namespace Platform { diff --git a/telegram-2.7.4-fix-webview-includes.patch b/telegram-2.7.4-fix-webview-includes.patch deleted file mode 100644 index 6c54e0c..0000000 --- a/telegram-2.7.4-fix-webview-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h -index a7f0f97..c2b21c7 100644 ---- a/webview/platform/linux/webview_linux_webkit_gtk.h -+++ b/webview/platform/linux/webview_linux_webkit_gtk.h -@@ -14,6 +14,7 @@ extern "C" { - #include - #include - #include -+#include - #define signals public - } // extern "C" - diff --git a/telegram-4.0.2-fix-tgcalls-cstdint.patch b/telegram-4.0.2-fix-tgcalls-cstdint.patch deleted file mode 100644 index 88612eb..0000000 --- a/telegram-4.0.2-fix-tgcalls-cstdint.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tgcalls/utils/gzip.h b/tgcalls/utils/gzip.h -index a3f3ea2..7ae5cc5 100644 ---- a/tgcalls/utils/gzip.h -+++ b/tgcalls/utils/gzip.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - namespace tgcalls { - diff --git a/telegram.spec b/telegram.spec index d65d070..58599f9 100644 --- a/telegram.spec +++ b/telegram.spec @@ -1,6 +1,6 @@ Name: telegram Epoch: 1 -Version: 4.14.2 +Version: 4.14.4 Release: 1mamba Summary: The official desktop client for the Telegram messenger Group: Graphical Desktop/Applications/Internet @@ -11,12 +11,6 @@ URL: https://telegram.org/ Source: https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz Source1: telegramdesktop.desktop Source2: tg.protocol -Patch0: telegram-1.5.15-tdesktop.patch -Patch1: telegram-1.5.15-no-gtk2.patch -Patch2: telegram-1.5.15-libtgvoip.patch -Patch3: telegram-2.7.4-fix-webview-includes.patch -Patch4: telegram-2.7.4-add_missing_include_optional.patch -Patch5: telegram-4.0.2-fix-tgcalls-cstdint.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -84,22 +78,13 @@ The official desktop client for the Telegram messenger. %endif %prep -%setup -q -n tdesktop-%{version}-full -D -T -:<< _EOF -#%patch4 -p1 -#cd Telegram/lib_webview -#%patch3 -p1 -#rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl +%setup -q -n tdesktop-%{version}-full +#-D -T +#:<< _EOF rm -rf Telegram/ThirdParty/libtgvoip/webrtc_dsp/absl -#cd Telegram/ThirdParty/tgcalls -#%patch5 -p1 -#cd ../../.. -export PKG_CONFIG_PATH='%{_libdir}/ffmpeg4/pkgconfig' %build #:<< __EOF -#export PKG_CONFIG_PATH='%{_libdir}/ffmpeg4/pkgconfig' - %cmake -d build \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ @@ -153,6 +138,9 @@ fi %doc LICENSE LEGAL %changelog +* Wed Jan 10 2024 Automatic Build System 4.14.4-1mamba +- automatic version update by autodist + * Wed Jan 03 2024 Automatic Build System 4.14.2-1mamba - automatic version update by autodist