From dbc9f041efda373b95888447ef4b2490bcbef9f8 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Mon, 20 Nov 2017 22:59:18 +0200 Subject: [PATCH] Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock. From dba8b962c805af477ceee699aa1c05143aa19d43 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 31 Mar 2017 14:29:58 +0200 --- Telegram/SourceFiles/main.cpp | 12 ++- Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++ Telegram/SourceFiles/qt_static_plugins.cpp | 9 -- Telegram/SourceFiles/ui/text/text.cpp | 6 +- Telegram/SourceFiles/ui/text/text_block.cpp | 2 +- Telegram/SourceFiles/ui/twidget.cpp | 4 +- Telegram/gyp/PrecompiledHeader.cmake | 4 +- Telegram/gyp/Telegram.gyp | 10 +-- Telegram/gyp/qt.gypi | 80 +++++------------- Telegram/gyp/qt_rcc.gypi | 2 +- Telegram/gyp/settings_linux.gypi | 8 +- Telegram/gyp/telegram_linux.gypi | 49 ++--------- Telegram/gyp/telegram_sources.txt | 8 +- lib/xdg/telegramdesktop.appdata.xml | 2 +- lib/xdg/telegramdesktop.desktop | 6 +- 15 files changed, 153 insertions(+), 143 deletions(-) create mode 100644 Telegram/SourceFiles/qt_functions.cpp diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index 6e85f27dc..5b29d3f11 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -23,9 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" int main(int argc, char *argv[]) { -#ifndef Q_OS_MAC // Retina display support is working fine, others are not. +#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + // Retina display support is working fine, others are not. QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); -#endif // Q_OS_MAC +#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 QCoreApplication::setApplicationName(qsl("TelegramDesktop")); InitFromCommandLine(argc, argv); @@ -38,6 +39,13 @@ int main(int argc, char *argv[]) { // both are finished in Application::closeApplication Logs::start(); // must be started before Platform is started Platform::start(); // must be started before QApplication is created +#if defined(Q_OS_LINUX64) + QCoreApplication::addLibraryPath("/usr/lib64/qt5/plugins"); +#else + QCoreApplication::addLibraryPath("/usr/lib/qt5/plugins"); +#endif + setenv("QT_STYLE_OVERRIDE", "qwerty", false); + unsetenv("QT_QPA_PLATFORMTHEME"); int result = 0; { 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 b975c7a84..f2f876b30 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp @@ -28,13 +28,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) #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 1490772fa..02d06e676 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -1690,11 +1690,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 f89644e1d..35230cfc6 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp @@ -330,7 +330,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi SignalHandlers::setCrashAnnotationRef("CrashString", &part); QStackTextEngine engine(part, blockFont->f); - QTextLayout layout(&engine); + QTextLayout layout(part, blockFont->f); layout.beginLayout(); layout.createLine(); diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp index e9848ef25..dcee47ee8 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -191,9 +191,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 5d6830e96..c3f08d3f6 100644 --- a/Telegram/gyp/PrecompiledHeader.cmake +++ b/Telegram/gyp/PrecompiledHeader.cmake @@ -112,7 +112,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}" "$(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)") @@ -123,7 +123,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}" "$(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 ${_name} for ${_target} (C++)") diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index a0833db87..a8cf988ba 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -31,7 +31,6 @@ 'src_loc': '../SourceFiles', 'res_loc': '../Resources', 'submodules_loc': '../ThirdParty', - 'minizip_loc': '<(submodules_loc)/minizip', 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap', 'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions', 'style_files': [ @@ -80,31 +79,24 @@ 'codegen.gyp:codegen_lang', 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', - 'tests/tests.gyp:tests', - 'utils.gyp:Updater', - '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', ], 'defines': [ - 'AL_LIBTYPE_STATIC', - 'AL_ALEXT_PROTOTYPES', 'TGVOIP_USE_CXX11_LIB', '__STDC_FORMAT_MACROS', 'TDESKTOP_DISABLE_AUTOUPDATE', 'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME', 'TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION', 'TDESKTOP_DISABLE_CRASH_REPORTS', + 'TDESKTOP_DISABLE_UNITY_INTEGRATION', ], 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', - '<(libs_loc)/breakpad/src', - '<(minizip_loc)', '<(sp_media_key_tap_loc)', '<(emoji_suggestions_loc)', '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', ], 'sources': [ '<@(qrc_files)', diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi index 34bdc21d7..1fba4ec88 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -27,14 +27,11 @@ [ 'build_macold', { 'qt_version%': '5.3.2', }, { - 'qt_version%': '5.6.2', + 'qt_version%': ' createPlatformIntegration -> QXcbIntegrationPlugin::create #'xkbcommon', ], - 'linux_path_breakpad%': '<(libs_loc)/breakpad', - 'linux_path_opus_include%': '<(libs_loc)/opus/include', }, 'include_dirs': [ - '/usr/include', - '/usr/include/ffmpeg', - '<(linux_path_breakpad)/include/breakpad', - '<(linux_path_opus_include)', + ' /dev/null --libs <@(pkgconfig_libs))', ], 'conditions': [['not_need_gtk!="True"', { 'cflags_cc': [ ' /dev/null --cflags appindicator-0.1)', - ' /dev/null --cflags gtk+-2.0)', - ' /dev/null --cflags glib-2.0)', + ' /dev/null --cflags gtk+-3.0)', ' /dev/null --cflags dee-1.0)', ], }]], 'configurations': { 'Release': { 'cflags': [ - '-Ofast', '-flto', '-fno-strict-aliasing', ], 'cflags_cc': [ - '-Ofast', '-flto', '-fno-strict-aliasing', ], 'ldflags': [ - '-Ofast', - '-flto', ], }, }, diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index fd17f0ea3..86d750bf9 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -597,13 +597,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.h platforms: !win -<(minizip_loc)/crypt.h -<(minizip_loc)/ioapi.c -<(minizip_loc)/ioapi.h -<(minizip_loc)/zip.c -<(minizip_loc)/zip.h -<(minizip_loc)/unzip.c -<(minizip_loc)/unzip.h +<(src_loc)/qt_functions.cpp platforms: mac <(sp_media_key_tap_loc)/SPMediaKeyTap.m diff --git a/lib/xdg/telegramdesktop.appdata.xml b/lib/xdg/telegramdesktop.appdata.xml index 7bcf8d835..4508c01cd 100644 --- a/lib/xdg/telegramdesktop.appdata.xml +++ b/lib/xdg/telegramdesktop.appdata.xml @@ -1,6 +1,6 @@ - org.telegram.desktop + telegram-desktop.desktop CC0-1.0 GPL-3.0 Telegram Desktop diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop index 0a8069512..550b9f785 100644 --- a/lib/xdg/telegramdesktop.desktop +++ b/lib/xdg/telegramdesktop.desktop @@ -1,9 +1,11 @@ [Desktop Entry] Version=1.0 Name=Telegram Desktop +GenericName=Telegram Desktop +Keywords=IM;Chat; Comment=Official desktop version of Telegram messaging app -Exec=telegram-desktop -- %u -Icon=telegram +Exec=/usr/bin/telegram-desktop -- %u +Icon=telegram-desktop Terminal=false StartupWMClass=TelegramDesktop Type=Application