aboutsummaryrefslogtreecommitdiffstats
path: root/community/mirage
diff options
context:
space:
mode:
Diffstat (limited to 'community/mirage')
-rw-r--r--community/mirage/0001-Update-mypy-dev-requirement-to-0.812.patch50
-rw-r--r--community/mirage/APKBUILD44
2 files changed, 70 insertions, 24 deletions
diff --git a/community/mirage/0001-Update-mypy-dev-requirement-to-0.812.patch b/community/mirage/0001-Update-mypy-dev-requirement-to-0.812.patch
new file mode 100644
index 0000000000..b3a2d6177a
--- /dev/null
+++ b/community/mirage/0001-Update-mypy-dev-requirement-to-0.812.patch
@@ -0,0 +1,50 @@
+From 27fef14710a70b59f9e8c395d56f3bd5a3e0db55 Mon Sep 17 00:00:00 2001
+From: miruka <miruka@disroot.org>
+Date: Fri, 12 Mar 2021 17:24:37 -0400
+Subject: [PATCH] Update mypy dev requirement to 0.812+
+
+Noticable improvement: no longer throws errors when using
+aiofiles 0.6+ functions.
+---
+ requirements-dev.txt | 2 +-
+ src/backend/utils.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/requirements-dev.txt b/requirements-dev.txt
+index da75be37..d7560afd 100644
+--- a/requirements-dev.txt
++++ b/requirements-dev.txt
+@@ -2,7 +2,7 @@ remote_pdb >= 2.0.0, < 3
+ pdbpp >= 0.10.2, < 0.11
+ devtools >= 0.4.0, < 0.5
+
+-mypy >= 0.790, < 0.800
++mypy >= 0.812, < 0.900
+ flake8 >= 3.8.4, < 4
+ flake8-isort >= 4.0.0, < 5
+ flake8-bugbear >= 20.1.4, < 21
+diff --git a/src/backend/utils.py b/src/backend/utils.py
+index 3586bd38..3cb6078e 100644
+--- a/src/backend/utils.py
++++ b/src/backend/utils.py
+@@ -166,7 +166,7 @@ async def guess_mime(file: File) -> str:
+ if isinstance(file, io.IOBase):
+ file.seek(0, 0)
+ elif isinstance(file, AsyncBufferedIOBase):
+- await file.seek(0, 0) # type: ignore
++ await file.seek(0, 0)
+
+ try:
+ first_chunk: bytes
+@@ -186,7 +186,7 @@ async def guess_mime(file: File) -> str:
+ if isinstance(file, io.IOBase):
+ file.seek(0, 0)
+ elif isinstance(file, AsyncBufferedIOBase):
+- await file.seek(0, 0) # type: ignore
++ await file.seek(0, 0)
+
+
+ def plain2html(text: str) -> str:
+--
+2.31.1
+
diff --git a/community/mirage/APKBUILD b/community/mirage/APKBUILD
index adb2a6dc35..f848d545db 100644
--- a/community/mirage/APKBUILD
+++ b/community/mirage/APKBUILD
@@ -1,23 +1,34 @@
-# Contributor: Newbyte <newbie13xd@gmail.com>
-# Maintainer: Newbyte <newbie13xd@gmail.com>
+# Contributor: Newbyte <newbyte@disroot.org>
+# Maintainer: Newbyte <newbyte@disroot.org>
pkgname=mirage
-pkgver=0.6.4
-pkgrel=0
+pkgver=0.7.1
+pkgrel=1
pkgdesc="Qt/QML Matrix client"
url="https://github.com/mirukana/mirage"
-arch="all !armhf !mips64" # armhf: blocked by py3-pyotherside, qt5-qtquickcontrols2
+# armhf: blocked by py3-pyotherside, qt5-qtquickcontrols2
+# mips64: ???
+# s390x: blocked by py3-watchgod
+arch="all !armhf !mips64 !s390x"
license="LGPL-3.0-or-later"
+options="!check" # requires types-aiohttp
depends="
py3-aiofiles
+ py3-appdirs
py3-blist
py3-cairosvg
py3-filetype
+ py3-hsluv
py3-html-sanitizer
py3-matrix-nio
py3-mistune
py3-pillow
+ py3-plyer
py3-pymediainfo
py3-pyotherside
+ py3-redbaron
+ py3-simpleaudio
+ py3-sortedcontainers
+ py3-watchgod
"
makedepends="
libjpeg-turbo-dev
@@ -27,7 +38,6 @@ makedepends="
libxscrnsaver-dev
olm-dev
openjpeg-dev
- py3-pyotherside
py3-setuptools
python3-dev
qtchooser
@@ -38,31 +48,20 @@ makedepends="
tiff-dev
zlib-dev
"
-_commit_gel=0e796aacc16388a164bab0bb0ce9dabc885ed7fa
_commit_hsluv_c=9e9be32d6010cad484a7b12b1a3d19c6cf4c1353
-_commit_radial_bar=ec3af1a087a0c4c0c31709ed94b7e939d3e51400
-_commit_sort_filter_proxy_model=36befddf5d57faad990e72c88c5844794f274145
-_commit_qsyncable=f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711
source="
mirage-v$pkgver.tar.gz::https://github.com/mirukana/mirage/archive/v$pkgver.tar.gz
- gel.tar.gz::https://github.com/Cutehacks/gel/archive/$_commit_gel.tar.gz
hsluv-c.tar.gz::https://github.com/hsluv/hsluv-c/archive/$_commit_hsluv_c.tar.gz
- radial-bar.tar.gz::https://github.com/mirukana/RadialBarDemo/archive/$_commit_radial_bar.tar.gz
- sort-filter-proxy-model.tar.gz::https://github.com/oKcerG/SortFilterProxyModel/archive/$_commit_sort_filter_proxy_model.tar.gz
- qsyncable.tar.gz::https://github.com/benlau/qsyncable/archive/$_commit_qsyncable.tar.gz
+ 0001-Update-mypy-dev-requirement-to-0.812.patch
"
prepare() {
default_prepare
- mv "$srcdir/gel-$_commit_gel/"* "$builddir/submodules/gel"
mv "$srcdir/hsluv-c-$_commit_hsluv_c/"* "$builddir/submodules/hsluv-c"
- mv "$srcdir/RadialBarDemo-$_commit_radial_bar/"* "$builddir/submodules/RadialBarDemo"
- mv "$srcdir/SortFilterProxyModel-$_commit_sort_filter_proxy_model/"* "$builddir/submodules/SortFilterProxyModel"
- mv "$srcdir/qsyncable-$_commit_qsyncable/"* "$builddir/submodules/qsyncable"
}
build() {
- qmake PREFIX=/usr mirage.pro
+ qmake CONFIG+=qtquickcompiler PREFIX=/usr mirage.pro
make
}
@@ -70,9 +69,6 @@ package() {
make INSTALL_ROOT=$pkgdir install
}
-sha512sums="1780e5e9da7a31b2310d3e07d6b52a7be8cfe97262fef34ef470fd3d92621e554596858168d1d555d7dcf6f506853e0260b744a7725e70c9a34cf399be2394e0 mirage-v0.6.4.tar.gz
-540549882494007219d7e5be6d4502869bf02db16046547a623a20c17be729645ccd7611fa8ecd16e8f2fe545569be29240dabbefc8cb8f9c2b333355caab480 gel.tar.gz
+sha512sums="af4e6adb33e4fad200947d91592b76115be426c8d5a780bed0cffbbea72189bd513815c2c2aa74ae6e06c6b35e17a2fc47b4350cc57fe27c35f972753b5bb772 mirage-v0.7.1.tar.gz
ecd8c9afa9e22c6a0093435ce89b5d5b1882207359d02a65f6e62952fa4b57fc5b3e1aaa07527553a7e86c350173409b21d41b3da5235a7fb5f96b61944be839 hsluv-c.tar.gz
-d4f2fcc91e3542299ffde8c6981131d3dd8c168954c6b43929b675f153c3424a29ef2a2e5f1445b8500aca97f3674eed40f7cabf242fd210ea67f5028567552d radial-bar.tar.gz
-bfb7af36abd5ded014549042e760c1ec6779f46dd6c30e672ada21decc7a1b1a631ada1cc2c57d62d0daca4cccff9640077345b3661ef73021d5e2ee8058ae9b sort-filter-proxy-model.tar.gz
-b7187b3a87b21b6ff3dde00aee55c5cc1721ee8d228eab91cc78a7b5de68457999015ef601542a69c9bed424ffcd375e7314bd451d6d7eaee5a827962c83a3a7 qsyncable.tar.gz"
+3d3f22afe3a3a4510dd7f924795c37552ecc8b1e36fb25b1c289a0164d0ca3dcf243a0d479b3583826f75ae1974d84e0a02d02b4170712c7ba1db269a200e26b 0001-Update-mypy-dev-requirement-to-0.812.patch"