update to 1.3.8-1

tdesktop.patch: rebase CMakeLists.inj: add precompiled header for lib_export, use gcc-nm and gcc-ranlib for CMAKE_NM and CMAKE_RANLIB (CMAKE_AR is already supported by mainline gyp) Add patch to use parallel LTO in final link, which evaluates `nproc` during prepare(). Using -flto=jobserver would be nice, but doens't seem to work with CMake.
author: Allen Wild 2018-06-27 23:50:55 -0400
committer: Allen Wild 2018-06-28 00:18:05 -0400
commit: 6d795f3b296ba9281c7c607c87b2bd19371565f8 (patch)
tree: 234e4df258ac5bf88aa0a4da1896c9db7b15844f
parent: 31486972bffdba1c801d7ed9f457f2b1693c0332 (diff)
download: aur-6d795f3b296ba9281c7c607c87b2bd19371565f8.tar.gz
6 files changed, 100 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 922a9f9b5fbf..9b3817e75eeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client (with noto emoji)
-	pkgver = 1.3.7
+	pkgver = 1.3.8
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	optdepends = libnotify: desktop notifications
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.3.7
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.3.8
 	source = GSL::git+https://github.com/Microsoft/GSL.git
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip.git
 	source = variant::git+https://github.com/mapbox/variant.git
@@ -31,6 +31,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	source = CMakeLists.inj
 	source = tdesktop.patch
 	source = no-gtk2.patch
+	source = parallel-lto.patch.in
 	source = libtgvoip.patch
 	source = libtgvoip-2.patch
 	sha512sums = SKIP
@@ -40,9 +41,10 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha512sums = SKIP
 	sha512sums = 376a4860e37b0f60892f362e954f976a563c632579167003b4aacbb24b6fea6aabb4e6952baf6d1a546b961936935cc49cf0e0ce9570320245b6bb326cb149e5
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
-	sha512sums = aa97c02ff4f1caa152671496aff6bb7162271fbfb86ade7c5b72f1cca3ab1ef92b69a9e9390614d2b84ae43606545b8c8bc2bfd98132d0cf57a8b253bcf2e643
-	sha512sums = 72c9cf1f5639c2c090e853d7141cc9f8c295b869f3ce1b998559db136903d37f3a8c6676520cd5d5d228f6e1e6db0ec0b0c7c399a3653f214bf56d9d1c1a25d0
-	sha512sums = 7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025
+	sha512sums = ccbfca942e9fc5ce94a7e9c74429f3463886a35d887aad39ea74a95a2bfc664e5d6641bf1c46e1cf9b786c8aaa21449ac6bbbbc52c84dea550add80d8ea060d4
+	sha512sums = 37eda4cd7c88f8b55f7bc6786dd23af691060c9040b8e5d65dda07ab234397af23c3f699abe2bfec8919f501ce45b8f1d25180f5077480b1ca966308c62f8ecb
+	sha512sums = c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712
+	sha512sums = 3344965dbec7b18293d7b4f812975688fba42e71721150cb365b3eeb69b5dc0a64494476bdc41007aa8cf4414993148d06089af057bb6b634257a51602af03f7
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
 	sha512sums = 251f43bcdfd688a4c7dda082e981569c6cd6332289652576cfdc9f6376eee6e28195ec4a60bcfa002c6358d0f3cbdf215b7d390bbcce2ed560abfc9c606566b5
 
diff --git a/CMakeLists.inj b/CMakeLists.inj
index e039cb1585af..0f12632c29a0 100644
--- a/CMakeLists.inj
+++ b/CMakeLists.inj
@@ -9,6 +9,12 @@ set_target_properties(Telegram PROPERTIES SKIP_BUILD_RPATH TRUE)
 # lines.
 include(../../Telegram/gyp/PrecompiledHeader.cmake)
 add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h)
+add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
+
+# use gcc-ar and gcc-nm, also from gyp.diff
+# https://github.com/telegramdesktop/tdesktop/commit/1e10529f20507e1d22a287ef5e4de88f72d592ca
+set(CMAKE_NM "/usr/bin/gcc-nm")
+set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
 
 # vim: ft=cmake
 # -------------- debian/CMakeLists.inj end --------------
diff --git a/PKGBUILD b/PKGBUILD
index 51f628884124..0c8da036b944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-systemqt-notoemoji
-pkgver=1.3.7
+pkgver=1.3.8
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (with noto emoji)'
 arch=('x86_64')
@@ -30,6 +30,7 @@ source=(
     "CMakeLists.inj"
     "tdesktop.patch"
     "no-gtk2.patch"
+    "parallel-lto.patch.in"
     "libtgvoip.patch"
     "libtgvoip-2.patch"
 )
