Rework patches

5 files changed, 68 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f81677d1f845..121a121989c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-git
 	pkgdesc = Official desktop version of Telegram messaging app (dev branch)
-	pkgver = 1.1.23.r17.g1c8db1e2
+	pkgver = 1.2.6.r5.g9551cfaf
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = i686
@@ -11,6 +11,7 @@ pkgbase = telegram-desktop-git
 	makedepends = fontconfig
 	makedepends = git
 	makedepends = google-breakpad-git
+	makedepends = range-v3
 	makedepends = harfbuzz-icu
 	makedepends = jasper
 	makedepends = libappindicator-gtk2
@@ -57,8 +58,8 @@ pkgbase = telegram-desktop-git
 	source = https://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwayland-opensource-src-5.6.2.tar.xz
 	source = telegram-desktop.desktop
 	source = tg.protocol
-	source = arch-tdesktop.patch
-	source = arch-libtgvoip.patch
+	source = tdesktop.patch
+	source = libtgvoip.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -72,8 +73,8 @@ pkgbase = telegram-desktop-git
 	sha256sums = 035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86
 	sha256sums = f47f4b10c8b498ab456ad1dd54754cbd6725b936bb94ffe4fea12d2c2f2b408d
 	sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
-	sha256sums = 1e37edeb5d4cac34bde2c50065093dfc788c70e86de1e3f803544938e1841348
-	sha256sums = 0547229c7a32f821e808f4b0d73d74774de5bea81555638bd0fe5201ba773660
+	sha256sums = faebb28c6d5f5bcefa9d0249187dde025ecf52da18b3ba97081c27962d4169b8
+	sha256sums = 00877dd2c6e808313f1dd38c48f0dc656e342adb01e4d8ec58b14e63408b16c6
 
 pkgname = telegram-desktop-git
 
diff --git a/.gitignore b/.gitignore
index bccd5a6c4557..82447d27a128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@
 !PKGBUILD
 !telegram-desktop.desktop
 !tg.protocol
-!arch-tdesktop.patch
-!arch-libtgvoip.patch
+!tdesktop.patch
+!libtgvoip.patch
diff --git a/PKGBUILD b/PKGBUILD
index 6c48bcad85fc..7e993da1dd66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Lenovsky <lenovsky@protonmail.ch>
 
 pkgname=telegram-desktop-git
-pkgver=1.1.23.r17.g1c8db1e2
+pkgver=1.2.6.r5.g9551cfaf
 pkgrel=1
 pkgdesc="Official desktop version of Telegram messaging app (dev branch)"
 arch=('i686' 'x86_64')
@@ -9,10 +9,11 @@ url="https://desktop.telegram.org/"
 license=('GPL3')
 depends=('ffmpeg' 'libproxy' 'libxkbcommon-x11' 'openal' 'openssl-1.0'
          'xcb-util-image' 'xcb-util-keysyms' 'xcb-util-renderutil' 'xcb-util-wm')
-makedepends=('chrpath' 'cmake' 'fontconfig' 'git' 'google-breakpad-git' 'harfbuzz-icu' 'jasper'
-             'libappindicator-gtk2' 'libexif' 'libgl' 'libinput' 'libjpeg-turbo' 'libmng' 'libpng'
-             'libsm' 'libtiff' 'libunity' 'libva' 'libwebp' 'libxi' 'libxrender' 'mtdev' 'python'
-             'python2' 'sqlite' 'tslib' 'wayland')
+makedepends=('chrpath' 'cmake' 'fontconfig' 'git' 'google-breakpad-git'
+             'range-v3' 'harfbuzz-icu' 'jasper' 'libappindicator-gtk2' 'libexif' 'libgl'
+             'libinput' 'libjpeg-turbo' 'libmng' 'libpng' 'libsm' 'libtiff' 'libunity'
+             'libva' 'libwebp' 'libxi' 'libxrender' 'mtdev' 'python' 'python2' 'sqlite'
+             'tslib' 'wayland')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 _qt_version=5.6.2
@@ -29,9 +30,9 @@ source=("git+https://github.com/telegramdesktop/tdesktop.git#branch=dev"
         "https://download.qt.io/official_releases/qt/${_qt_version%.*}/$_qt_version/submodules/qtwayland-opensource-src-$_qt_version.tar.xz"
         "telegram-desktop.desktop"
         "tg.protocol"
-        "arch-tdesktop.patch"
-        "arch-libtgvoip.patch")
-sha256sums=('SKIP' 
+        "tdesktop.patch"
+        "libtgvoip.patch")
+sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -44,11 +45,11 @@ sha256sums=('SKIP'
             '035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86'
             'f47f4b10c8b498ab456ad1dd54754cbd6725b936bb94ffe4fea12d2c2f2b408d'
             'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
-            '1e37edeb5d4cac34bde2c50065093dfc788c70e86de1e3f803544938e1841348'
-            '0547229c7a32f821e808f4b0d73d74774de5bea81555638bd0fe5201ba773660')
+            'faebb28c6d5f5bcefa9d0249187dde025ecf52da18b3ba97081c27962d4169b8'
+            '00877dd2c6e808313f1dd38c48f0dc656e342adb01e4d8ec58b14e63408b16c6')
 pkgver() {
   cd "$srcdir/tdesktop"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' 
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 prepare() {
   local _qt_patch_file="$srcdir/tdesktop/Telegram/Patches/qtbase_${_qt_version//./_}.diff"
@@ -57,14 +58,14 @@ prepare() {
   local _hime_dir="$_qt_base_dir/src/plugins/platforminputcontexts/hime"
 
   # Apply Telegram Qt patch
-  cd "$_qt_base_dir" 
+  cd "$_qt_base_dir"
   patch -p1 -i "$_qt_patch_file"
 
   # Use OpenSSL 1.0
   echo "INCLUDEPATH += /usr/include/openssl-1.0" >> "$_qt_base_dir/src/network/network.pro"
 
   # Move additional input method plugins to proper directory
-  [ -d "$_fcitx_dir" ] && rm -rf "$_fcitx_dir" 
+  [ -d "$_fcitx_dir" ] && rm -rf "$_fcitx_dir"
   mv "$srcdir/fcitx" "$_fcitx_dir"
   [ -d "$_hime_dir" ] && rm -rf "$_hime_dir"
   mv "$srcdir/hime" "$_hime_dir"
@@ -85,13 +86,13 @@ prepare() {
   git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch"
   git submodule update
 
-  # Apply Arch Patches
+  # Apply Arch-specific Patches
   cd "$srcdir/tdesktop"
-  git apply "$srcdir/arch-tdesktop.patch"
+  git apply "$srcdir/tdesktop.patch"
 
   cd "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip"
   git checkout .
-  git apply "$srcdir/arch-libtgvoip.patch"
+  git apply "$srcdir/libtgvoip.patch"
 }
 
 build() {
@@ -115,8 +116,8 @@ build() {
     -no-gtkstyle \
     -static \
     -nomake examples \
-    -nomake tests 
-    make 
+    -nomake tests
+    make
   make install
   export PATH="$srcdir/qt/bin:$PATH"
 
diff --git a/arch-libtgvoip.patch b/libtgvoip.patch
index 557cb0f553d9..5c0a99c80a73 100644
--- a/arch-libtgvoip.patch
+++ b/libtgvoip.patch
@@ -1,5 +1,5 @@
 diff --git a/libtgvoip.gyp b/libtgvoip.gyp
-index 6363d02..6a922b1 100644
+index 8639848..6a3467c 100644
 --- a/libtgvoip.gyp
 +++ b/libtgvoip.gyp
 @@ -18,6 +18,7 @@
diff --git a/arch-tdesktop.patch b/tdesktop.patch
index 978f8eb0e692..8bb8afe170e8 100644
--- a/arch-tdesktop.patch
+++ b/tdesktop.patch
@@ -10,17 +10,11 @@ index b975c7a8..5ad461a4 100644
  Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
  Q_IMPORT_PLUGIN(QGenericEnginePlugin)
  Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
-diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip
---- a/Telegram/ThirdParty/libtgvoip
-+++ b/Telegram/ThirdParty/libtgvoip
-@@ -1 +1 @@
--Subproject commit 9f78cb85e5db9b39a6c4c3f7847ea3e98c9f544a
-+Subproject commit 9f78cb85e5db9b39a6c4c3f7847ea3e98c9f544a-dirty
 diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 6fa545e5..dc8383fa 100644
+index 84a06153..88df07bd 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
-@@ -86,27 +86,23 @@
+@@ -88,28 +88,24 @@
      ],
  
      'defines': [
@@ -38,22 +32,36 @@ index 6fa545e5..dc8383fa 100644
        '<(SHARED_INTERMEDIATE_DIR)',
 -      '<(libs_loc)/breakpad/src',
 -      '<(libs_loc)/lzma/C',
--      '<(libs_loc)/libexif-0.6.20',
 -      '<(libs_loc)/zlib',
 -      '<(libs_loc)/ffmpeg',
 -      '<(libs_loc)/openal-soft/include',
 -      '<(libs_loc)/opus/include',
+-      '<(libs_loc)/range-v3/include',
        '<(minizip_loc)',
        '<(sp_media_key_tap_loc)',
        '<(emoji_suggestions_loc)',
        '<(submodules_loc)/GSL/include',
        '<(submodules_loc)/variant/include',
+       '<(submodules_loc)/crl/src',
 +      '/usr/include/breakpad',
      ],
      'sources': [
        '<@(qrc_files)',
+diff --git a/Telegram/gyp/linux_glibc_wraps.gyp b/Telegram/gyp/linux_glibc_wraps.gyp
+index 07a8276f..99ac4cac 100644
+--- a/Telegram/gyp/linux_glibc_wraps.gyp
++++ b/Telegram/gyp/linux_glibc_wraps.gyp
+@@ -27,7 +27,7 @@
+     'sources': [
+       '../SourceFiles/platform/linux/linux_glibc_wraps.c',
+     ],
+-    'conditions': [[ '"<!(uname -p)" == "x86_64"', {
++    'conditions': [[ '"<!(uname -m)" == "x86_64"', {
+       'sources': [
+         '../SourceFiles/platform/linux/linux_glibc_wraps_64.c',
+       ],
 diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 67f7976e..8c960313 100644
+index dea127a3..fd7359a9 100644
 --- a/Telegram/gyp/qt.gypi
 +++ b/Telegram/gyp/qt.gypi
 @@ -38,7 +38,6 @@
@@ -82,9 +90,9 @@ index 67f7976e..8c960313 100644
 -              'xcb-xfixes',
 -              'xcb-render',
 -              'xcb-static',
-+              'Qt5WaylandClient',
 +              'qwayland-generic',
 +              'qwayland-egl',
++              'Qt5WaylandClient',
              ],
            }],
          ],
@@ -96,19 +104,18 @@ index 67f7976e..8c960313 100644
    ],
    'library_dirs': [
      '<(qt_loc)/lib',
-@@ -221,7 +210,6 @@
-         '<(qt_loc)/plugins/platforminputcontexts',
+@@ -225,7 +214,6 @@
        ],
        'libraries': [
+         '<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
 -        '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
          '<@(qt_libs_release)',
          '<(linux_lib_ssl)',
          '<(linux_lib_crypto)',
-@@ -234,12 +222,30 @@
+@@ -238,12 +226,30 @@
          '-lgthread-2.0',
          '-lglib-2.0',
          '-lpthread',
--      ],
 +        '-lXi',
 +        '-lXext',
 +        '-lXfixes',
@@ -128,29 +135,29 @@ index 67f7976e..8c960313 100644
 +        '<!(pkg-config 2> /dev/null --libs wayland-client wayland-cursor)',
 +        '-lproxy',
 +        '-lGL',
-+        ],
+       ],
        'include_dirs': [
          '<(qt_loc)/mkspecs/linux-g++',
        ],
        'ldflags': [
 -        '-static-libstdc++',
          '-pthread',
-         '-g',
          '-rdynamic',
+       ],
 diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index fde88dcd..1fd1b9cb 100644
+index b93bace4..0f14aa1f 100644
 --- a/Telegram/gyp/settings_linux.gypi
 +++ b/Telegram/gyp/settings_linux.gypi
-@@ -25,7 +25,6 @@
+@@ -24,7 +24,6 @@
+         'linux_common_flags': [
            '-pipe',
-           '-g',
            '-Wall',
 -          '-Werror',
            '-W',
            '-fPIC',
            '-Wno-unused-variable',
 diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 721d4f6c..b30c2da7 100644
+index f6918c22..36ef6ad3 100644
 --- a/Telegram/gyp/telegram_linux.gypi
 +++ b/Telegram/gyp/telegram_linux.gypi
 @@ -22,11 +22,20 @@
@@ -180,7 +187,7 @@ index 721d4f6c..b30c2da7 100644
        'linux_path_ffmpeg%': '/usr/local',
        'linux_path_openal%': '/usr/local',
 @@ -37,20 +46,11 @@
-       'linux_path_opus_include%': '<(libs_loc)/opus/include',
+       'linux_path_range%': '/usr/local',
      },
      'include_dirs': [
 -      '/usr/local/include',
@@ -188,13 +195,13 @@ index 721d4f6c..b30c2da7 100644
 -      '<(linux_path_openal)/include',
 -      '<(linux_path_breakpad)/include/breakpad',
        '<(linux_path_opus_include)',
+-      '<(linux_path_range)/include',
 +      '/usr/include',
      ],
      'library_dirs': [
 -      '/usr/local/lib',
 -      '<(linux_path_ffmpeg)/lib',
 -      '<(linux_path_openal)/lib',
--      '<(linux_path_libexif_lib)',
 -      '<(linux_path_va)/lib',
 -      '<(linux_path_vdpau)/lib',
 -      '<(linux_path_breakpad)/lib',
@@ -202,7 +209,7 @@ index 721d4f6c..b30c2da7 100644
      ],
      'libraries': [
        'breakpad_client',
-@@ -58,21 +58,7 @@
+@@ -58,23 +58,14 @@
        'ibusplatforminputcontextplugin',
        'fcitxplatforminputcontextplugin',
        'himeplatforminputcontextplugin',
@@ -223,13 +230,12 @@ index 721d4f6c..b30c2da7 100644
 -#      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
 +      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
-     'conditions': [['not_need_gtk!="True"', {
-         'cflags_cc': [
-@@ -80,6 +66,7 @@
-             '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
-             '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
-             '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
-+            '<!(pkg-config 2> /dev/null --cflags <@(pkgconfig_libs))',
-          ],
-     }]],
-     'configurations': {
+     'cflags_cc': [
++      '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
++      '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
++      '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
++      '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
++      '<!(pkg-config 2> /dev/null --cflags <@(pkgconfig_libs))',
+       '-Wno-strict-overflow',
+     ],
+     'ldflags': [