summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD8
-rw-r--r--aur-fixes.diff28
3 files changed, 23 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bc89e068244f..b300b25acb2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Sep 16 12:05:12 UTC 2016
+# Wed Sep 21 20:37:57 UTC 2016
pkgbase = telegram-desktop
pkgdesc = Official desktop version of Telegram messaging app.
- pkgver = 0.10.6
- pkgrel = 3
+ pkgver = 0.10.7
+ pkgrel = 1
url = https://desktop.telegram.org/
arch = i686
arch = x86_64
@@ -52,7 +52,7 @@ pkgbase = telegram-desktop
depends = xcb-util-image
depends = xcb-util-renderutil
depends = hicolor-icon-theme
- source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#commit=8660ab555bc759a008658a78981a6e3ea06502d5
+ source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v0.10.7
source = https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz
source = https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz
source = https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz
@@ -67,7 +67,7 @@ pkgbase = telegram-desktop
sha256sums = SKIP
sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17
sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
- sha256sums = 41f69a194113c9ee1aae0261346a94d9b812db80029f834ba50889668f7c2b50
+ sha256sums = 5990d96687352f9bb13f94029dd21aadb0a21047015858fd9724ebcf62e6fb1e
pkgname = telegram-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 9329bab03ca9..516ee8d65a54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=telegram-desktop
-pkgver=0.10.6
-pkgrel=3
+pkgver=0.10.7
+pkgrel=1
pkgdesc='Official desktop version of Telegram messaging app.'
arch=('i686' 'x86_64')
url="https://desktop.telegram.org/"
@@ -58,7 +58,7 @@ makedepends=(
)
qt_version=5.6.0
source=(
- "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#commit=8660ab555bc759a008658a78981a6e3ea06502d5"
+ "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"
"https://download.qt.io/official_releases/qt/${qt_version%.*}/$qt_version/submodules/qtbase-opensource-src-$qt_version.tar.xz"
"https://download.qt.io/official_releases/qt/${qt_version%.*}/$qt_version/submodules/qtimageformats-opensource-src-$qt_version.tar.xz"
"https://download.qt.io/official_releases/qt/${qt_version%.*}/$qt_version/submodules/qtwayland-opensource-src-$qt_version.tar.xz"
@@ -75,7 +75,7 @@ sha256sums=(
'SKIP'
'41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17'
'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
- '41f69a194113c9ee1aae0261346a94d9b812db80029f834ba50889668f7c2b50'
+ '5990d96687352f9bb13f94029dd21aadb0a21047015858fd9724ebcf62e6fb1e'
)
prepare() {
diff --git a/aur-fixes.diff b/aur-fixes.diff
index eebdfbc9037d..69d13a590286 100644
--- a/aur-fixes.diff
+++ b/aur-fixes.diff
@@ -54,7 +54,7 @@ index 0e8db70..7f5a7d8 100644
'sources': [
'<@(qrc_files)',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index b82f833..7430ea0 100644
+index 2a8f010..7fc819e 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -29,7 +29,6 @@
@@ -74,13 +74,11 @@ index b82f833..7430ea0 100644
'qt_lib_prefix': 'lib',
'qt_lib_debug_postfix': '.a',
'qt_lib_release_postfix': '.a',
-@@ -91,20 +90,6 @@
+@@ -91,18 +90,6 @@
'<@(qt_libs)',
'Qt5DBus',
'Qt5Core',
- 'qtpcre',
-- 'ssl',
-- 'crypto',
- 'Xi',
- 'Xext',
- 'SM',
@@ -95,12 +93,14 @@ index b82f833..7430ea0 100644
],
}],
],
-@@ -202,16 +187,36 @@
- 'conditions': [
- [ 'build_linux', {
+@@ -202,18 +189,36 @@
+ '<(qt_loc)/plugins/platforminputcontexts',
+ ],
'libraries': [
- '/usr/local/lib/libxkbcommon.a',
'<@(qt_libs_release)',
+- '/usr/local/ssl/lib/libssl.a',
+- '/usr/local/ssl/lib/libcrypto.a',
+ 'z',
+ 'pcre16',
+ 'harfbuzz',
@@ -109,6 +109,8 @@ index b82f833..7430ea0 100644
+ 'icui18n',
+ 'png16',
+ 'jpeg',
++ 'ssl',
++ 'crypto',
'xcb',
+ 'xcb-shm',
+ 'xcb-xfixes',
@@ -121,8 +123,6 @@ index b82f833..7430ea0 100644
'gthread-2.0',
'glib-2.0',
'pthread',
-+ 'ssl',
-+ 'crypto',
+ 'Xi',
+ 'Xext',
+ 'SM',
@@ -202,11 +202,11 @@ index 15bfbb6..5ed7872 100644
],
'cflags_cc': [
diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp
-index 117c87a..5ff1a4c 100644
+index 209c737..41425f1 100644
--- a/Telegram/gyp/utils.gyp
+++ b/Telegram/gyp/utils.gyp
-@@ -101,8 +101,6 @@
- },
+@@ -109,8 +109,6 @@
+ ],
'include_dirs': [
'<(src_loc)',
- '<(libs_loc)/lzma/C',
@@ -214,7 +214,7 @@ index 117c87a..5ff1a4c 100644
],
'sources': [
'<(src_loc)/_other/packer.cpp',
-@@ -122,11 +120,10 @@
+@@ -130,11 +128,10 @@
],
}, {
'include_dirs': [
@@ -228,7 +228,7 @@ index 117c87a..5ff1a4c 100644
],
}]
],
-@@ -144,11 +141,10 @@
+@@ -152,11 +149,10 @@
],
}, {
'include_dirs': [