update to 1.5.1-2: rebase tdesktop.patch, rebuilt emoji

1.5.1-1 used tdesktop.patch exactly from [community], here I fixed the s/uname -p/uname -m/ instances which re-enable LTO and also regenerate with git-format-patch which makes resolving merge conflicts easier in the future.
author: Allen Wild 2018-12-11 20:30:00 -0500
committer: Allen Wild 2018-12-11 20:30:00 -0500
commit: 271ea6c2321ab9763c463370da68a55a2db34ff7 (patch)
tree: b19b228872b9b62bb375b41e8e35fc8a7abbd1e2
parent: b5d628f93fd3b516ca954eafaacd301318721849 (diff)
download: aur-271ea6c2321ab9763c463370da68a55a2db34ff7.tar.gz
3 files changed, 69 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 82400f591944..40fc75f5452a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client (with noto emoji)
 	pkgver = 1.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -28,7 +28,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	source = GSL::git+https://github.com/Microsoft/GSL.git
 	source = crl::git+https://github.com/telegramdesktop/crl.git
 	source = xxHash::git+https://github.com/Cyan4973/xxHash.git
-	source = telegram-emoji-gen-v1.0.tar.xz::https://github.com/aswild/telegram-emoji-gen/archive/v1.0.tar.gz
+	source = telegram-emoji-gen-v1.1.tar.xz::https://github.com/aswild/telegram-emoji-gen/archive/v1.1.tar.gz
 	source = build-time-optimize.patch.in
 	source = tg.protocol
 	source = CMakeLists.inj
@@ -44,11 +44,11 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = c0983a175b5bab3c2fbc9717bd16233188fc7e6e60e0744682a17b7d41b748400924682811f6b04f88e2c0721754466a2496ccc595f7d34a45f69bd0063757f6
+	sha512sums = 1f8a51acfe4c5262919fa441eb74af2312c3141cad84c677ef7aa45e9faf3d4c90ebb57c99a98b7cb8f2abe467d4777366523ecf2029b74e71c6bf5c09e98803
 	sha512sums = fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
 	sha512sums = b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e
-	sha512sums = d85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2
+	sha512sums = 7922e92d0541112e8e90dbf5b60e45d707ade38aac9d56a46491656ce37ba2386815433511775ae5c5a96fe578ed8651ada20d3b736c5e71e9231ff2b6a5abe4
 	sha512sums = a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
 	sha512sums = 6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0
diff --git a/PKGBUILD b/PKGBUILD
index d2d03588eb9f..64e9de5a5140 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=telegram-desktop-systemqt-notoemoji
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Official Telegram Desktop client (with noto emoji)'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -18,7 +18,7 @@ optdepends=('libnotify: desktop notifications')
 conflicts=('telegram-desktop')
 provides=('telegram-desktop')
 
-_emojiver="v1.0"
+_emojiver=v1.1
 source=(
     "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"
     "libtgvoip::git+https://github.com/telegramdesktop/libtgvoip"
@@ -44,11 +44,11 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'c0983a175b5bab3c2fbc9717bd16233188fc7e6e60e0744682a17b7d41b748400924682811f6b04f88e2c0721754466a2496ccc595f7d34a45f69bd0063757f6'
+            '1f8a51acfe4c5262919fa441eb74af2312c3141cad84c677ef7aa45e9faf3d4c90ebb57c99a98b7cb8f2abe467d4777366523ecf2029b74e71c6bf5c09e98803'
             'fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
-            'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2'
+            '7922e92d0541112e8e90dbf5b60e45d707ade38aac9d56a46491656ce37ba2386815433511775ae5c5a96fe578ed8651ada20d3b736c5e71e9231ff2b6a5abe4'
             'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
             '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
diff --git a/tdesktop.patch b/tdesktop.patch
index 68e9afc27245..a4d1efe6f32e 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -1,13 +1,39 @@
+From 179bb4a7ee16fae8912b73500bca0bbf2cfef7dd Mon Sep 17 00:00:00 2001
+From: Allen Wild <allenwild93@gmail.com>
+Date: Tue, 11 Dec 2018 19:58:46 -0500
+Subject: [PATCH] tdesktop.patch
+
+---
+ Telegram/Resources/qrc/telegram_linux.qrc     |  1 -
+ Telegram/SourceFiles/core/launcher.cpp        | 12 ++-
+ .../SourceFiles/platform/linux/linux_libs.h   |  2 +-
+ Telegram/SourceFiles/qt_functions.cpp         | 94 +++++++++++++++++++
+ Telegram/SourceFiles/qt_static_plugins.cpp    | 10 --
+ Telegram/SourceFiles/ui/text/text.cpp         |  6 +-
+ Telegram/SourceFiles/ui/text/text_block.cpp   |  3 +
+ Telegram/SourceFiles/ui/twidget.cpp           |  4 +-
+ Telegram/gyp/PrecompiledHeader.cmake          |  4 +-
+ Telegram/gyp/Telegram.gyp                     | 12 +--
+ Telegram/gyp/qt.gypi                          | 64 +++----------
+ Telegram/gyp/qt_moc.gypi                      |  2 +-
+ Telegram/gyp/qt_rcc.gypi                      |  2 +-
+ Telegram/gyp/settings_linux.gypi              |  4 +-
+ Telegram/gyp/telegram_linux.gypi              | 41 ++++----
+ Telegram/gyp/telegram_sources.txt             |  9 +-
+ 16 files changed, 150 insertions(+), 120 deletions(-)
+ create mode 100644 Telegram/SourceFiles/qt_functions.cpp
+
 diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
-index 0554fa179..3ea027406 100644
+index 164e8d4f2..12319be14 100644
 --- a/Telegram/Resources/qrc/telegram_linux.qrc
 +++ b/Telegram/Resources/qrc/telegram_linux.qrc
-@@ -1,5 +1,4 @@
+@@ -1,6 +1,5 @@
  <RCC>
    <qresource prefix="/qt">
 -    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
    </qresource>
- </RCC>
+   <qresource prefix="/fc">
+     <file alias="fc-custom.conf">../fc-custom.conf</file>
 diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
 index d4bdadc17..8a420c74b 100644
 --- a/Telegram/SourceFiles/core/launcher.cpp
@@ -40,10 +66,10 @@ index d4bdadc17..8a420c74b 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 6f93d69cd..df185d5a2 100644
+index 4834fee11..2e60a6513 100644
 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h
 +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
-@@ -17,7 +17,7 @@ extern "C" {
+@@ -21,7 +21,7 @@ extern "C" {
  } // extern "C"
  
  #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
@@ -172,10 +198,10 @@ index a757d085f..122ff0f5d 100644
 -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
+index bc4d3d57b..370e5fe85 100644
 --- a/Telegram/SourceFiles/ui/text/text.cpp
 +++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1750,11 +1750,11 @@ private:
+@@ -1760,11 +1760,11 @@ private:
  		if (item == -1)
  			return;
  
@@ -205,10 +231,10 @@ index 2959cec77..04ad00645 100644
  		CrashReports::ClearAnnotationRef("CrashString");
  	}
 diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 71f318229..461f52278 100644
+index 0ccc63ed5..464921148 100644
 --- a/Telegram/SourceFiles/ui/twidget.cpp
 +++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -233,9 +233,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
+@@ -245,9 +245,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
  			, button
  			, QGuiApplication::mouseButtons() | button
  			, QGuiApplication::keyboardModifiers()
@@ -243,7 +269,7 @@ index a0e1e0489..223113081 100644
          IMPLICIT_DEPENDS CXX "${_pch_header}"
          COMMENT "Precompiling header ${_name} for ${_target} (C++)")
 diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 1cab5ae29..465e8276a 100644
