rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 560904 from home:badshah400:branches:server:messaging

Browse Source 
- Update to version 1.2.6:
  * Grouped Photos: Group media into an album when sharing
    multiple photos and videos. Choose the exact order of media
    you send.
  * Bug fixes and other minor improvements.
- Add crl-master.zip from https://github.com/telegramdesktop/crl
  and copy it to build dir appropriately; this is now required
  for building.
- Rebase tdesktop.patch.

OBS-URL: https://build.opensuse.org/request/show/560904
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=32
This commit is contained in:
Xu Zhao 2017-12-31 21:04:54 +00:00 committed by Git OBS Bridge
parent 2499b63875
commit 593260124e
6 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crl-master.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:beb97cd41b64f984219cc0e3a392943570617656b034ad1fbe58a4feb551ad1b
size 50136

102
tdesktop.patch
View File

@ -1,18 +1,18 @@
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
Index: tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc
===================================================================
--- tdesktop-1.2.6.orig/Telegram/Resources/qrc/telegram_linux.qrc
+++ tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc
@@ -1,5 +1,4 @@
<RCC>
<qresource prefix="/qt">
- <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
</qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index c05915976..9b19941df 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -43,9 +43,10 @@ void Launcher::init() {
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"));
@ -25,7 +25,7 @@ index c05915976..9b19941df 100644
initHook();
}
@@ -63,6 +64,13 @@ int Launcher::exec() {
@@ -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
@ -36,13 +36,13 @@ index c05915976..9b19941df 100644
+ // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943
+ unsetenv("QT_QPA_PLATFORMTHEME");
+
auto result = 0;
{
Application app(this, _argc, _argv);
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index e9e349be9..d82963fa2 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
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"
@ -52,11 +52,10 @@ index e9e349be9..d82963fa2 100644
#endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
new file mode 100644
index 000000000..4a722b8d7
Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
===================================================================
--- /dev/null
+++ b/Telegram/SourceFiles/qt_functions.cpp
+++ tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
@ -152,10 +151,10 @@ index 000000000..4a722b8d7
+ 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
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)
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
@ -170,10 +169,10 @@ index b975c7a84..f2f876b30 100644
-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 710277fe2..5eb4465d6 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
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;
@ -189,24 +188,11 @@ index 710277fe2..5eb4465d6 100644
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 e435b50dc..893496b4f 100644
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
@@ -332,7 +332,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
CrashReports::SetAnnotationRef("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 a78af59dd..feee450ea 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -234,9 +234,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
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()
@ -218,11 +204,11 @@ index a78af59dd..feee450ea 100644
);
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)
Index: tdesktop-1.2.6/Telegram/gyp/PrecompiledHeader.cmake
===================================================================
--- tdesktop-1.2.6.orig/Telegram/gyp/PrecompiledHeader.cmake
+++ tdesktop-1.2.6/Telegram/gyp/PrecompiledHeader.cmake
@@ -112,7 +112,7 @@ function(add_precompiled_header _target
set(_compiler_FLAGS "@${_pch_c_flags_file}")
add_custom_command(
OUTPUT "${_output_c}"
@ -231,7 +217,7 @@ index 5d6830e96..c3f08d3f6 100644
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)
@@ -123,7 +123,7 @@ function(add_precompiled_header _target
set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
add_custom_command(
OUTPUT "${_output_cxx}"
@ -240,11 +226,11 @@ index 5d6830e96..c3f08d3f6 100644
DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index bbf2b2ade..2d380810f 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -693,14 +693,7 @@
Index: tdesktop-1.2.6/Telegram/gyp/telegram_sources.txt
===================================================================
--- tdesktop-1.2.6.orig/Telegram/gyp/telegram_sources.txt
+++ tdesktop-1.2.6/Telegram/gyp/telegram_sources.txt
@@ -713,14 +713,7 @@
<(emoji_suggestions_loc)/emoji_suggestions.cpp
<(emoji_suggestions_loc)/emoji_suggestions.h

13
telegram-desktop.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Dec 31 15:21:54 UTC 2017 - badshah400@gmail.com
- Update to version 1.2.6:
* Grouped Photos: Group media into an album when sharing
multiple photos and videos. Choose the exact order of media
you send.
* Bug fixes and other minor improvements.
- Add crl-master.zip from https://github.com/telegramdesktop/crl
and copy it to build dir appropriately; this is now required
for building.
- Rebase tdesktop.patch.
-------------------------------------------------------------------
Mon Dec 18 12:46:05 UTC 2017 - badshah400@gmail.com

10
telegram-desktop.spec
View File

@ -17,7 +17,7 @@
Name: telegram-desktop
Version: 1.2.1
Version: 1.2.6
Release: 0
Summary: A new era of messaging
License: GPL-3.0
@ -40,7 +40,9 @@ Source7: libtgvoip.zip
# curl https://raw.githubusercontent.com/philsquared/Catch/master/single_include/catch.hpp -o catch.hpp
Source8: catch.hpp
# curl https://codeload.github.com/ericniebler/range-v3/zip/master -o range-v3-master.zip
Source9: range-v3-master.zip
Source9: range-v3-master.zip
# curl https://codeload.github.com/telegramdesktop/crl/zip/master -o crl-master.zip
Source10: crl-master.zip
# PATCH-FIX-UPSTREAM breakpad-ucontext_t-glibc2_26.patch badshah400@gmail.com -- Replace `struct ucontext` by `ucontext_t` to make compatible with glib-2.26; merged upstream
Patch0: breakpad-ucontext_t-glibc2_26.patch
Patch1: tdesktop.patch
@ -145,6 +147,10 @@ mv range-v3-master range-v3
mkdir -p %{_builddir}/Libraries
mv range-v3 %{_builddir}/Libraries/
cp %{_sourcedir}/crl-master.zip . && unzip crl-master.zip
mv crl-master crl
mv crl %{_builddir}/tdesktop-%{version}/Telegram/ThirdParty/
cp %{_sourcedir}/tdesktop.patch %{_builddir}/tdesktop-%{version}
cd %{_builddir}/tdesktop-%{version}
patch -p1 < tdesktop.patch

3
v1.2.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88f992f24f3c0109f4e7aa886a87fe7dbb234ea72a2f751159cb674fb16cbdac
size 16824849

3
v1.2.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b941299857e6a745574d47a0e5d80772a7e5886006a364e4a8d2a0a82b20047b
size 16862075