Date: Monday, December 10, 2018 @ 20:09:02 Author: svenstaro Revision: 414480
upgpkg: telegram-desktop 1.5.0-2 Modified: telegram-desktop/trunk/PKGBUILD telegram-desktop/trunk/no-gtk2.patch telegram-desktop/trunk/tdesktop.patch ----------------+ PKGBUILD | 15 ++++++++++++--- no-gtk2.patch | 11 ++++++----- tdesktop.patch | 17 +++++++++-------- 3 files changed, 27 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-10 20:05:56 UTC (rev 414479) +++ PKGBUILD 2018-12-10 20:09:02 UTC (rev 414480) @@ -5,7 +5,7 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.4.3 +pkgver=1.5.0 pkgrel=2 pkgdesc='Official Telegram Desktop client' arch=('x86_64') @@ -37,8 +37,8 @@ 'SKIP' 'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d' 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e' - '47c0d1e00401d7899b2ce710c06ceac6caffddbe1a4c85bc407918b43051cba292f6e6131cc0f390a66520e92f0ffa3761f8d973a25986dfe21c54f113062c33' - '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' + 'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2' + 'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5' 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') prepare() { @@ -66,7 +66,16 @@ export EXTRA_FLAGS="-Winvalid-pch" export CPPFLAGS="$CPPFLAGS $EXTRA_FLAGS" export CXXFLAGS="$CXXFLAGS $EXTRA_FLAGS" + + # Telegram requires us to set API_ID and API_HASH for some reason but they do not provide a way to receive a pair + # See https://github.com/telegramdesktop/tdesktop/commit/65b2db216033aa08b7bc846df27843e566f08981 and + # https://github.com/telegramdesktop/tdesktop/issues/4717 + # The official API_ID seems to be 2040. + # We're going to use the defaults for now. + gyp \ + -Dapi_id=17349 \ + -Dapi_hash=344583e45741c457fe1862106095a5eb \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake Modified: no-gtk2.patch =================================================================== --- no-gtk2.patch 2018-12-10 20:05:56 UTC (rev 414479) +++ no-gtk2.patch 2018-12-10 20:09:02 UTC (rev 414480) @@ -1,12 +1,13 @@ -diff -Naur tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp ---- tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2017-12-30 11:13:48.000000000 +0100 -+++ tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp 2018-01-17 11:41:49.593275952 +0100 -@@ -253,24 +253,12 @@ +diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp +index f8d74fee1..c9d059fa6 100644 +--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp ++++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp +@@ -240,24 +240,12 @@ void start() { indicatorLoaded = setupAppIndicator(lib_indicator); } } - if (!gtkLoaded || !indicatorLoaded) { -- if (loadLibrary(lib_indicator, "appindicator", 1)) { +- if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) { - if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) { - gtkLoaded = indicatorLoaded = false; - gtkLoaded = setupGtkBase(lib_gtk); Modified: tdesktop.patch =================================================================== --- tdesktop.patch 2018-12-10 20:05:56 UTC (rev 414479) +++ tdesktop.patch 2018-12-10 20:09:02 UTC (rev 414480) @@ -153,10 +153,10 @@ + flags |= QTextItem::StrikeOut; +} diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index e29f348c8..122ff0f5d 100644 +index a757d085f..122ff0f5d 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp -@@ -15,13 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin) +@@ -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 @@ -169,6 +169,7 @@ -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 944f58479..887c1982f 100644 @@ -456,7 +457,7 @@ ], 'cflags_c': [ diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi -index 80259c687..b5e3c18a2 100644 +index ffe0e5a96..bd2ed758f 100644 --- a/Telegram/gyp/telegram_linux.gypi +++ b/Telegram/gyp/telegram_linux.gypi @@ -23,10 +23,11 @@ @@ -480,7 +481,7 @@ '/usr/local/lib', '<(linux_path_ffmpeg)/lib', '<(linux_path_openal)/lib', -@@ -43,25 +45,16 @@ +@@ -43,26 +45,16 @@ '<(linux_path_breakpad)/lib', ], 'libraries': [ @@ -489,6 +490,7 @@ - 'ibusplatforminputcontextplugin', - 'fcitxplatforminputcontextplugin', - 'himeplatforminputcontextplugin', +- 'nimfplatforminputcontextplugin', - 'liblzma.a', - 'libopenal.a', - 'libavformat.a', @@ -516,11 +518,10 @@ # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -96,10 +89,8 @@ +@@ -97,9 +89,8 @@ ], }], ['not_need_gtk!="True"', { 'cflags_cc': [ -- '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)', - '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)', - '<!(pkg-config 2> /dev/null --cflags glib-2.0)', - '<!(pkg-config 2> /dev/null --cflags dee-1.0)', @@ -527,8 +528,8 @@ + '<!(pkg-config 2> /dev/null --cflags appindicator3-0.1)', + '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)', ], - }] - ], + }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { + 'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ], diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index f02296c8a..46bd016dd 100644 --- a/Telegram/gyp/telegram_sources.txt