Merge branch 'master' of https://gitlab.com/b0/matrique

.gitlab-ci.yml

@@ -2,19 +2,6 @@ stages:
   - build
   - deploy
 
-build-native:
-  image: registry.gitlab.com/b0/matrique/qt
-  stage: build
-  before_script:
-    - git submodule update --init --recursive
-  script:
-    - mkdir -p build && cd build
-    - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler
-    - make -j4
-  artifacts:
-    paths:
-    - build/matrique
-
 build-flatpak:
   image: registry.gitlab.com/b0/matrique/flatpak
   stage: build

README.md

@@ -1,9 +1,10 @@
 # Matrique
 
 [![pipeline status](https://gitlab.com/b0/matrique/badges/master/pipeline.svg)](https://gitlab.com/b0/matrique/commits/master)
-[![flatpak status](https://gitlab.com/b0/matrique-repo/badges/master/pipeline.svg)](https://gitlab.com/b0/matrique-repo/commits/master)
 [![coverage report](https://gitlab.com/b0/matrique/badges/master/coverage.svg)](https://gitlab.com/b0/matrique/commits/master)
 
+<a href='https://flathub.org/apps/details/org.eu.encom.matrique'><img width='240' alt='Get it on Flathub' src='https://flathub.org/assets/badges/flathub-badge-i-en.png'/></a>
+
 > "Nobody can be told what the matrix is, you have to see it for yourself. "
 
 Matrique is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging.
@@ -12,30 +13,21 @@ Matrique is a glossy cross-platform client for Matrix, the decentralized communi
 
 You can reach the maintainer at #matrique:matrix.org, if you are already on Matrix.
 
-Also, you can file an issue at this project if anything happens to go wrong.
+Also, you can file an issue at this project if anything goes wrong.
 
-## Install
+## Download
 
-You can fetch the nightly release of Matrique via Flatpak.
+You can fetch the release of Matrique on Flathub. The link is at the beginning of this README.
+
+Alternatively, you can download the Flatpak nightly build bundle from here: ![Download Bundle](https://gitlab.com/b0/matrique/-/jobs/artifacts/dev/raw/flatpak/matrique.flatpak?job=build-flatpak)
+
+Open the bundle using your preferred software center.
 
 ### Requirements
 
 An operating system with Flatpak installed.
 Fedora 28 is known to work, other GNU/Linux distributions should work as well if they have Flatpak installed.
 
-### Add Repository and Install
-
-Flatpak Repo: ![Repo URL](https://b0.gitlab.io/matrique-repo/matrique.flatpakrepo)
-
-Click on the address above to install the nightly repository of Matrique.
-
-*Prefer commands?*
-
-```bash
-flatpak remote-add matrique https://b0.gitlab.io/matrique-repo/matrique.flatpakrepo
-flatpak install matrique org.eu.encom.matrique
-```
-
 *P.S. In case if you haven't figured it out, the instruction above only works on Master OS. 
 No precompiled binary for MacOS and Microsoft Windows yet.*
 
@@ -53,19 +45,34 @@ flatpak run org.eu.encom.matrique
 
 You can compile Matrique from source if you want to.
 
+The requirements are Qt, QMake, Qt Quick, Qt Quick Controls 2, Qt Multimedia, and several others.
+
 * Fetch the code.
 
-```
+```bash
 git clone --recursive https://gitlab.com/b0/matrique
 ```
 
 * Open in Qt Creator using the default config.
 * Run.
 
+*Still prefer commands?*
+
+```bash
+mkdir build && cd build
+qmake ..
+make
+sudo make install
+```
+
 ## Acknowledgement
 
 This program uses libqmatrixclient library and C++ models from Quaternion. 
 
+![Quaternion](https://github.com/QMatrixClient/Quaternion)
+
+![libqmatrixclient](https://github.com/QMatrixClient/libqmatrixclient)
+
 ## License
 
 ![GPLv3](https://www.gnu.org/graphics/gplv3-127x51.png)

flatpak/org.eu.encom.matrique.yaml

@@ -1,18 +1,17 @@
 id: org.eu.encom.matrique
 runtime: org.kde.Platform
-runtime-version: '5.11'
+runtime-version: 5.11
 sdk: org.kde.Sdk
 command: matrique
 finish-args:
-- "--share=ipc"
+- --share=ipc
-- "--share=network"
+- --share=network
-- "--socket=x11"
+- --socket=x11
-- "--socket=wayland"
+- --socket=wayland
-- "--device=dri"
+- --device=dri
-- "--filesystem=home"
+- --filesystem=home
-- "--filesystem=/tmp"
+- --talk-name=org.freedesktop.Notifications
-- "--talk-name=org.freedesktop.Notifications"
+- --talk-name=org.kde.StatusNotifierWatcher
-- "--talk-name=org.kde.StatusNotifierWatcher"
 modules:
 - name: matrique
   buildsystem: qmake