From d721ab649273c0c43c1753fdbf1e1aeee94e915a Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 18 Aug 2018 08:18:55 +0000 Subject: [PATCH 1/4] Use multiple versions of Qt docker. --- .gitlab-ci.yml | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35fdfaa..6325774 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,15 +2,54 @@ stages: - build - deploy -build-native: - image: registry.gitlab.com/b0/matrique/qt +build-qt-5.7: + image: rabits/qt:5.7-desktop 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 + - make + artifacts: + paths: + - build/matrique + +build-qt-5.9: + image: rabits/qt:5.9-desktop + stage: build + before_script: + - git submodule update --init --recursive + script: + - mkdir -p build && cd build + - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler + - make + artifacts: + paths: + - build/matrique + +build-qt-5.10: + image: rabits/qt:5.10-desktop + stage: build + before_script: + - git submodule update --init --recursive + script: + - mkdir -p build && cd build + - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler + - make + artifacts: + paths: + - build/matrique + +build-qt-5.11: + image: rabits/qt:5.11-desktop + stage: build + before_script: + - git submodule update --init --recursive + script: + - mkdir -p build && cd build + - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler + - make artifacts: paths: - build/matrique From 205bb264260ffe4d06550ed7fcb72a7b141fcc06 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 18 Aug 2018 08:20:07 +0000 Subject: [PATCH 2/4] Remove unused quote and /tmp. --- flatpak/org.eu.encom.matrique.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/flatpak/org.eu.encom.matrique.yaml b/flatpak/org.eu.encom.matrique.yaml index 84457c2..7ef083f 100644 --- a/flatpak/org.eu.encom.matrique.yaml +++ b/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=network" -- "--socket=x11" -- "--socket=wayland" -- "--device=dri" -- "--filesystem=home" -- "--filesystem=/tmp" -- "--talk-name=org.freedesktop.Notifications" -- "--talk-name=org.kde.StatusNotifierWatcher" +- --share=ipc +- --share=network +- --socket=x11 +- --socket=wayland +- --device=dri +- --filesystem=home +- --talk-name=org.freedesktop.Notifications +- --talk-name=org.kde.StatusNotifierWatcher modules: - name: matrique buildsystem: qmake From 590dcc1e5ef09f20de7773506539929eff07426b Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 18 Aug 2018 08:28:37 +0000 Subject: [PATCH 3/4] Remove native build as they do not have pulseaudio. --- .gitlab-ci.yml | 52 -------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6325774..47871b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,58 +1,6 @@ stages: - build - deploy - -build-qt-5.7: - image: rabits/qt:5.7-desktop - stage: build - before_script: - - git submodule update --init --recursive - script: - - mkdir -p build && cd build - - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler - - make - artifacts: - paths: - - build/matrique - -build-qt-5.9: - image: rabits/qt:5.9-desktop - stage: build - before_script: - - git submodule update --init --recursive - script: - - mkdir -p build && cd build - - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler - - make - artifacts: - paths: - - build/matrique - -build-qt-5.10: - image: rabits/qt:5.10-desktop - stage: build - before_script: - - git submodule update --init --recursive - script: - - mkdir -p build && cd build - - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler - - make - artifacts: - paths: - - build/matrique - -build-qt-5.11: - image: rabits/qt:5.11-desktop - stage: build - before_script: - - git submodule update --init --recursive - script: - - mkdir -p build && cd build - - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler - - make - artifacts: - paths: - - build/matrique build-flatpak: image: registry.gitlab.com/b0/matrique/flatpak From fa4da3c91e041b6ca835ec4612dd1dec5a9d2aca Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 18 Aug 2018 08:45:21 +0000 Subject: [PATCH 4/4] Update README.md --- README.md | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index ceacf94..b1b6011 100644 --- a/README.md +++ b/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) +Get it on Flathub + > "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,18 +45,33 @@ 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. +This program uses libqmatrixclient library and C++ models from Quaternion. + +![Quaternion](https://github.com/QMatrixClient/Quaternion) + +![libqmatrixclient](https://github.com/QMatrixClient/libqmatrixclient) ## License