summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaochen Tong2017-09-05 15:45:08 +0800
committerHaochen Tong2017-09-05 15:45:08 +0800
commit3ae168e2e158f5086205d4703ea39c26d6a7e82a (patch)
tree0682a7cbcfe7cf0f498b2bf121f61a081540459b
parent06d61edfde310a31b2eaf061cf0f7ee1163ff10f (diff)
downloadaur-3ae168e2e158f5086205d4703ea39c26d6a7e82a.tar.gz
upgpkg
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--tdesktop.patch22
3 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4809dc03a7e4..b7d58e20ccba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Aug 27 10:14:00 UTC 2017
+# Tue Sep 5 06:17:35 UTC 2017
pkgbase = telegram-desktop-systemqt
pkgdesc = Experimental build of Telegram Desktop (using system Qt)
- pkgver = 1.1.19
+ pkgver = 1.1.22
pkgrel = 1
url = https://desktop.telegram.org/
install = telegram-desktop.install
@@ -31,7 +31,7 @@ pkgbase = telegram-desktop-systemqt
optdepends = libappindicator-gtk3: AppIndicator tray icon
provides = telegram-desktop
conflicts = telegram-desktop
- source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.1.19
+ source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.1.22
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
@@ -47,7 +47,7 @@ pkgbase = telegram-desktop-systemqt
sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17
sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82
- sha256sums = 8532262ca8876bed0b347115fb87453885e6150ebc3995e2daa5d38a4f318ae5
+ sha256sums = 742df297e6742021b16738b966b170f3cf5cccf7cf267c9be08dfe81cb92bbfb
sha256sums = 0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075
pkgname = telegram-desktop-systemqt
diff --git a/PKGBUILD b/PKGBUILD
index de909b2b8bf8..092fee3697d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
# https://github.com/mymedia2/tdesktop
pkgname=telegram-desktop-systemqt
-pkgver=1.1.19
-pkgrel=2
+pkgver=1.1.22
+pkgrel=1
pkgdesc='Experimental build of Telegram Desktop (using system Qt)'
arch=('i686' 'x86_64')
url="https://desktop.telegram.org/"
@@ -37,7 +37,7 @@ sha256sums=('SKIP'
'41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17'
'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
'7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82'
- '8532262ca8876bed0b347115fb87453885e6150ebc3995e2daa5d38a4f318ae5'
+ '742df297e6742021b16738b966b170f3cf5cccf7cf267c9be08dfe81cb92bbfb'
'0e55b150b91aeeddcb813fb242a62fe4d1977bcac457eb9d65997faef643f075')
prepare() {
diff --git a/tdesktop.patch b/tdesktop.patch
index 7921721e3eff..cb0a6ea88e9c 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -229,13 +229,13 @@ index 5d6830e9..c3f08d3f 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 9d92b817..e5c81e12 100644
+index 0d1f38aa..06af0021 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
-@@ -79,12 +79,10 @@
- 'codegen.gyp:codegen_lang',
+@@ -80,12 +80,10 @@
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
+ 'tests/tests.gyp:tests',
- 'utils.gyp:Updater',
'../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
],
@@ -245,7 +245,7 @@ index 9d92b817..e5c81e12 100644
'AL_ALEXT_PROTOTYPES',
'TGVOIP_USE_CXX11_LIB',
'<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
-@@ -93,14 +91,7 @@
+@@ -94,14 +92,7 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -262,7 +262,7 @@ index 9d92b817..e5c81e12 100644
'<(emoji_suggestions_loc)',
'<(submodules_loc)/GSL/include',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 81c13a18..99af0edb 100644
+index 6032d066..fe92d853 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -27,25 +27,21 @@
@@ -371,10 +371,10 @@ index 81c13a18..99af0edb 100644
- '<(linux_lib_ssl)',
- '<(linux_lib_crypto)',
- '<!@(python -c "for s in \'<(linux_lib_icu)\'.split(\' \'): print(s)")',
-+ 'crypto',
- 'xcb',
- 'X11',
- 'X11-xcb',
++ '-lcrypto',
+ '-lxcb',
+ '-lX11',
+ '-lX11-xcb',
@@ -238,7 +206,6 @@
'<(qt_loc)/mkspecs/linux-g++',
],
@@ -492,10 +492,10 @@ index 2c464928..b505a67d 100644
],
'configurations': {
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 40556793..b42767e3 100644
+index ef66965f..81852d10 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -587,14 +587,7 @@
+@@ -598,14 +598,7 @@
<(emoji_suggestions_loc)/emoji_suggestions.cpp
<(emoji_suggestions_loc)/emoji_suggestions.h