forked from pool/telegram-desktop
Accepting request 661265 from home:nuklly:branches:server:messaging
- Update to 1.5.2 * Bug fixes and other minor improvements. * Support for custom languages. * Interface scaling for large screens. * Video messages displayed in shared media. OBS-URL: https://build.opensuse.org/request/show/661265 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=57
This commit is contained in:
Xu Zhao
Git OBS Bridge
parent
544946b89e
commit
42629716f6
@ -1,7 +1,7 @@
|
||||
<constraints>
|
||||
<hardware>
|
||||
<physicalmemory>
|
||||
<size unit="G">16</size>
|
||||
<size unit="G">32</size>
|
||||
</physicalmemory>
|
||||
</hardware>
|
||||
</constraints>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a72bbc40d0689a3763713df255795876f2648442faa24f601abeae1dc7d4d007
|
||||
size 984650
|
||||
oid sha256:121e7b71cddf2c417c07af705f4e41e3eb5e63016293d2a5f6169325c5767c40
|
||||
size 1978295
|
||||
|
||||
1
patch.py
1
patch.py
@ -142,6 +142,7 @@ def process_telegram_linux(jsonobj):
|
||||
child.remove("'ibusplatforminputcontextplugin'")
|
||||
child.remove("'fcitxplatforminputcontextplugin'")
|
||||
child.remove("'himeplatforminputcontextplugin'")
|
||||
child.remove("'nimfplatforminputcontextplugin'")
|
||||
child.remove("'liblzma.a'")
|
||||
child.remove("'libopenal.a'")
|
||||
child.remove("'libavformat.a'")
|
||||
|
||||
@ -7,51 +7,11 @@ Index: tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc
|
||||
<qresource prefix="/qt">
|
||||
- <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
|
||||
</qresource>
|
||||
<<<<<<< ./tdesktop.patch.mine
|
||||
</RCC>
|
||||
Index: tdesktop-1.2.6/Telegram/SourceFiles/core/launcher.cpp
|
||||
===================================================================
|
||||
--- tdesktop-1.2.6.orig/Telegram/SourceFiles/core/launcher.cpp
|
||||
+++ tdesktop-1.2.6/Telegram/SourceFiles/core/launcher.cpp
|
||||
@@ -44,9 +44,10 @@ void Launcher::init() {
|
||||
|
||||
QCoreApplication::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.
|
||||
QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
|
||||
-#endif // OS_MAC_OLD
|
||||
+#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0
|
||||
|
||||
initHook();
|
||||
}
|
||||
@@ -64,6 +65,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));
|
||||
Index: tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.h
|
||||
===================================================================
|
||||
--- tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.h
|
||||
+++ tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.h
|
||||
@@ -30,7 +30,7 @@ extern "C" {
|
||||
} // extern "C"
|
||||
|
||||
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
|
||||
-#include <unity/unity/unity.h>
|
||||
+typedef void UnityLauncherEntry;
|
||||
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
|
||||
#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
|
||||
|
||||
=======
|
||||
<qresource prefix="/fc">
|
||||
>>>>>>> ./tdesktop.patch.rc44a18716743178f1d760ce699dba268
|
||||
Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
@ -155,7 +115,7 @@ Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
===================================================================
|
||||
--- tdesktop-1.2.6.orig/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
+++ tdesktop-1.2.6/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
|
||||
@@ -28,14 +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
|
||||
@ -168,42 +128,8 @@ Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_static_plugins.cpp
|
||||
-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
|
||||
Index: tdesktop-1.2.6/Telegram/SourceFiles/ui/text/text.cpp
|
||||
===================================================================
|
||||
--- tdesktop-1.2.6.orig/Telegram/SourceFiles/ui/text/text.cpp
|
||||
+++ tdesktop-1.2.6/Telegram/SourceFiles/ui/text/text.cpp
|
||||
@@ -1707,11 +1707,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();
|
||||
Index: tdesktop-1.2.6/Telegram/SourceFiles/ui/twidget.cpp
|
||||
===================================================================
|
||||
--- tdesktop-1.2.6.orig/Telegram/SourceFiles/ui/twidget.cpp
|
||||
+++ tdesktop-1.2.6/Telegram/SourceFiles/ui/twidget.cpp
|
||||
@@ -248,9 +248,9 @@ void sendSynteticMouseEvent(QWidget *wid
|
||||
, 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);
|
||||
Index: tdesktop-1.2.6/Telegram/gyp/PrecompiledHeader.cmake
|
||||
===================================================================
|
||||
--- tdesktop-1.2.6.orig/Telegram/gyp/PrecompiledHeader.cmake
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 22 01:33:03 UTC 2018 - Xu Zhao <i@xuzhao.net>
|
||||
|
||||
- Update to 1.5.2
|
||||
* Bug fixes and other minor improvements.
|
||||
* Support for custom languages.
|
||||
* Interface scaling for large screens.
|
||||
* Video messages displayed in shared media.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 17 17:22:35 UTC 2018 - Xu Zhao <i@xuzhao.net>
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: telegram-desktop
|
||||
Version: 1.4.7
|
||||
Version: 1.5.2
|
||||
Release: 0
|
||||
Summary: Messaging application with a focus on speed and security
|
||||
License: GPL-3.0-only
|
||||
@ -143,7 +143,7 @@ mv variant-master variant
|
||||
mv variant %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
|
||||
|
||||
cp %{_sourcedir}/libtgvoip.zip . && unzip libtgvoip.zip
|
||||
mv libtgvoip-public libtgvoip
|
||||
mv libtgvoip-master libtgvoip
|
||||
mv libtgvoip %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
|
||||
|
||||
cp %{_sourcedir}/range-v3-master.zip . && unzip range-v3-master.zip
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04a327d09f6333ddcef817e5b9df010694034a55323a7f6601e2e912b379011a
|
||||
size 14080504
|
||||
3
v1.5.2.tar.gz
Normal file
3
v1.5.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce517d621a27c50d9fe31cb6ac604963156f663e4ed4d150d3850bf9fe227a25
|
||||
size 14107995
|
||||
Loading…
Reference in New Issue
Block a user