Update to version 0.11.0

2 files changed, 12 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f90340904f83..497465cfdc2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 6.0.1
-# Sun Nov 28 10:15:24 UTC 2021
+# Wed Dec 29 14:32:50 UTC 2021
 pkgbase = matrix-appservice-telegram
 	pkgdesc = A Matrix-Telegram hybrid puppeting/relaybot bridge.
-	pkgver = 0.10.2
+	pkgver = 0.11.0
 	pkgrel = 1
 	url = https://github.com/mautrix/telegram
 	install = mautrix-telegram.install
@@ -15,9 +15,8 @@ pkgbase = matrix-appservice-telegram
 	depends = python-telethon-tulir-git
 	depends = python-ruamel-yaml
 	depends = python-commonmark
-	depends = python-alembic
-	depends = python-mautrix>=0.12
-	depends = python-mautrix<0.13
+	depends = python-mautrix>=0.14
+	depends = python-mautrix<0.15
 	depends = python-aiohttp
 	depends = python-magic-ahupp
 	optdepends = python-cryptg: Uses native code for Telegram crypto stuff instead of pure Python
@@ -34,26 +33,15 @@ pkgbase = matrix-appservice-telegram
 	optdepends = python-pycryptodome: End-to-bridge encryption support
 	optdepends = lottieconverter-git: convert WebP to GIF or WEBM
 	optdepends = python-prometheus_client: metrics upload
-	backup = etc/mautrix-telegram/alembic.ini
 	backup = etc/mautrix-telegram/config.yaml
 	backup = etc/mautrix-telegram/registration.yaml
-	source = matrix-appservice-telegram-0.10.2.tar.gz::https://github.com/mautrix/telegram/archive/v0.10.2.tar.gz
+	source = matrix-appservice-telegram-0.11.0.tar.gz::https://github.com/mautrix/telegram/archive/v0.11.0.tar.gz
 	source = mautrix-telegram.service
 	source = mautrix-telegram.sysusers
 	source = mautrix-telegram.tmpfiles
-	source = Update_tgs_converter_to_match_updated_lottieconverter.patch::https://github.com/mautrix/telegram/commit/b4d4f841616d138893989ba64bd53b94cd67208f.patch
-	source = Move_filter_matrix_event_logic_to_mautrix-python.patch::https://github.com/mautrix/telegram/commit/25761215c376f5e5720f0c0213709f67b7944eff.patch
-	source = Update_comments_in_example_config.patch::https://github.com/mautrix/telegram/commit/631ed49ec70a4f1eedb13382470c39f7888362a6.patch
-	source = Use_message_send_checkpoints.patch::https://github.com/mautrix/telegram/commit/8276692ebf8e2fd45300fa1b262bfba5e767f304.patch
-	source = Update dependencies.patch::https://github.com/mautrix/telegram/commit/c095498247ccfb1267f90cdd7afb1fd35e3ff465.patch
-	sha256sums = 6c55dd22d71dc8c78a3069acabcd66d8c181c795688f37bfc88fc461e99f5e25
+	sha256sums = ad3e3a83e0eec0acb2a4f7af54fa7ba2ff0b89a9112fd34d7a40e02def43caad
 	sha256sums = d77c91154204ba5a5297c87c8b8a25209e125024aeee7c49f37416ccb7bd556a
 	sha256sums = e069958db276309d00864ee3dded5700b78806c82663346aa2ef6878e2c0566b
 	sha256sums = edbde9814355756b624fdc58326a5830f82156802166a9f6001b67cf21d5f6f8
-	sha256sums = 3067e7f8fdf729c0c13f566dddaf3a33b47638fd87fc7a27173d3c7e330acc91
-	sha256sums = 366a0e85be55623070c0c8d637840f14a65d48929eef07e93e522dc492296e60
-	sha256sums = 0fb812596b118d01c6caa9ffe5e24131b6ad935c537ceb58bf3ab405a0baf95d
-	sha256sums = 51d2332461ff7fee9de759a0a9c9d644cf9d493b9eef28771c38cd893ff86edf
-	sha256sums = bbc91b6ffbf3b41634c44fe8d4f37049f54043822c6361378066367abddb5bf8
 
 pkgname = matrix-appservice-telegram
diff --git a/PKGBUILD b/PKGBUILD
index 9ff19342ce1d..088d03136261 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: BluePeril <blueperil (at) blueperil _dot_ de>
 
 pkgname=matrix-appservice-telegram
