Commenting out unneccesary stuff

3 files changed, 17 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a02c4e68c595..7013c9ff2d5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kotatogram-desktop
 	pkgdesc = Experimental Telegram Desktop fork with option to select custom fonts.
 	pkgver = 1.1.1
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/kotatogram/kotatogram-desktop
 	arch = x86_64
 	license = GPL3
@@ -70,7 +70,7 @@ pkgbase = kotatogram-desktop
 	sha512sums = 117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867
 	sha512sums = 087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0
 	sha512sums = d5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9
-	sha512sums = 27a4f94a9cf5ea1096001d151f560b6ec3a00018b377c2ff00a133a121598713e4d1a3a79f0c4f0e4c1a8035b4317c9585d3953dfaf04a0d70aba5adc5f0bdea
+	sha512sums = f667b00f4c2e02799d3a130f1370bbe13866294329164c9fee901fa54655e4ebfaaae4e0f15327b660b10248c6a087dd2fa53d9f72714ba099ea2cbf4d07ca32
 	sha512sums = be4bac59d0002006bc00ada0f2edff1e5432eb0e34d19ac0bf64983016ee9194386ce35e63aaeb854862696c03e947d6f79d5e1c355e888f2f7f1bab7045e1af
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
 	sha512sums = 2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c
diff --git a/PKGBUILD b/PKGBUILD
index 82848c8cb5cd..30e48b0fba38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=kotatogram-desktop
 pkgver=1.1.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Experimental Telegram Desktop fork with option to select custom fonts."
 arch=(x86_64)
 url="https://github.com/kotatogram/kotatogram-desktop"
@@ -85,7 +85,7 @@ sha512sums=(
         '117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867'  # no-gtk2.patch
         '087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0'  # Revert-Change-some-private-header-includes.patch
         'd5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9'  # Revert-Disable-DemiBold-fallback-for-Semibold.patch
-        '27a4f94a9cf5ea1096001d151f560b6ec3a00018b377c2ff00a133a121598713e4d1a3a79f0c4f0e4c1a8035b4317c9585d3953dfaf04a0d70aba5adc5f0bdea'  # tdesktop.patch
+        'f667b00f4c2e02799d3a130f1370bbe13866294329164c9fee901fa54655e4ebfaaae4e0f15327b660b10248c6a087dd2fa53d9f72714ba099ea2cbf4d07ca32'  # tdesktop.patch
         'be4bac59d0002006bc00ada0f2edff1e5432eb0e34d19ac0bf64983016ee9194386ce35e63aaeb854862696c03e947d6f79d5e1c355e888f2f7f1bab7045e1af'  # tdesktop_lottie_animation_qtdebug.patch
         'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'  # tg.protocol
         '2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c'  # Use-system-wide-font.patch
@@ -119,7 +119,7 @@ prepare() {
 
         git submodule update
 
-        dos2unix "$srcdir/kdesktop/.appveyor/install.bat"
+        # dos2unix "$srcdir/kdesktop/.appveyor/install.bat"
 
         patch -Np1 -i "$srcdir/no-gtk2.patch"
         # patch -Np1 -i "$srcdir/Revert-Change-some-private-header-includes.patch"
@@ -128,13 +128,13 @@ prepare() {
         # patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
         patch -Np1 -i "$srcdir/tdesktop.patch"
 
-        unix2dos "$srcdir/kdesktop/.appveyor/install.bat"
+        # unix2dos "$srcdir/kdesktop/.appveyor/install.bat"
         # disable static-qt for rlottie
         # sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/kdesktop/Telegram/lib_rlottie/lib_rlottie.gyp"
 
-        cd "$srcdir/kdesktop"
-        cd "Telegram/ThirdParty/libtgvoip"
-        patch -Np1 -i "$srcdir/libtgvoip.patch"
+        # cd "$srcdir/kdesktop"
+        # cd "Telegram/ThirdParty/libtgvoip"
+        # patch -Np1 -i "$srcdir/libtgvoip.patch"
 }
 
 build() {
diff --git a/tdesktop.patch b/tdesktop.patch
index e9dfd51d13f6..4b89cf6e1398 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -155,10 +155,10 @@ index cc1a767cf..1f2330cb5 100644
 +#endif // Q_OS_WIN | Q_OS_MAC
 Submodule Telegram/ThirdParty/libtgvoip contains modified content
 diff --git a/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp b/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
-index 1d03579..fbdfa8a 100644
+index 1d03579..f48c18e 100644
 --- a/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
 +++ b/Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
-@@ -14,11 +14,12 @@
+@@ -14,7 +14,7 @@
          'variables': {
            'tgvoip_src_loc': '.',
            'special_build_target%': '',
@@ -167,11 +167,6 @@ index 1d03579..fbdfa8a 100644
          },
          'include_dirs': [
            '<(tgvoip_src_loc)/webrtc_dsp',
-           '<(linux_path_opus_include)',
-+          '/usr/include/openssl',
-         ],
-         'direct_dependent_settings': {
-           'include_dirs': [
 Submodule Telegram/gyp/helpers contains modified content
 diff --git a/Telegram/gyp/helpers/PrecompiledHeader.cmake b/Telegram/gyp/helpers/PrecompiledHeader.cmake
 index 9508bd8..15952e5 100644
@@ -216,20 +211,18 @@ index 12b91b0..507a6b9 100644
        ],
        'cflags_c': [
 diff --git a/Telegram/gyp/helpers/modules/openssl.gypi b/Telegram/gyp/helpers/modules/openssl.gypi
-index 91f1a99..d01c463 100644
+index 91f1a99..03c4533 100644
 --- a/Telegram/gyp/helpers/modules/openssl.gypi
 +++ b/Telegram/gyp/helpers/modules/openssl.gypi
-@@ -56,10 +56,6 @@
-           '<(libs_loc)/openssl/include',
-         ],
+@@ -58,7 +58,7 @@
        }]],
--    }], [ 'build_linux', {
--      'include_dirs': [
+     }], [ 'build_linux', {
+       'include_dirs': [
 -        '/usr/local/desktop-app/openssl-1.1.1/include',
--      ],
++        '/usr/include/openssl',
+       ],
      }],
    ],
- }
 diff --git a/Telegram/gyp/helpers/modules/qt.gypi b/Telegram/gyp/helpers/modules/qt.gypi
 index e329211..5e67752 100644
 --- a/Telegram/gyp/helpers/modules/qt.gypi