forked from pool/telegram-desktop
8743abd54f
- Remove the TDESKTOP_DISABLE_GTK_INTEGRATION macro in patch.py
* Enable the native notification on all platforms.
* Use GTK 2 theme by default to harmonize the
libqt5-prioritise-gtk2-platformtheme.patch (boo#1149986).
OBS-URL: https://build.opensuse.org/request/show/745561
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=112
110 lines
4.9 KiB
Diff
110 lines
4.9 KiB
Diff
diff --git a/Telegram/Resources/qrc/linux.qrc b/Telegram/Resources/qrc/linux.qrc
|
|
index 164e8d4f2..12319be14 100644
|
|
--- a/Telegram/Resources/qrc/linux.qrc
|
|
+++ b/Telegram/Resources/qrc/linux.qrc
|
|
@@ -1,6 +1,5 @@
|
|
<RCC>
|
|
<qresource prefix="/qt">
|
|
- <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
|
|
</qresource>
|
|
<qresource prefix="/fc">
|
|
<file alias="fc-custom.conf">../fc-custom.conf</file>
|
|
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
|
|
index 3ba28309b..e280c44fa 100644
|
|
--- a/Telegram/SourceFiles/core/launcher.cpp
|
|
+++ b/Telegram/SourceFiles/core/launcher.cpp
|
|
@@ -272,6 +272,19 @@ int Launcher::exec() {
|
|
Logs::start(this); // must be started before Platform is started
|
|
Platform::start(); // must be started before Sandbox is created
|
|
|
|
+ // I don't know why path is not in QT_PLUGIN_PATH by default
|
|
+ QCoreApplication::addLibraryPath("/usr/lib64/qt5/plugins");
|
|
+ // without this Telegram doesn't start on Ubuntu 17.04 due to 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");
|
|
+
|
|
+ // unset QT screen scale related envvars
|
|
+ unsetenv("QT_SCREEN_SCALE_FACTORS");
|
|
+ unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR");
|
|
+ unsetenv("QT_SCALE_FACTOR");
|
|
+ unsetenv("QT_DEVICE_PIXEL_RATIO");
|
|
+
|
|
auto result = executeApplication();
|
|
|
|
DEBUG_LOG(("Telegram finished, result: %1").arg(result));
|
|
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 7891995be..eaeb52b35 100644
|
|
--- a/Telegram/SourceFiles/ui/text/text.cpp
|
|
+++ b/Telegram/SourceFiles/ui/text/text.cpp
|
|
@@ -1968,11 +1968,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 29173c5c2..b47a53d76 100644
|
|
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
|
|
+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
|
|
@@ -334,6 +334,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();
|
|
}
|
|
}
|
|
|
|
diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
|
|
index dfe1193be..0b13fc098 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++)")
|