Update to version 0.10.6

4 files changed, 245 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2388ae7be9f9..a0de82d974f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Sep  8 12:28:16 UTC 2016
+# Mon Sep 12 20:57:54 UTC 2016
 pkgbase = telegram-desktop
 	pkgdesc = Official desktop version of Telegram messaging app.
-	pkgver = 0.10.1
+	pkgver = 0.10.6
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = i686
@@ -16,6 +16,7 @@ pkgbase = telegram-desktop
 	makedepends = libexif
 	makedepends = libwebp
 	makedepends = google-breakpad-git
+	makedepends = chrpath
 	makedepends = xcb-util-keysyms
 	makedepends = libgl
 	makedepends = fontconfig
@@ -48,16 +49,20 @@ pkgbase = telegram-desktop
 	depends = xcb-util-image
 	depends = xcb-util-renderutil
 	depends = hicolor-icon-theme
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v0.10.1
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v0.10.6
 	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 = git+https://chromium.googlesource.com/external/gyp
 	source = telegramdesktop.desktop
 	source = tg.protocol
+	source = fix-build.diff
 	sha256sums = SKIP
 	sha256sums = 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a
 	sha256sums = 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada
+	sha256sums = SKIP
 	sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17
 	sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
+	sha256sums = 617383830419170c71aea86b8776ff884c0cb737a3c5d586c05a8595b9dc7863
 
 pkgname = telegram-desktop
 
