snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

telegram-desktop: update to 1.2.14. 

Closes: #12458 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
John 2018-03-23 13:31:30 +01:00 committed by Jürgen Buchmüller
parent 011ad9c929
commit ecede14349
No known key found for this signature in database
GPG Key ID: 6764EC32352D0647
4 changed files with 66 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
srcpkgs/telegram-desktop/patches/01-tdesktop.patch
View File

@ -9,10 +9,10 @@ index 0554fa17..3ea02740 100644
</qresource>
</RCC>
diff --git Telegram/SourceFiles/core/launcher.cpp Telegram/SourceFiles/core/launcher.cpp
index bf21d14d..6b63016e 100644
index 7f173565..1bc26fed 100644
--- Telegram/SourceFiles/core/launcher.cpp
+++ Telegram/SourceFiles/core/launcher.cpp
@@ -44,9 +44,10 @@ void Launcher::init() {
@@ -31,9 +31,10 @@ void Launcher::init() {
QCoreApplication::setApplicationName(qsl("TelegramDesktop"));
@ -25,7 +25,7 @@ index bf21d14d..6b63016e 100644
initHook();
}
@@ -64,6 +65,13 @@ int Launcher::exec() {
@@ -51,6 +52,13 @@ int Launcher::exec() {
Logs::start(this); // must be started before Platform is started
Platform::start(); // must be started before QApplication is created
@ -40,10 +40,10 @@ index bf21d14d..6b63016e 100644
DEBUG_LOG(("Telegram finished, result: %1").arg(result));
diff --git Telegram/SourceFiles/platform/linux/linux_libs.h Telegram/SourceFiles/platform/linux/linux_libs.h
index e9e349be..d82963fa 100644
index 6f93d69c..df185d5a 100644
--- Telegram/SourceFiles/platform/linux/linux_libs.h
+++ Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -30,7 +30,7 @@ extern "C" {
@@ -17,7 +17,7 @@ extern "C" {
} // extern "C"
#ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
@ -153,10 +153,10 @@ index 00000000..4a722b8d
+ flags |= QTextItem::StrikeOut;
+}
diff --git Telegram/SourceFiles/qt_static_plugins.cpp Telegram/SourceFiles/qt_static_plugins.cpp
index b975c7a8..f2f876b3 100644
index e29f348c..122ff0f5 100644
--- Telegram/SourceFiles/qt_static_plugins.cpp
+++ Telegram/SourceFiles/qt_static_plugins.cpp
@@ -28,13 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
@@ -15,13 +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
@ -171,10 +171,10 @@ index b975c7a8..f2f876b3 100644
-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
diff --git Telegram/SourceFiles/ui/text/text.cpp Telegram/SourceFiles/ui/text/text.cpp
index 7d34a19b..a4b3d31a 100644
index 61af38ce..c75a9af7 100644
--- Telegram/SourceFiles/ui/text/text.cpp
+++ Telegram/SourceFiles/ui/text/text.cpp
@@ -1707,11 +1707,11 @@ private:
@@ -1735,11 +1735,11 @@ private:
if (item == -1)
return;
@ -190,10 +190,10 @@ index 7d34a19b..a4b3d31a 100644
auto blockIndex = _lineStartBlock;
auto currentBlock = _t->_blocks[blockIndex].get();
diff --git Telegram/SourceFiles/ui/text/text_block.cpp Telegram/SourceFiles/ui/text/text_block.cpp
index a10b5393..4e1eb62d 100644
index d39addab..abdcd239 100644
--- Telegram/SourceFiles/ui/text/text_block.cpp
+++ Telegram/SourceFiles/ui/text/text_block.cpp
@@ -333,6 +333,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
@@ -320,6 +320,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
QStackTextEngine engine(part, blockFont->f);
BlockParser parser(&engine, this, minResizeWidth, _from, part);
@ -204,10 +204,10 @@ index a10b5393..4e1eb62d 100644
CrashReports::ClearAnnotationRef("CrashString");
}
diff --git Telegram/SourceFiles/ui/twidget.cpp Telegram/SourceFiles/ui/twidget.cpp
index dacb848a..f64c9b66 100644
index 1441ea47..033b7b58 100644
--- Telegram/SourceFiles/ui/twidget.cpp
+++ Telegram/SourceFiles/ui/twidget.cpp
@@ -248,9 +248,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
@@ -235,9 +235,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
, button
, QGuiApplication::mouseButtons() | button
, QGuiApplication::keyboardModifiers()
@ -242,10 +242,10 @@ index 5d6830e9..c3f08d3f 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git Telegram/gyp/Telegram.gyp Telegram/gyp/Telegram.gyp
index 84a06153..fd7ca47f 100644
index 62a4197f..aef8683f 100644
--- Telegram/gyp/Telegram.gyp
+++ Telegram/gyp/Telegram.gyp
@@ -82,13 +82,11 @@
@@ -69,13 +69,11 @@
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
'tests/tests.gyp:tests',
@ -259,7 +259,7 @@ index 84a06153..fd7ca47f 100644
'AL_ALEXT_PROTOTYPES',
'TGVOIP_USE_CXX11_LIB',
'<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
@@ -97,15 +95,7 @@
@@ -84,15 +82,7 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@ -276,24 +276,11 @@ index 84a06153..fd7ca47f 100644
'<(emoji_suggestions_loc)',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
diff --git Telegram/gyp/linux_glibc_wraps.gyp Telegram/gyp/linux_glibc_wraps.gyp
index 07a8276f..99ac4cac 100644
--- Telegram/gyp/linux_glibc_wraps.gyp
+++ Telegram/gyp/linux_glibc_wraps.gyp
@@ -27,7 +27,7 @@
'sources': [
'../SourceFiles/platform/linux/linux_glibc_wraps.c',
],
- 'conditions': [[ '"<!(uname -p)" == "x86_64"', {
+ 'conditions': [[ '"<!(uname -m)" == "x86_64"', {
'sources': [
'../SourceFiles/platform/linux/linux_glibc_wraps_64.c',
],
diff --git Telegram/gyp/qt.gypi Telegram/gyp/qt.gypi
index dea127a3..62c95e68 100644
index 0b783ec2..c9eca6ad 100644
--- Telegram/gyp/qt.gypi
+++ Telegram/gyp/qt.gypi
@@ -27,25 +27,21 @@
@@ -14,25 +14,21 @@
[ 'build_macold', {
'qt_version%': '5.3.2',
}, {
@ -321,7 +308,7 @@ index dea127a3..62c95e68 100644
}]
]
},
@@ -85,32 +81,13 @@
@@ -72,32 +68,13 @@
],
}],
[ 'build_linux', {
@ -357,7 +344,7 @@ index dea127a3..62c95e68 100644
],
}],
],
@@ -140,11 +117,6 @@
@@ -127,11 +104,6 @@
# '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))'
# where [sources] contains all your source files
'qt_moc_list_sources_arg': '--moc-prefix SHARED_INTERMEDIATE_DIR/<(_target_name)/moc/moc_',
@ -369,7 +356,7 @@ index dea127a3..62c95e68 100644
},
'configurations': {
@@ -193,14 +165,14 @@
@@ -180,14 +152,14 @@
},
'include_dirs': [
@ -392,7 +379,7 @@ index dea127a3..62c95e68 100644
],
'library_dirs': [
'<(qt_loc)/lib',
@@ -225,17 +197,10 @@
@@ -212,17 +184,10 @@
],
'libraries': [
'<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
@ -411,7 +398,7 @@ index dea127a3..62c95e68 100644
'-lglib-2.0',
'-lpthread',
],
@@ -243,7 +208,6 @@
@@ -230,7 +195,6 @@
'<(qt_loc)/mkspecs/linux-g++',
],
'ldflags': [
@ -420,10 +407,10 @@ index dea127a3..62c95e68 100644
'-rdynamic',
],
diff --git Telegram/gyp/qt_moc.gypi Telegram/gyp/qt_moc.gypi
index fae668dc..99e184a3 100644
index 464d3c81..f350da8f 100644
--- Telegram/gyp/qt_moc.gypi
+++ Telegram/gyp/qt_moc.gypi
@@ -25,7 +25,7 @@
@@ -12,7 +12,7 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@ -433,10 +420,10 @@ index fae668dc..99e184a3 100644
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
diff --git Telegram/gyp/qt_rcc.gypi Telegram/gyp/qt_rcc.gypi
index eebc6967..19a346fe 100644
index f5624a82..1129a95c 100644
--- Telegram/gyp/qt_rcc.gypi
+++ Telegram/gyp/qt_rcc.gypi
@@ -28,7 +28,7 @@
@@ -15,7 +15,7 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@ -446,10 +433,10 @@ index eebc6967..19a346fe 100644
'-no-compress',
'<(RULE_INPUT_PATH)',
diff --git Telegram/gyp/settings_linux.gypi Telegram/gyp/settings_linux.gypi
index b93bace4..0fcdfd56 100644
index 03284c1d..b3a779ee 100644
--- Telegram/gyp/settings_linux.gypi
+++ Telegram/gyp/settings_linux.gypi
@@ -24,7 +24,6 @@
@@ -11,7 +11,6 @@
'linux_common_flags': [
'-pipe',
'-Wall',
@ -457,16 +444,7 @@ index b93bace4..0fcdfd56 100644
'-W',
'-fPIC',
'-Wno-unused-variable',
@@ -38,7 +37,7 @@
],
},
'conditions': [
- [ '"<!(uname -p)" == "x86_64"', {
+ [ '"<!(uname -m)" == "x86_64"', {
'defines': [
'Q_OS_LINUX64',
],
@@ -60,7 +59,6 @@
@@ -47,7 +46,6 @@
],
'defines': [
'_REENTRANT',
@ -475,10 +453,10 @@ index b93bace4..0fcdfd56 100644
],
'cflags_c': [
diff --git Telegram/gyp/telegram_linux.gypi Telegram/gyp/telegram_linux.gypi
index f6918c22..50f0d8c7 100644
index a5b4b197..a755fc58 100644
--- Telegram/gyp/telegram_linux.gypi
+++ Telegram/gyp/telegram_linux.gypi
@@ -33,10 +33,11 @@
@@ -20,10 +20,11 @@
'linux_path_va%': '/usr/local',
'linux_path_vdpau%': '/usr/local',
'linux_path_breakpad%': '/usr/local',
@ -491,7 +469,7 @@ index f6918c22..50f0d8c7 100644
'/usr/local/include',
'<(linux_path_ffmpeg)/include',
'<(linux_path_openal)/include',
@@ -45,6 +46,7 @@
@@ -32,6 +33,7 @@
'<(linux_path_range)/include',
],
'library_dirs': [
@ -499,7 +477,7 @@ index f6918c22..50f0d8c7 100644
'/usr/local/lib',
'<(linux_path_ffmpeg)/lib',
'<(linux_path_openal)/lib',
@@ -53,25 +55,15 @@
@@ -40,25 +42,15 @@
'<(linux_path_breakpad)/lib',
],
'libraries': [
@ -534,7 +512,7 @@ index f6918c22..50f0d8c7 100644
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
@@ -99,7 +91,7 @@
@@ -86,7 +78,7 @@
},
},
'conditions': [
@ -543,7 +521,7 @@ index f6918c22..50f0d8c7 100644
# 32 bit version can't be linked with debug info or LTO,
# virtual memory exhausted :(
'cflags_c': [ '-g' ],
@@ -118,10 +110,8 @@
@@ -105,10 +97,8 @@
],
}], ['not_need_gtk!="True"', {
'cflags_cc': [
@ -557,10 +535,10 @@ index f6918c22..50f0d8c7 100644
}]
],
diff --git Telegram/gyp/telegram_sources.txt Telegram/gyp/telegram_sources.txt
index 5d2f627e..defd475d 100644
index a9c36e09..26b2bb18 100644
--- Telegram/gyp/telegram_sources.txt
+++ Telegram/gyp/telegram_sources.txt
@@ -713,14 +713,7 @@
@@ -760,14 +760,7 @@
<(emoji_suggestions_loc)/emoji_suggestions.cpp
<(emoji_suggestions_loc)/emoji_suggestions.h

23
srcpkgs/telegram-desktop/patches/04-libressl.patch
View File

@ -1,23 +0,0 @@
--- Telegram/SourceFiles/core/utils.cpp 2018-02-18 16:50:35.666997894 +0100
+++ - 2018-02-18 16:51:32.647313078 +0100
@@ -295,7 +295,9 @@
av_lockmgr_register(nullptr);
CRYPTO_cleanup_all_ex_data();
+#if !defined(LIBRESSL_VERSION_NUMBER)
FIPS_mode_set(0);
+#endif
ENGINE_cleanup();
CONF_modules_unload(1);
ERR_remove_state(0);
--- Telegram/SourceFiles/mtproto/rsa_public_key.cpp 2018-01-03 11:46:01.000000000 +0100
+++ - 2018-02-18 17:04:49.956395054 +0100
@@ -16,7 +16,7 @@
namespace MTP {
namespace internal {
namespace {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
// This is a key setter for compatibility with OpenSSL 1.0
int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {

32
srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch
View File

@ -1,17 +1,7 @@
--- Telegram/gyp/telegram_linux.gypi 2018-02-18 20:54:28.997216923 +0100
+++ - 2018-02-18 20:58:29.334937600 +0100
@@ -57,9 +57,6 @@
'-Wno-strict-overflow',
],
'ldflags': [
- '-Wl,-wrap,aligned_alloc',
- '-Wl,-wrap,secure_getenv',
- '-Wl,-wrap,clock_gettime',
'-Wl,--no-as-needed,-lrt',
],
'configurations': {
--- Telegram/gyp/qt.gypi 2018-02-18 20:54:28.997216923 +0100
+++ - 2018-02-18 20:59:47.859601720 +0100
diff --git Telegram/gyp/qt.gypi Telegram/gyp/qt.gypi
index c9eca6ad..1404f91b 100644
--- Telegram/gyp/qt.gypi
+++ Telegram/gyp/qt.gypi
@@ -176,14 +176,10 @@
],
'conditions': [
@ -27,3 +17,17 @@
'<@(qt_libs_release)',
'-lcrypto',
'-lX11',
diff --git Telegram/gyp/telegram_linux.gypi Telegram/gyp/telegram_linux.gypi
index a755fc58..8bf49216 100644
--- Telegram/gyp/telegram_linux.gypi
+++ Telegram/gyp/telegram_linux.gypi
@@ -57,9 +57,6 @@
'-Wno-strict-overflow',
],
'ldflags': [
- '-Wl,-wrap,aligned_alloc',
- '-Wl,-wrap,secure_getenv',
- '-Wl,-wrap,clock_gettime',
'-Wl,--no-as-needed,-lrt',
],
'configurations': {

20
srcpkgs/telegram-desktop/template
View File

@ -1,14 +1,13 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=1.2.8
version=1.2.15
revision=1
_libtgvoip_commit=0b53884c8bf10a1d7df879baec839a1fab896c63
_GSL_commit=c5851a8161938798c5594a66420cb814fea92711
_libtgvoip_commit=6e0e1026147364cfb1234489980a2625ab50b598
_GSL_commit=9d65e74400976b3509833f49b16d401600c7317d
_variant_commit=550ac2f159ca883d360c196149b466955c77a573
_crl_commit=344cbde9ae8d89a6530408d3176d2754ae0ff0e2
_Catch_commit=5ca44b68721833ae3731802ed99af67c6f38a53a
wrksrc="tdesktop-${version}"
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
build_style=cmake
build_wrksrc="out/Release"
hostmakedepends="gyp pkg-config"
@ -18,23 +17,24 @@ makedepends="qt5-devel gtk+3-devel libappindicator-devel libdbusmenu-glib-devel
short_desc="Telegram Desktop messaging app"
maintainer="John <johnz@posteo.net>"
license="GPL-3"
homepage="https://github.com/telegramdesktop/tdesktop"
homepage="https://desktop.telegram.org/"
distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.gz
https://github.com/telegramdesktop/libtgvoip/archive/${_libtgvoip_commit}.tar.gz
https://github.com/Microsoft/GSL/archive/${_GSL_commit}.tar.gz
https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz
https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz
https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz"
checksum="cb8530041b5b742e641b0f3a98699a116b1677cb547de90a957b739c5d754386
ae88aee4075479de94afafe87892798cabeb44d4feb4a9fbe641a5300c8c7016
7e35ec47741fac58e7262ce0bfce118d79a7dec009d8425fa00ff04d3a4082a8
checksum="a37009f81cb305d69e38b55019fff3b095761689706e83a5aa0ecf5b098c51f6
55569944e609bc817a454a43407bbbe1cd6dcfdbbb43579678e0d9e4340ddb14
1aab15abd08fd377524df9dc6a71c977f8617d4a2a8f8a2aa1ce07f3c3ff4371
aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d
c8ad2e354b13aa162a1f6104cfbf353bd6c2d19af7a439b55ffaa2b38e040ce5
d24e6d9df2b8aa5739d3b9077c6b0ff0ef4d5ef8acc52c3a57e32893854d8d18"
nocross="gyp build script doesn't support cross compiling"
case $XBPS_TARGET_MACHINE in
*-musl) makedepends+=" libexecinfo-devel";;
mips*) broken="unsuported";;
esac
post_extract() {
@ -55,7 +55,7 @@ pre_configure() {
--depth=Telegram/gyp --generator-output=../.. \
-Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake
NUM=$((`wc -l < out/Release/CMakeLists.txt` - 2))
NUM=$(($(wc -l < out/Release/CMakeLists.txt) - 2))
sed -i "$NUM r ${FILESDIR}/CMakeLists.inj" out/Release/CMakeLists.txt
export ASM=gcc
}