update

3 files changed, 91 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1280fbb68b1f..d4379bd1942e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,50 +1,32 @@
 pkgbase = matrix-mirage-git
 	pkgdesc = A fancy, customizable, keyboard-operable Matrix chat client for encrypted and decentralized communication.
-	pkgver = r2637.9a4ababd
-	pkgrel = 2
+	pkgver = 0.7.2.r0.g9a4ababd
+	pkgrel = 1
 	url = https://github.com/mirukana/mirage
-	arch = any
+	arch = x86_64
 	license = LGPL3
 	makedepends = cmake
 	makedepends = git
+	depends = hicolor-icon-theme
+	depends = libxss
 	depends = qt5-base
 	depends = qt5-declarative
 	depends = qt5-quickcontrols2
-	depends = qt5-svg
-	depends = qt5-graphicaleffects
-	depends = qt5-imageformats
-	depends = python
-	depends = python-pyotherside
-	depends = libolm
-	depends = libjpeg-turbo
-	depends = zlib
-	depends = libtiff
-	depends = libwebp
-	depends = openjpeg2
-	depends = libmediainfo
-	depends = python-pillow
-	depends = python-pymediainfo
-	depends = python-cairosvg
-	depends = python-aiofiles
-	depends = python-appdirs
-	depends = python-filetype
-	depends = python-html-sanitizer
-	depends = python-lxml
-	depends = python-mistune1
-	depends = python-blist
-	depends = python-matrix-nio>=0.17.0
-	depends = libxss
-	depends = python-plyer
-	depends = python-sortedcontainers
-	depends = python-watchgod
-	depends = python-redbaron
-	depends = python-dbus
-	depends = python-hsluv
-	depends = python-pycryptodome
-	depends = python-simpleaudio
+	provides = mirage-matrix
+	provides = matrix-mirage
 	conflicts = mirage-matrix
 	conflicts = matrix-mirage
-	source = git://github.com/mirukana/mirage.git#branch=dev
+	source = matrix-mirage::git+https://github.com/mirukana/mirage
+	source = RadialBarDemo::git+https://github.com/mirukana/RadialBarDemo
+	source = SortFilterProxyModel::git+https://github.com/oKcerG/SortFilterProxyModel
+	source = gel::git+https://github.com/Cutehacks/gel
+	source = hsluv-c::git+https://github.com/hsluv/hsluv-c
+	source = qsyncable::git+https://github.com/benlau/qsyncable
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = matrix-mirage-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index e4bc9f3ba3d2..552d6d766f4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,81 @@
-# Maintainer: Midov <midov@midov.pl>
+# Maintainer:
+# Contributor: Midov <midov@midov.pl>
 
-pkgname=matrix-mirage-git
-_name=mirage
-pkgver=r2637.9a4ababd
-pkgrel=2
+_pkgname="matrix-mirage"
+pkgname="$_pkgname-git"
+pkgver=0.7.2.r0.g9a4ababd
+pkgrel=1
 pkgdesc='A fancy, customizable, keyboard-operable Matrix chat client for encrypted and decentralized communication.'
-arch=('any')
+arch=('x86_64')
 url='https://github.com/mirukana/mirage'
 license=('LGPL3')
-depends=('qt5-base' 'qt5-declarative' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-graphicaleffects' 'qt5-imageformats' 'python' 'python-pyotherside' 'libolm' 'libjpeg-turbo' 'zlib' 'libtiff' 'libwebp' 'openjpeg2' 'libmediainfo' 'python-pillow' 'python-pymediainfo' 'python-cairosvg' 'python-aiofiles' 'python-appdirs' 'python-filetype' 'python-html-sanitizer' 'python-lxml' 'python-mistune1' 'python-blist' 'python-matrix-nio>=0.17.0' 'libxss' 'python-plyer' 'python-sortedcontainers' 'python-watchgod' 'python-redbaron' 'python-dbus' 'python-hsluv' 'python-pycryptodome' 'python-simpleaudio')
-makedepends=('cmake' 'git')
-conflicts=('mirage-matrix' 'matrix-mirage')
-source=("git://github.com/mirukana/${_name}.git#branch=dev")
-sha256sums=('SKIP')
 
-prepare() {
-        cd ${srcdir}/"${_name}"
-	git submodule update --init --recursive
-}
+depends=(
+  'hicolor-icon-theme'
+  'libxss'
+  'qt5-base'
+  'qt5-declarative'
+  'qt5-quickcontrols2'
+)
+makedepends=(
+  'cmake'
+  'git'
+)
+
+provides=(
+  'mirage-matrix'
+  'matrix-mirage'
+)
+conflicts=(${provides[@]})
+
+source=(
+  "$_pkgname"::"git+$url"
+
+  'RadialBarDemo'::'git+https://github.com/mirukana/RadialBarDemo'
+  'SortFilterProxyModel'::'git+https://github.com/oKcerG/SortFilterProxyModel'
+  'gel'::'git+https://github.com/Cutehacks/gel'
+  'hsluv-c'::'git+https://github.com/hsluv/hsluv-c'
+  'qsyncable'::'git+https://github.com/benlau/qsyncable'
+)
+sha256sums=(
+  'SKIP'
+
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+)
+
 pkgver() {
-        cd ${srcdir}/"${_name}"
-	printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git describe --always)"
+  cd "$srcdir/$_pkgname"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
+
+prepare() {
+  cd "$srcdir/$_pkgname"
+  _submodules=(
+    'submodules/RadialBarDemo'
+    'submodules/SortFilterProxyModel'
+    'submodules/gel'
+    'submodules/hsluv-c'
+    'submodules/qsyncable'
+  )
+  for submodule in ${_submodules[@]} ; do
+    mkdir -p "$submodule"
+    git submodule init ${submodule}
+    git submodule set-url ${submodule} "${srcdir}/${submodule##*/}"
+    git -c protocol.file.allow=always submodule update ${submodule}
+  done
+}
+
 build() {
-        cd ${srcdir}/"${_name}"
-	qmake PREFIX=/usr mirage.pro
-	make
+  cd "$srcdir/$_pkgname"
+  qmake PREFIX=/usr mirage.pro
+  make
 }
 
 package() {
-        cd ${srcdir}/"${_name}"
-	make INSTALL_ROOT="${pkgdir}" install 
+  cd "$srcdir/$_pkgname"
+  make INSTALL_ROOT="$pkgdir" install 
 }