+index ac7696e1d..07193cf19 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
 @@ -75,7 +75,6 @@
@@ -262,7 +288,7 @@ index 1cab5ae29..465e8276a 100644
        'AL_ALEXT_PROTOTYPES',
        'TGVOIP_USE_CXX11_LIB',
        'XXH_INLINE_ALL',
-@@ -94,16 +92,8 @@
+@@ -96,16 +94,8 @@
      'include_dirs': [
        '<(src_loc)',
        '<(SHARED_INTERMEDIATE_DIR)',
@@ -437,7 +463,7 @@ index f5624a82b..1129a95c5 100644
        '-no-compress',
        '<(RULE_INPUT_PATH)',
 diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 17219fa2c..6853b5c3e 100644
+index 17219fa2c..b00fd50ea 100644
 --- a/Telegram/gyp/settings_linux.gypi
 +++ b/Telegram/gyp/settings_linux.gypi
 @@ -11,7 +11,6 @@
@@ -448,6 +474,15 @@ index 17219fa2c..6853b5c3e 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': [
@@ -457,7 +492,7 @@ index 17219fa2c..6853b5c3e 100644
        ],
        'cflags_c': [
 diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index ffe0e5a96..bd2ed758f 100644
+index ffe0e5a96..82316d15b 100644
 --- a/Telegram/gyp/telegram_linux.gypi
 +++ b/Telegram/gyp/telegram_linux.gypi
 @@ -23,10 +23,11 @@
@@ -518,7 +553,14 @@ index ffe0e5a96..bd2ed758f 100644
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
      'cflags_cc': [
-@@ -97,9 +89,8 @@
+@@ -91,15 +83,14 @@
+       },
+     },
+     'conditions': [
+-      [ '"<!(uname -p)" != "x86_64"', {
++      [ '"<!(uname -m)" != "x86_64"', {
+         'ldflags': [
+           '-Wl,-wrap,__divmoddi4',
          ],
        }], ['not_need_gtk!="True"', {
          'cflags_cc': [
@@ -531,10 +573,10 @@ index ffe0e5a96..bd2ed758f 100644
        }], ['<!(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
+index 03c8a1335..77884c330 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -755,14 +755,7 @@
+@@ -775,14 +775,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h
  
@@ -550,3 +592,6 @@ index f02296c8a..46bd016dd 100644
  
  platforms: win
  <(res_loc)/winrc/Telegram.rc
+-- 
+2.20.0
+
author	Allen Wild	2018-12-11 20:30:00 -0500
committer	Allen Wild	2018-12-11 20:30:00 -0500
commit	271ea6c2321ab9763c463370da68a55a2db34ff7 (patch)
tree	b19b228872b9b62bb375b41e8e35fc8a7abbd1e2
parent	b5d628f93fd3b516ca954eafaacd301318721849 (diff)
download	aur-271ea6c2321ab9763c463370da68a55a2db34ff7.tar.gz