@@ -40,9 +41,10 @@ sha512sums=('SKIP'
             'SKIP'
             '376a4860e37b0f60892f362e954f976a563c632579167003b4aacbb24b6fea6aabb4e6952baf6d1a546b961936935cc49cf0e0ce9570320245b6bb326cb149e5'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
-            'aa97c02ff4f1caa152671496aff6bb7162271fbfb86ade7c5b72f1cca3ab1ef92b69a9e9390614d2b84ae43606545b8c8bc2bfd98132d0cf57a8b253bcf2e643'
-            '72c9cf1f5639c2c090e853d7141cc9f8c295b869f3ce1b998559db136903d37f3a8c6676520cd5d5d228f6e1e6db0ec0b0c7c399a3653f214bf56d9d1c1a25d0'
-            '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025'
+            'ccbfca942e9fc5ce94a7e9c74429f3463886a35d887aad39ea74a95a2bfc664e5d6641bf1c46e1cf9b786c8aaa21449ac6bbbbc52c84dea550add80d8ea060d4'
+            '37eda4cd7c88f8b55f7bc6786dd23af691060c9040b8e5d65dda07ab234397af23c3f699abe2bfec8919f501ce45b8f1d25180f5077480b1ca966308c62f8ecb'
+            'c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712'
+            '3344965dbec7b18293d7b4f812975688fba42e71721150cb365b3eeb69b5dc0a64494476bdc41007aa8cf4414993148d06089af057bb6b634257a51602af03f7'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
             '251f43bcdfd688a4c7dda082e981569c6cd6332289652576cfdc9f6376eee6e28195ec4a60bcfa002c6358d0f3cbdf215b7d390bbcce2ed560abfc9c606566b5')
 
@@ -57,6 +59,9 @@ prepare() {
     patch -Np1 -i "$srcdir/tdesktop.patch"
     patch -Np1 -i "$srcdir/no-gtk2.patch"
 
+    sed "s/@NPROC@/$(nproc)/g" "$srcdir/parallel-lto.patch.in" >"$srcdir/parallel-lto.patch"
+    patch -Np1 -i "$srcdir/parallel-lto.patch"
+
     cd "Telegram/ThirdParty/libtgvoip"
     patch -Np1 -i "$srcdir/libtgvoip.patch"
     # patch -Np1 -i "$srcdir/libtgvoip-2.patch"
diff --git a/no-gtk2.patch b/no-gtk2.patch
index f2384e322dc0..c510ef8b1c0d 100644
--- a/no-gtk2.patch
+++ b/no-gtk2.patch
@@ -1,7 +1,8 @@
-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 b2d12a838..77c6abf7d 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);
  		}
  	}
diff --git a/parallel-lto.patch.in b/parallel-lto.patch.in
new file mode 100644
index 000000000000..cda24835c766
--- /dev/null
+++ b/parallel-lto.patch.in
@@ -0,0 +1,17 @@
+The final LTO link can run in parallel, saving significant time during
+the linking step on multi-core machines. With CMake, -flto=jobserver
+doesn't seem to work, so we evaluate `nproc` during prepare() instead.
+
+diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
+index 6853b5c3e..0b41946fa 100644
+--- a/Telegram/gyp/settings_linux.gypi
++++ b/Telegram/gyp/settings_linux.gypi
+@@ -52,7 +52,7 @@
+             'Release': {
+               'cflags_c': [ '-flto' ],
+               'cflags_cc': [ '-flto' ],
+-              'ldflags': [ '-flto', '-fuse-linker-plugin' ],
++              'ldflags': [ '-flto=@NPROC@', '-fuse-linker-plugin' ],
+             },
+           },
+         }]
diff --git a/tdesktop.patch b/tdesktop.patch
index abcc4ae7bee9..26099853dd6b 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -1,5 +1,5 @@
 diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
-index 0554fa17..3ea02740 100644
+index 0554fa179..3ea027406 100644
 --- a/Telegram/Resources/qrc/telegram_linux.qrc
 +++ b/Telegram/Resources/qrc/telegram_linux.qrc
 @@ -1,5 +1,4 @@
@@ -9,10 +9,10 @@ index 0554fa17..3ea02740 100644
    </qresource>
  </RCC>
 diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
-index bf21d14d..6b63016e 100644
+index 207885898..1a70da99a 100644
 --- a/Telegram/SourceFiles/core/launcher.cpp
 +++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -44,9 +44,10 @@ void Launcher::init() {
+@@ -37,9 +37,10 @@ void Launcher::init() {
  
  	QCoreApplication::setApplicationName(qsl("TelegramDesktop"));
  
@@ -25,7 +25,7 @@ index bf21d14d..6b63016e 100644
  
  	initHook();
  }
-@@ -64,6 +65,13 @@ int Launcher::exec() {
+@@ -57,6 +58,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 a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
-index e9e349be..d82963fa 100644
+index 6f93d69cd..df185d5a2 100644
 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h
 +++ b/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
@@ -54,7 +54,7 @@ index e9e349be..d82963fa 100644
  
 diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
 new file mode 100644
-index 00000000..4a722b8d
+index 000000000..4a722b8d7
 --- /dev/null
 +++ b/Telegram/SourceFiles/qt_functions.cpp
 @@ -0,0 +1,94 @@
@@ -153,10 +153,10 @@ index 00000000..4a722b8d
 +        flags |= QTextItem::StrikeOut;
 +}
 diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
-index b975c7a8..f2f876b3 100644
+index e29f348c8..122ff0f5d 100644
 --- a/Telegram/SourceFiles/qt_static_plugins.cpp
 +++ b/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 a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
-index 7d34a19b..a4b3d31a 100644
+index 944f58479..887c1982f 100644
 --- a/Telegram/SourceFiles/ui/text/text.cpp
 +++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1707,11 +1707,11 @@ private:
+@@ -1750,11 +1750,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 a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
-index a10b5393..4e1eb62d 100644
+index 2959cec77..04ad00645 100644
 --- a/Telegram/SourceFiles/ui/text/text_block.cpp
 +++ b/Telegram/SourceFiles/ui/text/text_block.cpp
-@@ -333,6 +333,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
+@@ -332,6 +332,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 a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index dacb848a..f64c9b66 100644
+index 0f610cb8a..b005589b6 100644
 --- a/Telegram/SourceFiles/ui/twidget.cpp
 +++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -248,9 +248,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
+@@ -227,9 +227,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
  			, button
  			, QGuiApplication::mouseButtons() | button
  			, QGuiApplication::keyboardModifiers()
@@ -220,10 +220,10 @@ index dacb848a..f64c9b66 100644
  		ev.setTimestamp(getms());
  		QGuiApplication::sendEvent(windowHandle, &ev);
 diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index 5d6830e9..c3f08d3f 100644
+index a0e1e0489..bd9bce0c1 100644
 --- a/Telegram/gyp/PrecompiledHeader.cmake
 +++ b/Telegram/gyp/PrecompiledHeader.cmake
-@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
+@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input)
        set(_compiler_FLAGS "@${_pch_c_flags_file}")
        add_custom_command(
          OUTPUT "${_output_c}"
@@ -232,7 +232,7 @@ index 5d6830e9..c3f08d3f 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)
+@@ -125,7 +125,7 @@ function(add_precompiled_header _target _input)
        set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
        add_custom_command(
          OUTPUT "${_output_cxx}"
@@ -240,18 +240,19 @@ index 5d6830e9..c3f08d3f 100644
 +        COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
          DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
          IMPLICIT_DEPENDS CXX "${_pch_header}"
-         COMMENT "Precompiling ${_name} for ${_target} (C++)")
+         COMMENT "Precompiling header ${_name} for ${_target} (C++)")
 diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 84a06153..fd7ca47f 100644
+index 65917d9b5..d91e55c7a 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
-@@ -82,13 +82,11 @@
+@@ -74,14 +74,12 @@
        'codegen.gyp:codegen_numbers',
        'codegen.gyp:codegen_style',
        'tests/tests.gyp:tests',
 -      'utils.gyp:Updater',
        '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
        'crl.gyp:crl',
+       'lib_export.gyp:lib_export',
      ],
  
      'defines': [
@@ -259,7 +260,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 @@
+@@ -90,15 +88,7 @@
      'include_dirs': [
        '<(src_loc)',
        '<(SHARED_INTERMEDIATE_DIR)',
@@ -277,10 +278,10 @@ index 84a06153..fd7ca47f 100644
        '<(submodules_loc)/GSL/include',
        '<(submodules_loc)/variant/include',
 diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index dea127a3..62c95e68 100644
+index 0b783ec21..3f917765a 100644
 --- a/Telegram/gyp/qt.gypi
 +++ b/Telegram/gyp/qt.gypi
-@@ -27,25 +27,21 @@
+@@ -14,25 +14,21 @@
                [ 'build_macold', {
                  'qt_version%': '5.3.2',
                }, {
@@ -308,7 +309,7 @@ index dea127a3..62c95e68 100644
              }]
            ]
          },
-@@ -85,32 +81,13 @@
+@@ -72,32 +68,13 @@
              ],
            }],
            [ 'build_linux', {
@@ -344,7 +345,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_',
@@ -356,7 +357,7 @@ index dea127a3..62c95e68 100644
    },
  
    'configurations': {
-@@ -193,14 +165,14 @@
+@@ -180,14 +152,14 @@
    },
  
    'include_dirs': [
@@ -379,7 +380,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',
@@ -398,7 +399,7 @@ index dea127a3..62c95e68 100644
          '-lglib-2.0',
          '-lpthread',
        ],
-@@ -243,7 +208,6 @@
+@@ -230,7 +195,6 @@
          '<(qt_loc)/mkspecs/linux-g++',
        ],
        'ldflags': [
@@ -407,10 +408,10 @@ index dea127a3..62c95e68 100644
          '-rdynamic',
        ],
 diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index fae668dc..99e184a3 100644
+index 464d3c818..f350da8f3 100644
 --- a/Telegram/gyp/qt_moc.gypi
 +++ b/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': [
@@ -420,10 +421,10 @@ index fae668dc..99e184a3 100644
        # Silence "Note: No relevant classes found. No output generated."
        '--no-notes',
 diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
-index eebc6967..19a346fe 100644
+index f5624a82b..1129a95c5 100644
 --- a/Telegram/gyp/qt_rcc.gypi
 +++ b/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': [
@@ -433,10 +434,10 @@ index eebc6967..19a346fe 100644
        '-no-compress',
        '<(RULE_INPUT_PATH)',
 diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index b93bace4..0fcdfd56 100644
+index 17219fa2c..b00fd50ea 100644
 --- a/Telegram/gyp/settings_linux.gypi
 +++ b/Telegram/gyp/settings_linux.gypi
-@@ -24,7 +24,6 @@
+@@ -11,7 +11,6 @@
          'linux_common_flags': [
            '-pipe',
            '-Wall',
@@ -444,6 +445,15 @@ index b93bace4..0fcdfd56 100644
            '-W',
            '-fPIC',
            '-Wno-unused-variable',
+@@ -43,7 +42,7 @@
+               'sources': [ '__Wrong_Official_Build_Target_<(official_build_target)_' ],
+             }],
+           ],
+-        }], [ '"<!(uname -p)" == "x86_64"', {
++        }], [ '"<!(uname -m)" == "x86_64"', {
+           # 32 bit version can't be linked with debug info or LTO,
+           # virtual memory exhausted :(
+           'cflags_c': [ '-g' ],
 @@ -60,7 +59,6 @@
        ],
        'defines': [
@@ -453,10 +463,10 @@ index b93bace4..0fcdfd56 100644
        ],
        'cflags_c': [
 diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index f6918c22..50f0d8c7 100644
+index 01231c4d1..00a9c0875 100644
 --- a/Telegram/gyp/telegram_linux.gypi
 +++ b/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',
@@ -469,7 +479,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': [
@@ -477,7 +487,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': [
@@ -512,16 +522,14 @@ index f6918c22..50f0d8c7 100644
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
      'cflags_cc': [
-@@ -99,7 +91,7 @@
+@@ -87,16 +79,14 @@
        },
      },
      'conditions': [
--      [ '"<!(uname -p)" == "x86_64"', {
-+      [ '"<!(uname -m)" == "x86_64"', {
-         # 32 bit version can't be linked with debug info or LTO,
-         # virtual memory exhausted :(
-         'cflags_c': [ '-g' ],
-@@ -118,10 +110,8 @@
+-      [ '"<!(uname -p)" != "x86_64"', {
++      [ '"<!(uname -m)" != "x86_64"', {
+         'ldflags': [
+           '-Wl,-wrap,__divmoddi4',
          ],
        }], ['not_need_gtk!="True"', {
          'cflags_cc': [
@@ -535,10 +543,10 @@ index f6918c22..50f0d8c7 100644
        }]
      ],
 diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 5d2f627e..defd475d 100644
+index 7a103286b..397d2a2ac 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -713,14 +713,7 @@
+@@ -797,14 +797,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h
author	Allen Wild	2018-06-27 23:50:55 -0400
committer	Allen Wild	2018-06-28 00:18:05 -0400
commit	6d795f3b296ba9281c7c607c87b2bd19371565f8 (patch)
tree	234e4df258ac5bf88aa0a4da1896c9db7b15844f
parent	31486972bffdba1c801d7ed9f457f2b1693c0332 (diff)
download	aur-6d795f3b296ba9281c7c607c87b2bd19371565f8.tar.gz