upgpkg

3 files changed, 26 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83f74b7c92c3..905e7ef8ac74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr  2 16:38:38 UTC 2017
+# Sat Apr  8 15:49:13 UTC 2017
 pkgbase = telegram-desktop-systemqt
 	pkgdesc = Experimental build of Telegram Desktop (using system Qt)
-	pkgver = 1.0.27
-	pkgrel = 2
+	pkgver = 1.0.29
+	pkgrel = 1
 	url = https://desktop.telegram.org/
 	install = telegram-desktop.install
 	arch = i686
@@ -31,16 +31,20 @@ 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.0.27
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.0.29
+	source = GSL::git+https://github.com/Microsoft/GSL.git
+	source = variant::git+https://github.com/mapbox/variant.git
 	source = telegramdesktop.desktop
 	source = tg.protocol
 	source = CMakeLists.inj
 	source = aur-build-fixes.patch
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17
 	sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
 	sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82
-	sha256sums = 82b2458e8ad5b316b9f9748c27fbe65e867ea3c29d78d1442e293a282eba63a0
+	sha256sums = a3723a51c60417c4a0e0cf92976eaedc46cc448d81e6bb0fdd33a622c4a1b819
 
 pkgname = telegram-desktop-systemqt
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d1f7972dbd3..2cddeac1b7f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-systemqt
-pkgver=1.0.27
-pkgrel=2
+pkgver=1.0.29
+pkgrel=1
 pkgdesc='Experimental build of Telegram Desktop (using system Qt)'
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org/"
@@ -21,21 +21,28 @@ provides=('telegram-desktop')
 install="telegram-desktop.install"
 source=(
     "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"
+    "GSL::git+https://github.com/Microsoft/GSL.git"
+    "variant::git+https://github.com/mapbox/variant.git"
     "telegramdesktop.desktop"
     "tg.protocol"
     "CMakeLists.inj"
     "aur-build-fixes.patch"
 )
 sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
             '41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17'
             'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
             '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82'
-            '82b2458e8ad5b316b9f9748c27fbe65e867ea3c29d78d1442e293a282eba63a0')
+            'a3723a51c60417c4a0e0cf92976eaedc46cc448d81e6bb0fdd33a622c4a1b819')
 
 prepare() {
     cd "$srcdir/tdesktop"
-    git submodule update --init
-    git apply "../aur-build-fixes.patch"
+    git submodule init
+    git config submodule.third_party/GSL.url "$srcdir/GSL"
+    git config submodule.third_party/variant.url "$srcdir/variant"
+    git submodule update
+    patch -Np1 -i "../aur-build-fixes.patch"
 }
 
 build() {
diff --git a/aur-build-fixes.patch b/aur-build-fixes.patch
index 6e6d361811c9..ce194471d44c 100644
--- a/aur-build-fixes.patch
+++ b/aur-build-fixes.patch
@@ -231,7 +231,7 @@ diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
 index fb22932c..f4743e15 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
-@@ -77,24 +77,16 @@
+@@ -78,24 +78,16 @@
        'codegen.gyp:codegen_style',
        'codegen.gyp:codegen_numbers',
        'codegen.gyp:MetaLang',
@@ -289,7 +289,7 @@ index a3212210..213723c5 100644
              }]
            ]
          },
-@@ -85,31 +81,12 @@
+@@ -85,31 +81,11 @@
              ],
            }],
            [ 'build_linux', {
@@ -317,6 +317,7 @@ index a3212210..213723c5 100644
 -              'fontconfig',
 -              'expat',
 -              'freetype',
+-              'z',
 -              'xcb-shm',
 -              'xcb-xfixes',
 -              'xcb-render',
@@ -450,7 +451,7 @@ index b42e7443..71e39897 100644
        '/usr/local/lib',
        '<(linux_path_ffmpeg)/lib',
        '<(linux_path_openal)/lib',
-@@ -50,30 +52,19 @@
+@@ -50,30 +52,18 @@
        '<(linux_path_breakpad)/lib',
      ],
      'libraries': [
@@ -478,7 +479,6 @@ index b42e7443..71e39897 100644
 +      'swresample',
 +      'swscale',
 +      'avutil',
-+      'z',
 +      'minizip',
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
@@ -494,7 +494,7 @@ diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.t
 index 01f08e35..51c72634 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -511,14 +511,7 @@
+@@ -522,14 +522,7 @@
  <(src_loc)/structs.cpp
  <(src_loc)/structs.h