Merge branch 'master' into 'master'
Update README, LICENSE and BUILD See merge request b0/spectral!18
This commit is contained in:
commit
41000319a6
30
BUILD.md
30
BUILD.md
|
@ -1,16 +1,24 @@
|
||||||
### Build instructions for OSX
|
# Build instructions for OSX
|
||||||
|
|
||||||
brew install qt5
|
1. Update Qt to v5.10+
|
||||||
# requires 5.10 or later, you may need brew update qt5 instead
|
|
||||||
|
|
||||||
git clone https://gitlab.com/b0/matrique
|
brew install qt5
|
||||||
cd matrique
|
|
||||||
|
|
||||||
# pull in libqmatrixclient
|
2. Download Spectral source
|
||||||
git submodule init
|
|
||||||
git submodule update
|
|
||||||
|
|
||||||
/usr/local/Cellar/qt5/5.10.1/bin/qmake
|
git clone https://gitlab.com/b0/spectral
|
||||||
make
|
cd spectral
|
||||||
|
|
||||||
open matrique.app/Contents/MacOS/matrique
|
3. Pull in the dependencies
|
||||||
|
|
||||||
|
git submodule init
|
||||||
|
git submodule update
|
||||||
|
|
||||||
|
4. Build Spectral
|
||||||
|
|
||||||
|
/usr/local/Cellar/qt5/5.10.1/bin/qmake
|
||||||
|
make
|
||||||
|
|
||||||
|
5. Open Spectral
|
||||||
|
|
||||||
|
open spectral.app/Contents/MacOS/spectral
|
||||||
|
|
4
LICENSE
4
LICENSE
|
@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
|
||||||
state the exclusion of warranty; and each file should have at least
|
state the exclusion of warranty; and each file should have at least
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
matrique
|
spectral
|
||||||
Copyright (C) 2018 Black Hat
|
Copyright (C) 2018 Black Hat
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
|
||||||
If the program does terminal interaction, make it output a short
|
If the program does terminal interaction, make it output a short
|
||||||
notice like this when it starts in an interactive mode:
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
matrique Copyright (C) 2018 Black Hat
|
spectral Copyright (C) 2018 Black Hat
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
This is free software, and you are welcome to redistribute it
|
This is free software, and you are welcome to redistribute it
|
||||||
under certain conditions; type `show c' for details.
|
under certain conditions; type `show c' for details.
|
||||||
|
|
20
README.md
20
README.md
|
@ -1,24 +1,24 @@
|
||||||
# Matrique
|
# Spectral
|
||||||
|
|
||||||
[![Pipeline Status](https://gitlab.com/b0/matrique/badges/master/pipeline.svg)](https://gitlab.com/b0/matrique/commits/master)
|
[![Pipeline Status](https://gitlab.com/b0/spectral/badges/master/pipeline.svg)](https://gitlab.com/b0/spectral/commits/master)
|
||||||
[![Build Status](https://ci.appveyor.com/api/projects/status/idt149cdxwurbukh?svg=true)](https://ci.appveyor.com/project/BlackHat/matrique)
|
[![Build Status](https://ci.appveyor.com/api/projects/status/idt149cdxwurbukh?svg=true)](https://ci.appveyor.com/project/BlackHat/spectral)
|
||||||
[![Coverage Report](https://gitlab.com/b0/matrique/badges/master/coverage.svg)](https://gitlab.com/b0/matrique/commits/master)
|
[![Coverage Report](https://gitlab.com/b0/spectral/badges/master/coverage.svg)](https://gitlab.com/b0/spectral/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>
|
<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. "
|
> "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.
|
Spectral is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging.
|
||||||
|
|
||||||
## Document
|
## Document
|
||||||
|
|
||||||
There is a separate document for Matrique, including installing, compiling, etc.
|
There is a separate document for Spectral, including installing, compiling, etc.
|
||||||
|
|
||||||
It is at ![Matrique Doc](https://doc.matrique.encom.eu.org/)
|
It is at [Spectral Doc](https://doc.spectral.encom.eu.org/)
|
||||||
|
|
||||||
## Contact
|
## Contact
|
||||||
|
|
||||||
You can reach the maintainer at #matrique:matrix.org, if you are already on Matrix.
|
You can reach the maintainer at #spectral:matrix.org, if you are already on Matrix.
|
||||||
|
|
||||||
Also, you can file an issue at this project if anything goes wrong.
|
Also, you can file an issue at this project if anything goes wrong.
|
||||||
|
|
||||||
|
@ -26,9 +26,9 @@ Also, you can file an issue at this project if anything goes wrong.
|
||||||
|
|
||||||
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)
|
[Quaternion](https://github.com/QMatrixClient/Quaternion)
|
||||||
|
|
||||||
![libqmatrixclient](https://github.com/QMatrixClient/libqmatrixclient)
|
[libqmatrixclient](https://github.com/QMatrixClient/libqmatrixclient)
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue