Telethon 1.22 and upstream patches

2 files changed, 18 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b14617183dd..4a2804739ce0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.0
-# Mon Jun 14 18:03:19 UTC 2021
+# Tue Jun 22 17:55:44 UTC 2021
 pkgbase = matrix-appservice-telegram
 	pkgdesc = A Matrix-Telegram hybrid puppeting/relaybot bridge.
 	pkgver = 0.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/tulir/mautrix-telegram
 	install = mautrix-telegram.install
 	arch = any
@@ -12,8 +12,8 @@ pkgbase = matrix-appservice-telegram
 	makedepends = python-pip
 	depends = python
 	depends = python-telethon-session-sqlalchemy<0.3
-	depends = python-telethon>=1.20
-	depends = python-telethon<1.22
+	depends = python-telethon>=1.22
+	depends = python-telethon<1.23
 	depends = python-ruamel-yaml
 	depends = python-commonmark
 	depends = python-alembic
@@ -39,10 +39,16 @@ pkgbase = matrix-appservice-telegram
 	backup = etc/mautrix-telegram/config.yaml
 	backup = etc/mautrix-telegram/registration.yaml
 	source = https://github.com/tulir/mautrix-telegram/archive/v0.10.0.tar.gz
+	source = Ignore_typing_notifications_from_double_puppeted_users.patch::https://github.com/tulir/mautrix-telegram/commit/eca1032d1660099216e71a7e0b24d35bb4833d74.patch
+	source = Update_mautrix-python.patch::https://github.com/tulir/mautrix-telegram/commit/f923552f86af2e6311ce01a27c52fb294ac7d694.patch
+	source = Update_to_Telethon_1.22.patch::https://github.com/tulir/mautrix-telegram/commit/730f6bab6fc0ca4077f3b09d866ad50767df9086.patch
 	source = mautrix-telegram.service
 	source = mautrix-telegram.sysusers
 	source = mautrix-telegram.tmpfiles
 	sha256sums = a9d09d6cd1f13074aa844114db9939dfb75ca1dc898467535d66208c7568209f
+	sha256sums = e9bd820f1a0f56a5684a73bc9f06412daeba3621afc3706efa3f33c486c6efa9
+	sha256sums = 4ab7843f6282381e0360a05d6cb4ea0480cf4db55ae6e10260b62c8bc0c4ba50
+	sha256sums = 769b8dde12d95c1afb1d813307f88b8bc812e32a83daa1bf7171c6f8bf5ee7f5
 	sha256sums = d77c91154204ba5a5297c87c8b8a25209e125024aeee7c49f37416ccb7bd556a
 	sha256sums = e069958db276309d00864ee3dded5700b78806c82663346aa2ef6878e2c0566b
 	sha256sums = edbde9814355756b624fdc58326a5830f82156802166a9f6001b67cf21d5f6f8
diff --git a/PKGBUILD b/PKGBUILD
index 0abe89627bb0..ec70145bc27d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 
 pkgname=matrix-appservice-telegram
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Matrix-Telegram hybrid puppeting/relaybot bridge."
 url="https://github.com/tulir/mautrix-telegram"
-depends=('python' 'python-telethon-session-sqlalchemy<0.3' 'python-telethon>=1.20' 'python-telethon<1.22' 'python-ruamel-yaml' 'python-commonmark' 'python-alembic' 'python-mautrix>=0.9' 'python-mautrix<0.10' 'python-aiohttp' 'python-magic-ahupp')
+depends=('python' 'python-telethon-session-sqlalchemy<0.3' 'python-telethon>=1.22' 'python-telethon<1.23' 'python-ruamel-yaml' 'python-commonmark' 'python-alembic' 'python-mautrix>=0.9' 'python-mautrix<0.10' 'python-aiohttp' 'python-magic-ahupp')
 makedepends=('python' 'python-pip')
 optdepends=('python-cryptg: Uses native code for Telegram crypto stuff instead of pure Python'
             'python-cchardet: For faster encoding detection'
@@ -29,10 +29,16 @@ backup=('etc/mautrix-telegram/alembic.ini'
         'etc/mautrix-telegram/config.yaml'
         'etc/mautrix-telegram/registration.yaml')
 source=("https://github.com/tulir/mautrix-telegram/archive/v${pkgver/_rc/-rc}.tar.gz"
+        'Ignore_typing_notifications_from_double_puppeted_users.patch'::'https://github.com/tulir/mautrix-telegram/commit/eca1032d1660099216e71a7e0b24d35bb4833d74.patch'
+        'Update_mautrix-python.patch'::'https://github.com/tulir/mautrix-telegram/commit/f923552f86af2e6311ce01a27c52fb294ac7d694.patch'
+        'Update_to_Telethon_1.22.patch'::'https://github.com/tulir/mautrix-telegram/commit/730f6bab6fc0ca4077f3b09d866ad50767df9086.patch'
         'mautrix-telegram.service'
         'mautrix-telegram.sysusers'
         'mautrix-telegram.tmpfiles')
 sha256sums=('a9d09d6cd1f13074aa844114db9939dfb75ca1dc898467535d66208c7568209f'
+            'e9bd820f1a0f56a5684a73bc9f06412daeba3621afc3706efa3f33c486c6efa9'
+            '4ab7843f6282381e0360a05d6cb4ea0480cf4db55ae6e10260b62c8bc0c4ba50'
+            '769b8dde12d95c1afb1d813307f88b8bc812e32a83daa1bf7171c6f8bf5ee7f5'
             'd77c91154204ba5a5297c87c8b8a25209e125024aeee7c49f37416ccb7bd556a'
             'e069958db276309d00864ee3dded5700b78806c82663346aa2ef6878e2c0566b'
             'edbde9814355756b624fdc58326a5830f82156802166a9f6001b67cf21d5f6f8')