From 42629716f6f8380b97f859b690bad0c955fe8a5033648d794450140b34bb7d67 Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Mon, 24 Dec 2018 16:45:04 +0000 Subject: [PATCH] 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 --- _constraints | 2 +- libtgvoip.zip | 4 +- patch.py | 1 + tdesktop.patch | 86 +++------------------------------------- telegram-desktop.changes | 9 +++++ telegram-desktop.spec | 4 +- v1.4.7.tar.gz | 3 -- v1.5.2.tar.gz | 3 ++ 8 files changed, 24 insertions(+), 88 deletions(-) delete mode 100644 v1.4.7.tar.gz create mode 100644 v1.5.2.tar.gz diff --git a/_constraints b/_constraints index 6b9e418..f65a272 100644 --- a/_constraints +++ b/_constraints @@ -1,7 +1,7 @@ - 16 + 32 diff --git a/libtgvoip.zip b/libtgvoip.zip index 254f861..1551093 100644 --- a/libtgvoip.zip +++ b/libtgvoip.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a72bbc40d0689a3763713df255795876f2648442faa24f601abeae1dc7d4d007 -size 984650 +oid sha256:121e7b71cddf2c417c07af705f4e41e3eb5e63016293d2a5f6169325c5767c40 +size 1978295 diff --git a/patch.py b/patch.py index 41c5ce2..83104a0 100644 --- a/patch.py +++ b/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'") diff --git a/tdesktop.patch b/tdesktop.patch index 358da10..4655dcf 100644 --- a/tdesktop.patch +++ b/tdesktop.patch @@ -7,51 +7,11 @@ Index: tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc - ../etc/qt_linux.conf +<<<<<<< ./tdesktop.patch.mine -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 -+typedef void UnityLauncherEntry; - #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION - #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - +======= + +>>>>>>> ./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 diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 48c2aa3..4d9dd84 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Dec 22 01:33:03 UTC 2018 - Xu Zhao + +- 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 diff --git a/telegram-desktop.spec b/telegram-desktop.spec index 6dae21d..2a897de 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -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 diff --git a/v1.4.7.tar.gz b/v1.4.7.tar.gz deleted file mode 100644 index 2e4a02d..0000000 --- a/v1.4.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04a327d09f6333ddcef817e5b9df010694034a55323a7f6601e2e912b379011a -size 14080504 diff --git a/v1.5.2.tar.gz b/v1.5.2.tar.gz new file mode 100644 index 0000000..db3e53e --- /dev/null +++ b/v1.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce517d621a27c50d9fe31cb6ac604963156f663e4ed4d150d3850bf9fe227a25 +size 14107995