diff --git a/.gitignore b/.gitignore
index 9089b507767d..7e7d25a6ec55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 /*.tar.gz
 /*.tar.xz
 /tdesktop
-/breakpad
-/breakpad-lss
+/gyp
 /pkg
 /src
diff --git a/PKGBUILD b/PKGBUILD
index b9129f7ffd64..5017f75c2f28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=telegram-desktop
-pkgver=0.10.1
+pkgver=0.10.6
 pkgrel=1
 pkgdesc='Official desktop version of Telegram messaging app.'
 arch=('i686' 'x86_64')
@@ -30,6 +30,7 @@ makedepends=(
     'libexif'
     'libwebp'
     'google-breakpad-git'
+    'chrpath'
     
     # QT5 build dependencies
     'xcb-util-keysyms'
@@ -57,15 +58,19 @@ source=(
     "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"
+    "git+https://chromium.googlesource.com/external/gyp"
     "telegramdesktop.desktop"
     "tg.protocol"
+    "fix-build.diff"
 )
 sha256sums=(
     'SKIP'
     '6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a'
     '2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada'
+    'SKIP'
     '41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17'
     'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
+    '617383830419170c71aea86b8776ff884c0cb737a3c5d586c05a8595b9dc7863'
 )
 
 prepare() {
@@ -86,18 +91,21 @@ prepare() {
         patch -p1 -i "$qt_patch_file"
     fi
     
-    sed -i 's,LIBS += /usr/local/lib/libxkbcommon.a,,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
-    sed -i 's,#xkbcommon\\,xkbcommon\\,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
-    sed -i 's,LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a,,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
-    sed -i 's,./../../Libraries/breakpad/src,,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+    cd "$srcdir/gyp"
+    git apply "$srcdir/tdesktop/Telegram/Patches/gyp.diff"
+    sed -i 's/exec python /exec python2 /g' "$srcdir/gyp/gyp"
+    
+    if [ ! -h "$srcdir/Libraries/gyp" ]; then
+        ln -s "$srcdir/gyp" "$srcdir/Libraries/gyp"
+    fi
     
-    sed -i 's/CUSTOM_API_ID//g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+    if [ ! -d "$srcdir/Libraries/cmake-3.6.2"  ]; then
+        mkdir -p "$srcdir/Libraries/cmake-3.6.2/bin"
+        ln -s "/usr/bin/cmake" "$srcdir/Libraries/cmake-3.6.2/bin/cmake"
+    fi
     
-    (
-        echo "PKGCONFIG += breakpad-client"
-        echo "DEFINES += TDESKTOP_DISABLE_AUTOUPDATE"
-        echo "DEFINES += TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
-    ) >> "$srcdir/tdesktop/Telegram/Telegram.pro"
+    cd "$srcdir/tdesktop"
+    git apply "$srcdir/fix-build.diff"
 }
 
 build() {
@@ -133,57 +141,19 @@ build() {
     make
     make install
     
-    # Build codegen_style
-    mkdir -p "$srcdir/tdesktop/Linux/obj/codegen_style/Release"
-    cd "$srcdir/tdesktop/Linux/obj/codegen_style/Release"
-    qmake CONFIG+=release "../../../../Telegram/build/qmake/codegen_style/codegen_style.pro"
-    make
-    
-    # Build codegen_numbers
-    mkdir -p "$srcdir/tdesktop/Linux/obj/codegen_numbers/Release"
-    cd "$srcdir/tdesktop/Linux/obj/codegen_numbers/Release"
-    qmake CONFIG+=release "../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro"
-    make
-    
-    # Build MetaLang
-    mkdir -p "$srcdir/tdesktop/Linux/ReleaseIntermediateLang"
-    cd "$srcdir/tdesktop/Linux/ReleaseIntermediateLang"
-    qmake CONFIG+=release "../../Telegram/MetaLang.pro"
-    make
-    
     # Build Telegram Desktop
-    mkdir -p "$srcdir/tdesktop/Linux/ReleaseIntermediate"
-    cd "$srcdir/tdesktop/Linux/ReleaseIntermediate"
-    
-    #./../codegen/Release/codegen_style \
-    #    "-I./../../Telegram/Resources" \
-    #    "-I./../../Telegram/SourceFiles" \
-    #    "-o./../../Telegram/GeneratedFiles/styles" \
-    #    all_files.style --rebuild
-    #
-    #./../codegen/Release/codegen_numbers \
-    #    "-o./../../Telegram/GeneratedFiles" \
-    #    "./../../Telegram/Resources/numbers.txt"
-    #
-    #./../ReleaseLang/MetaLang \
-    #    -lang_in ./../../Telegram/Resources/langs/lang.strings \
-    #    -lang_out ./../../Telegram/GeneratedFiles/lang_auto
-    
-    qmake \
-        CONFIG+=release \
-        QT_TDESKTOP_PATH="$srcdir/qt" \
-        QT_TDESKTOP_VERSION=$qt_version \
-        "../../Telegram/Telegram.pro"
+    rm -rf "$srcdir/tdesktop/out"
+    cd "$srcdir/tdesktop/Telegram"
+    gyp/refresh.sh
     
-    make style_target
-    make numbers_target
-    make lang_target
+    cd "$srcdir/tdesktop/out/Release"
     make
+    chrpath --delete "$srcdir/tdesktop/out/Release/Telegram"
 }
 
 package() {
     install -dm755 "$pkgdir/usr/bin"
-    install -m755 "$srcdir/tdesktop/Linux/Release/Telegram" "$pkgdir/usr/bin/telegram-desktop"
+    install -m755 "$srcdir/tdesktop/out/Release/Telegram" "$pkgdir/usr/bin/telegram-desktop"
     
     install -d "$pkgdir/usr/share/applications"
     install -m644 "$srcdir/telegramdesktop.desktop" "$pkgdir/usr/share/applications/telegramdesktop.desktop"
diff --git a/fix-build.diff b/fix-build.diff
new file mode 100644
index 000000000000..a0808a8587da
--- /dev/null
+++ b/fix-build.diff
@@ -0,0 +1,211 @@
+diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
+index 0e8db70..2934e50 100644
+--- a/Telegram/gyp/Telegram.gyp
++++ b/Telegram/gyp/Telegram.gyp
+@@ -69,19 +69,15 @@
+     ],
+ 
+     'defines': [
+-      'AL_LIBTYPE_STATIC',
++      'TDESKTOP_DISABLE_AUTOUPDATE',
++      'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME',
+     ],
+ 
+     'include_dirs': [
+       '<(src_loc)',
+       '<(SHARED_INTERMEDIATE_DIR)',
+-      '<(libs_loc)/breakpad/src',
+-      '<(libs_loc)/lzma/C',
+-      '<(libs_loc)/libexif-0.6.20',
+-      '<(libs_loc)/zlib-1.2.8',
+-      '<(libs_loc)/ffmpeg',
+-      '<(libs_loc)/openal-soft/include',
+       '<(minizip_loc)',
++      '/usr/include/breakpad',
+     ],
+     'sources': [
+       '<@(qrc_files)',
+diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+index ea6f0f5..dcd2cfd 100644
+--- a/Telegram/gyp/qt.gypi
++++ b/Telegram/gyp/qt.gypi
+@@ -29,7 +29,6 @@
+             'Qt5Network',
+             'Qt5Widgets',
+             'Qt5Gui',
+-            'qtharfbuzzng',
+           ],
+           'conditions': [
+             [ 'build_macold', {
+@@ -78,7 +77,7 @@
+             ],
+           }],
+           [ 'build_linux', {
+-            'qt_loc_unix': '/usr/local/tdesktop/Qt-<(qt_version)',
++            'qt_loc_unix': '../../../qt',
+             'qt_lib_prefix': 'lib',
+             'qt_lib_debug_postfix': '.a',
+             'qt_lib_release_postfix': '.a',
+@@ -91,21 +90,6 @@
+               '<@(qt_libs)',
+               'Qt5DBus',
+               'Qt5Core',
+-              'qtpcre',
+-              'ssl',
+-              'crypto',
+-              'Xi',
+-              'Xext',
+-              'SM',
+-              'ICE',
+-              'fontconfig',
+-              'expat',
+-              'freetype',
+-              'xcb',
+-              'xcb-shm',
+-              'xcb-xfixes',
+-              'xcb-render',
+-              'xcb-static',
+             ],
+           }],
+         ],
+@@ -206,8 +190,15 @@
+         '<(qt_loc)/plugins/platforms/xcb/xcb-static',
+       ],
+       'libraries': [
+-        '/usr/local/lib/libxkbcommon.a',
+         '<@(qt_libs_release)',
++        'z',
++        'pcre16',
++        'harfbuzz',
++        'icuuc',
++        'icutu',
++        'icui18n',
++        'png16',
++        'jpeg',
+         'X11',
+         'X11-xcb',
+         'dbus-1',
+@@ -215,6 +206,19 @@
+         'gthread-2.0',
+         'glib-2.0',
+         'pthread',
++        'ssl',
++        'crypto',
++        'Xi',
++        'Xext',
++        'SM',
++        'ICE',
++        'fontconfig',
++        'expat',
++        'freetype',
++        'xcb',
++        'xcb-shm',
++        'xcb-xfixes',
++        'xcb-render',
+       ],
+       'include_dirs': [
+         '<(qt_loc)/mkspecs/linux-g++',
+diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
+index 15bfbb6..5992643 100644
+--- a/Telegram/gyp/telegram_linux.gypi
++++ b/Telegram/gyp/telegram_linux.gypi
+@@ -29,31 +29,41 @@
+       ],
+     },
+     'include_dirs': [
+-      '/usr/local/include',
+-      '<(libs_loc)/openssl-xcode/include'
++      '/usr/include',
+     ],
+     'library_dirs': [
+-      '/usr/local/lib',
+-      '<(libs_loc)/libexif-0.6.20/libexif/.libs',
+-      '<(libs_loc)/breakpad/src/client/linux',
++      '/usr/lib',
+     ],
+     'libraries': [
+       'breakpad_client',
+       'composeplatforminputcontextplugin',
+       'ibusplatforminputcontextplugin',
+       'fcitxplatforminputcontextplugin',
+-      'liblzma.a',
+-      'libopenal.a',
+-      'libavformat.a',
+-      'libavcodec.a',
+-      'libswresample.a',
+-      'libswscale.a',
+-      'libavutil.a',
+-      'libopus.a',
+-      'libva-x11.a',
+-      'libva-drm.a',
+-      'libva.a',
+-      'libz.a',
++      'xkbcommon',
++      'xkbcommon-x11',
++      'xcb-randr',
++      'xcb-xinerama',
++      'xcb-xkb',
++      'xcb-shape',
++      'xcb-icccm',
++      'xcb-sync',
++      'xcb-keysyms',
++      'xcb-image',
++      'xcb-render-util',
++      'proxy',
++      'lzma',
++      'openal',
++      'avformat',
++      'avcodec',
++      'swresample',
++      'swscale',
++      'avutil',
++      'opus',
++      'va-x11',
++      'va-drm',
++      'va',
++      'z',
++      'webp',
+ #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
+     ],
+     'cflags_cc': [
+diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp
+index 117c87a..5ff1a4c 100644
+--- a/Telegram/gyp/utils.gyp
++++ b/Telegram/gyp/utils.gyp
+@@ -101,8 +101,6 @@
+     },
+     'include_dirs': [
+       '<(src_loc)',
+-      '<(libs_loc)/lzma/C',
+-      '<(libs_loc)/zlib-1.2.8',
+     ],
+     'sources': [
+       '<(src_loc)/_other/packer.cpp',
+@@ -122,11 +120,10 @@
+             ],
+           }, {
+             'include_dirs': [
+-              '/usr/local/include',
+-              '<(libs_loc)/openssl-xcode/include'
++              '/usr/include',
+             ],
+             'library_dirs': [
+-              '/usr/local/lib',
++              '/usr/lib',
+             ],
+           }]
+         ],
+@@ -144,11 +141,10 @@
+             ],
+           }, {
+             'include_dirs': [
+-              '/usr/local/include',
+-              '<(libs_loc)/openssl-xcode/include'
++              '/usr/include',
+             ],
+             'library_dirs': [
+-              '/usr/local/lib',
++              '/usr/lib',
+             ],
+           }]
+         ],