Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
da975038
Commit
da975038
authored
4 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Drop libsodium dependency
parent
a9e321e3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-3
1 addition, 3 deletions
CMakeLists.txt
README.md
+4
-8
4 additions, 8 deletions
README.md
with
5 additions
and
11 deletions
CMakeLists.txt
+
1
−
3
View file @
da975038
...
...
@@ -35,8 +35,6 @@ option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json."
option
(
USE_BUNDLED_OPENSSL
"Use the bundled version of OpenSSL."
${
HUNTER_ENABLED
}
)
option
(
USE_BUNDLED_MTXCLIENT
"Use the bundled version of the Matrix Client library."
${
HUNTER_ENABLED
}
)
option
(
USE_BUNDLED_SODIUM
"Use the bundled version of libsodium."
${
HUNTER_ENABLED
}
)
option
(
USE_BUNDLED_LMDB
"Use the bundled version of lmdb."
${
HUNTER_ENABLED
}
)
option
(
USE_BUNDLED_LMDBXX
"Use the bundled version of lmdb++."
...
...
@@ -337,7 +335,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare
(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG
v0.3.1
GIT_TAG
68e043e1bf515e9072235151f74f7aac0838a9d3
)
FetchContent_MakeAvailable
(
MatrixClient
)
else
()
...
...
This diff is collapsed.
Click to expand it.
README.md
+
4
−
8
View file @
da975038
...
...
@@ -114,7 +114,6 @@ brew cask install nheko
-
[
cmark
](
https://github.com/commonmark/cmark
)
0.29 or greater.
-
Boost 1.70 or greater.
-
[
libolm
](
https://gitlab.matrix.org/matrix-org/olm
)
-
[
libsodium
](
https://github.com/jedisct1/libsodium
)
-
[
spdlog
](
https://github.com/gabime/spdlog
)
-
A compiler that supports C++ 17:
-
Clang 6 (tested on Travis CI)
...
...
@@ -136,8 +135,6 @@ The bundle flags are currently:
-
USE_BUNDLED_JSON
-
USE_BUNDLED_OPENSSL
-
USE_BUNDLED_MTXCLIENT
-
USE_BUNDLED_SODIUM
-
USE_BUNDLED_ZLIB
-
USE_BUNDLED_LMDB
-
USE_BUNDLED_LMDBXX
-
USE_BUNDLED_TWEENY
...
...
@@ -162,8 +159,7 @@ sudo pacman -S qt5-base \
fontconfig
\
lmdb
\
cmark
\
boost
\
libsodium
boost
```
##### Gentoo Linux
...
...
@@ -176,7 +172,7 @@ sudo emerge -a ">=dev-qt/qtgui-5.9.0" media-libs/fontconfig
```
bash
# Build requirements + qml modules needed at runtime (you may not need all of them, but the following seem to work according to reports):
sudo
apt
install
g++ cmake zlib1g-dev libssl-dev qt
{
base,declarative,tools,multimedia,quickcontrols2-
}
5-dev libqt5svg5-dev libboost-system-dev libboost-thread-dev libboost-iostreams-dev libolm-dev
libsodium-dev
liblmdb++-dev libcmark-dev nlohmann-json3-dev libspdlog-dev libgtest-dev qml-module-qt
{
gstreamer,multimedia,quick-extras,-labs-settings,graphicaleffects,quick-controls2
}
sudo
apt
install
g++ cmake zlib1g-dev libssl-dev qt
{
base,declarative,tools,multimedia,quickcontrols2-
}
5-dev libqt5svg5-dev libboost-system-dev libboost-thread-dev libboost-iostreams-dev libolm-dev liblmdb++-dev libcmark-dev nlohmann-json3-dev libspdlog-dev libgtest-dev qml-module-qt
{
gstreamer,multimedia,quick-extras,-labs-settings,graphicaleffects,quick-controls2
}
```
This will install all dependencies, except for tweeny (use bundled tweeny)
and mtxclient (needs to be build separately).
...
...
@@ -186,7 +182,7 @@ and mtxclient (needs to be build separately).
(User report, not sure if all of those are needed)
```
bash
sudo
apt
install
cmake gcc make automake liblmdb-dev
libsodium-dev
\
sudo
apt
install
cmake gcc make automake liblmdb-dev
\
qt5-default libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev
\
qml-module-qtgstreamer qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools
\
qml-module-qtgraphicaleffects qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts
...
...
@@ -203,7 +199,7 @@ guix environment nheko
```
bash
brew update
brew
install
qt5 lmdb cmake llvm
libsodium
spdlog boost cmark libolm
brew
install
qt5 lmdb cmake llvm spdlog boost cmark libolm
```
##### Windows
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment