Remove unnecessary files

8 files changed, 11 insertions, 197 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7013c9ff2d5f..c226b4cf5c3c 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 = 6
+	pkgrel = 7
 	url = https://github.com/kotatogram/kotatogram-desktop
 	arch = x86_64
 	license = GPL3
@@ -39,14 +39,9 @@ pkgbase = kotatogram-desktop
 	source = lib_tl::git+https://github.com/desktop-app/lib_tl
 	source = lib_ui::git+https://github.com/kotatogram/lib_ui.git
 	source = CMakeLists.inj
-	source = libtgvoip.patch
 	source = no-gtk2.patch
-	source = Revert-Change-some-private-header-includes.patch
-	source = Revert-Disable-DemiBold-fallback-for-Semibold.patch
 	source = tdesktop.patch
-	source = tdesktop_lottie_animation_qtdebug.patch
 	source = tg.protocol
-	source = Use-system-wide-font.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -66,14 +61,9 @@ pkgbase = kotatogram-desktop
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 98236f7f161c8bad1152a77505f9c3eebae06ffc0420ed476e101359a92d01438dd6ce6062e0b110b76f2d6d09f59accf4b1969699b8af5a3650ecb0c31929c5
-	sha512sums = ffe4a324519da82b2a7f7da25fce7b11b70dc922ff75c07bf2154ecf976ad936c70a0a65db5a68cf45a377f4a31f2f1731033fdbf5755cdfe8c9687af6b2275e
 	sha512sums = 117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867
-	sha512sums = 087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0
-	sha512sums = d5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9
 	sha512sums = f667b00f4c2e02799d3a130f1370bbe13866294329164c9fee901fa54655e4ebfaaae4e0f15327b660b10248c6a087dd2fa53d9f72714ba099ea2cbf4d07ca32
-	sha512sums = be4bac59d0002006bc00ada0f2edff1e5432eb0e34d19ac0bf64983016ee9194386ce35e63aaeb854862696c03e947d6f79d5e1c355e888f2f7f1bab7045e1af
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
-	sha512sums = 2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c
 
 pkgname = kotatogram-desktop
 
diff --git a/.gitignore b/.gitignore
index 2bdb6e8c79f2..96a5330066eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,12 @@ rlottie/
 src/
 variant/
 xxHash/
+codegen/
+lib_base/
+lib_crl/
+lib_lottie/
+lib_rlottie/
+lib_rpl/
+lib_spellcheck/
+lib_tl/
+lib_ui/
diff --git a/PKGBUILD b/PKGBUILD
index 30e48b0fba38..98fe0c714a35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=kotatogram-desktop
 pkgver=1.1.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Experimental Telegram Desktop fork with option to select custom fonts."
 arch=(x86_64)
 url="https://github.com/kotatogram/kotatogram-desktop"
@@ -52,14 +52,9 @@ source=(
         "lib_ui::git+https://github.com/kotatogram/lib_ui.git"
 
         "CMakeLists.inj"
-        "libtgvoip.patch"
         "no-gtk2.patch"
-        "Revert-Change-some-private-header-includes.patch"
-        "Revert-Disable-DemiBold-fallback-for-Semibold.patch"
         "tdesktop.patch"
-        "tdesktop_lottie_animation_qtdebug.patch"
         "tg.protocol"
-        "Use-system-wide-font.patch"
        )
 sha512sums=(
         'SKIP'
@@ -81,14 +76,9 @@ sha512sums=(
         'SKIP'
         'SKIP'
         '98236f7f161c8bad1152a77505f9c3eebae06ffc0420ed476e101359a92d01438dd6ce6062e0b110b76f2d6d09f59accf4b1969699b8af5a3650ecb0c31929c5'  # CMakeLists.inj
-        'ffe4a324519da82b2a7f7da25fce7b11b70dc922ff75c07bf2154ecf976ad936c70a0a65db5a68cf45a377f4a31f2f1731033fdbf5755cdfe8c9687af6b2275e'  # libtgvoip.patch
         '117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867'  # no-gtk2.patch
-        '087dd821690dfedf1c275f264a0223b123e31ab9ee95050023930470bc9c866958cae00e2fd9132e6f7efbc4f1dfc3fdc20f8fba1fc9472d92bd702eaa60adb0'  # Revert-Change-some-private-header-includes.patch
-        'd5cd7ecb5583258462c21a9ae3d4e8ae8c709d47d7ce2c45f8ae23100d24993398b8372021957b9a4607b3988f366e1c0cf64d724d901cb70212665c481217e9'  # Revert-Disable-DemiBold-fallback-for-Semibold.patch
         'f667b00f4c2e02799d3a130f1370bbe13866294329164c9fee901fa54655e4ebfaaae4e0f15327b660b10248c6a087dd2fa53d9f72714ba099ea2cbf4d07ca32'  # tdesktop.patch
-        'be4bac59d0002006bc00ada0f2edff1e5432eb0e34d19ac0bf64983016ee9194386ce35e63aaeb854862696c03e947d6f79d5e1c355e888f2f7f1bab7045e1af'  # tdesktop_lottie_animation_qtdebug.patch
         'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'  # tg.protocol
-        '2c1bb75449b4634befa3edaac5d20e4b29ede21119549d9a3895dda9d4723f618dd950ee32133e04186fa65d07f80081ba3e3d5585209ba9112aa754d06fbb5c'  # Use-system-wide-font.patch
         )
         
 
@@ -119,22 +109,8 @@ prepare() {
 
         git submodule update
 
-        # dos2unix "$srcdir/kdesktop/.appveyor/install.bat"
-
         patch -Np1 -i "$srcdir/no-gtk2.patch"
-        # patch -Np1 -i "$srcdir/Revert-Change-some-private-header-includes.patch"
-        # patch -Np1 -i "$srcdir/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
-        # patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
-        # patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
         patch -Np1 -i "$srcdir/tdesktop.patch"
-
-        # 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"
 }
 
 build() {
diff --git a/Revert-Change-some-private-header-includes.patch b/Revert-Change-some-private-header-includes.patch
deleted file mode 100644
index 85611998311e..000000000000
--- a/Revert-Change-some-private-header-includes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 46a55ed8f7ef4ee99ebccf1bdded3d5ccaef33af Mon Sep 17 00:00:00 2001
-From: Jiachen YANG <farseerfc@gmail.com>
-Date: Fri, 4 Oct 2019 17:00:48 +0900
-Subject: [PATCH 5/6] Revert "Change some private header includes."
-
-This reverts commit b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.
----
- Telegram/SourceFiles/ui/text/text.cpp       | 1 -
- Telegram/SourceFiles/ui/text/text.h         | 2 +-
- Telegram/SourceFiles/ui/text/text_block.cpp | 2 --
- Telegram/SourceFiles/ui/text/text_block.h   | 1 +
- 4 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
-index eaeb52b35..2c55f1123 100644
---- a/Telegram/SourceFiles/ui/text/text.cpp
-+++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- #include "ui/ui_integration.h"
- #include "platform/platform_info.h"
- 
--#include <private/qfontengine_p.h>
- #include <private/qharfbuzz_p.h>
- 
- namespace Ui {
-diff --git a/Telegram/SourceFiles/ui/text/text.h b/Telegram/SourceFiles/ui/text/text.h
-index 5d7c2cd07..3a2de5d3e 100644
---- a/Telegram/SourceFiles/ui/text/text.h
-+++ b/Telegram/SourceFiles/ui/text/text.h
-@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- #include "ui/click_handler.h"
- #include "base/flags.h"
- 
--#include <private/qfixed_p.h>
-+#include <private/qfontengine_p.h>
- 
- static const QChar TextCommand(0x0010);
- enum TextCommands {
-diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
-index 8e6914197..d83073085 100644
---- a/Telegram/SourceFiles/ui/text/text_block.cpp
-+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
-@@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- 
- #include "styles/style_basic.h"
- 
--#include <private/qfontengine_p.h>
--
- // COPIED FROM qtextlayout.cpp AND MODIFIED
- namespace Ui {
- namespace Text {
-diff --git a/Telegram/SourceFiles/ui/text/text_block.h b/Telegram/SourceFiles/ui/text/text_block.h
-index 6fcf1cd51..27d724ee8 100644
---- a/Telegram/SourceFiles/ui/text/text_block.h
-+++ b/Telegram/SourceFiles/ui/text/text_block.h
-@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- #include "ui/emoji_config.h"
- 
- #include <private/qfixed_p.h>
-+#include <private/qfontengine_p.h>
- 
- namespace Ui {
- namespace Text {
--- 
-2.23.0
-
diff --git a/Revert-Disable-DemiBold-fallback-for-Semibold.patch b/Revert-Disable-DemiBold-fallback-for-Semibold.patch
deleted file mode 100644
index c94043709e00..000000000000
--- a/Revert-Disable-DemiBold-fallback-for-Semibold.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001
-From: Jiachen YANG <farseerfc@gmail.com>
-Date: Fri, 4 Oct 2019 16:59:26 +0900
-Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold."
-
-This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf.
----
- Telegram/SourceFiles/ui/style/style_core_font.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
-index 653dbfff0..22ccfea7e 100644
---- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
-+++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
-@@ -161,9 +161,9 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
- 
- 	f.setPixelSize(size);
- 	if (_flags & FontBold) {
--		f.setBold(true);
--	//} else if (fontFamilies[family] == "Open Sans Semibold") {
--	//	f.setWeight(QFont::DemiBold);
-+		f.setBold(_flags & FontBold);
-+	} else if (fontFamilies[family] == "Open Sans Semibold") {
-+		f.setWeight(QFont::DemiBold);
- 	}
- 	f.setItalic(_flags & FontItalic);
- 	f.setUnderline(_flags & FontUnderline);
--- 
-2.23.0
-
diff --git a/Use-system-wide-font.patch b/Use-system-wide-font.patch
deleted file mode 100644
index e08edb5a0569..000000000000
--- a/Use-system-wide-font.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Telegram/Resources/qrc/fonts.qrc b/Telegram/Resources/qrc/fonts.qrc
-index 233b8d572..122d89140 100644
---- a/Telegram/Resources/qrc/fonts.qrc
-+++ b/Telegram/Resources/qrc/fonts.qrc
-@@ -1,7 +1,4 @@
- <RCC>
-   <qresource prefix="/gui">
--    <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
--    <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
--    <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file>
-   </qresource>
- </RCC>
-diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
-index 22ccfea7e..36f271f93 100644
---- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
-+++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
-@@ -84,9 +84,9 @@ void StartFonts() {
- 	}
- 	Started = true;
- 
--	auto regular = LoadCustomFont(":/gui/fonts/OpenSans-Regular.ttf", "Open Sans");
--	auto bold = LoadCustomFont(":/gui/fonts/OpenSans-Bold.ttf", "Open Sans", style::internal::FontBold);
--	auto semibold = LoadCustomFont(":/gui/fonts/OpenSans-Semibold.ttf", "Open Sans Semibold");
-+        auto regular = ValidateFont("Open Sans");
-+        auto bold = ValidateFont("Open Sans", style::internal::FontBold);
-+        auto semibold = ValidateFont("Open Sans Semibold");
- 
- #ifdef Q_OS_WIN
- 	// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
--- 
-2.23.0
-
diff --git a/libtgvoip.patch b/libtgvoip.patch
deleted file mode 100644
index a8936d74a54e..000000000000
--- a/libtgvoip.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/libtgvoip.gyp b/libtgvoip.gyp
-index 52fbea1..9a4dfb7 100644
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -13,11 +13,12 @@
-         'variables': {
-           'tgvoip_src_loc': '.',
-           'special_build_target%': '',
--          'linux_path_opus_include%': '<(DEPTH)/../../../Libraries/opus/include',
-+          'linux_path_opus_include%': '/usr/include/opus',
-         },
-         'include_dirs': [
-           '<(tgvoip_src_loc)/webrtc_dsp',
-           '<(linux_path_opus_include)',
-+          '/usr/include/openssl'
-         ],
-         'direct_dependent_settings': {
-           'include_dirs': [
diff --git a/tdesktop_lottie_animation_qtdebug.patch b/tdesktop_lottie_animation_qtdebug.patch
deleted file mode 100644
index 16a0c989418f..000000000000
--- a/tdesktop_lottie_animation_qtdebug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Telegram/lib_lottie/lottie/lottie_animation.cpp b/Telegram/lib_lottie/lottie/lottie_animation.cpp
-index f681c9220..8f80640e1 100644
---- a/Telegram/lib_lottie/lottie/lottie_animation.cpp
-+++ b/Telegram/lib_lottie/lottie/lottie_animation.cpp
-@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- #include "logs.h"
- 
- #include <QFile>
-+#include <QtDebug>
- #include <rlottie.h>
- #include <crl/crl_async.h>
- #include <crl/crl_on_main.h>
--- 
-2.23.0
-