-pkgver=0.10.2
+pkgver=0.11.0
 pkgrel=1
 pkgdesc="A Matrix-Telegram hybrid puppeting/relaybot bridge."
 url="https://github.com/mautrix/telegram"
-depends=('python' 'python-telethon-session-sqlalchemy<0.3' 'python-telethon-tulir-git' 'python-ruamel-yaml' 'python-commonmark' 'python-alembic' 'python-mautrix>=0.12' 'python-mautrix<0.13' 'python-aiohttp' 'python-magic-ahupp')
+depends=('python' 'python-telethon-session-sqlalchemy<0.3' 'python-telethon-tulir-git' 'python-ruamel-yaml' 'python-commonmark' 'python-mautrix>=0.14' 'python-mautrix<0.15' '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'
@@ -25,28 +25,16 @@ optdepends=('python-cryptg: Uses native code for Telegram crypto stuff instead o
 install=mautrix-telegram.install
 license=('AGPLv3')
 arch=('any')
-backup=('etc/mautrix-telegram/alembic.ini'
-        'etc/mautrix-telegram/config.yaml'
+backup=('etc/mautrix-telegram/config.yaml'
         'etc/mautrix-telegram/registration.yaml')
 source=("${pkgname}-${pkgver/_rc/-rc}.tar.gz"::"https://github.com/mautrix/telegram/archive/v${pkgver/_rc/-rc}.tar.gz"
         'mautrix-telegram.service'
         'mautrix-telegram.sysusers'
-        'mautrix-telegram.tmpfiles'
-        'Update_tgs_converter_to_match_updated_lottieconverter.patch'::'https://github.com/mautrix/telegram/commit/b4d4f841616d138893989ba64bd53b94cd67208f.patch'
-        'Move_filter_matrix_event_logic_to_mautrix-python.patch'::'https://github.com/mautrix/telegram/commit/25761215c376f5e5720f0c0213709f67b7944eff.patch'
-        'Update_comments_in_example_config.patch'::'https://github.com/mautrix/telegram/commit/631ed49ec70a4f1eedb13382470c39f7888362a6.patch'
-        'Use_message_send_checkpoints.patch'::'https://github.com/mautrix/telegram/commit/8276692ebf8e2fd45300fa1b262bfba5e767f304.patch'
-        'Update dependencies.patch'::'https://github.com/mautrix/telegram/commit/c095498247ccfb1267f90cdd7afb1fd35e3ff465.patch'
-        )
-sha256sums=('6c55dd22d71dc8c78a3069acabcd66d8c181c795688f37bfc88fc461e99f5e25'
+        'mautrix-telegram.tmpfiles')
+sha256sums=('ad3e3a83e0eec0acb2a4f7af54fa7ba2ff0b89a9112fd34d7a40e02def43caad'
             'd77c91154204ba5a5297c87c8b8a25209e125024aeee7c49f37416ccb7bd556a'
             'e069958db276309d00864ee3dded5700b78806c82663346aa2ef6878e2c0566b'
-            'edbde9814355756b624fdc58326a5830f82156802166a9f6001b67cf21d5f6f8'
-            '3067e7f8fdf729c0c13f566dddaf3a33b47638fd87fc7a27173d3c7e330acc91'
-            '366a0e85be55623070c0c8d637840f14a65d48929eef07e93e522dc492296e60'
-            '0fb812596b118d01c6caa9ffe5e24131b6ad935c537ceb58bf3ab405a0baf95d'
-            '51d2332461ff7fee9de759a0a9c9d644cf9d493b9eef28771c38cd893ff86edf'
-            'bbc91b6ffbf3b41634c44fe8d4f37049f54043822c6361378066367abddb5bf8')
+            'edbde9814355756b624fdc58326a5830f82156802166a9f6001b67cf21d5f6f8')
 
 prepare() {
     cd $srcdir/telegram-${pkgver/_rc/-rc}
@@ -76,8 +64,4 @@ package() {
 
     # cleanup
     rm -rf ${pkgdir}/usr/lib/python*/site-packages/tests
-
-    # Fix alembic position
-    mv ${pkgdir}/usr/{alembic,alembic.ini} "${pkgdir}/usr/share/mautrix-telegram/"
-    sed -i -e "s|script_location = alembic|script_location = /usr/share/mautrix-telegram/alembic/|" "${pkgdir}/usr/share/mautrix-telegram/alembic.ini"
 }