nheko, use bundled mtxclient for now (static), undefined references with new nlohmann_json (#9775)

This commit is contained in:
Schrijvers Luc
2023-11-20 10:39:46 +01:00
committed by GitHub
parent 556ef50e0e
commit be56ec4c6f

View File

@@ -5,7 +5,7 @@ etc.) and less like an IRC client. It was developed using the Qt5 framework."
HOMEPAGE="https://nheko.im/nheko-reborn/nheko"
COPYRIGHT="2017-2023 Nheko Authors"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/Nheko-Reborn/nheko/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37"
SOURCE_FILENAME="nheko-$portVersion.tar.gz"
@@ -18,11 +18,13 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
nheko$secondaryArchSuffix = $portVersion
app:Nheko$secondaryArchSuffix = $portVersion
devel:libmatrix_client$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcmark$secondaryArchSuffix
lib:libcoeurl$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libfmt$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libgobject_2.0$secondaryArchSuffix
@@ -30,7 +32,7 @@ REQUIRES="
lib:libgstsdp_1.0$secondaryArchSuffix
lib:libgstwebrtc_1.0$secondaryArchSuffix
lib:liblmdb$secondaryArchSuffix
lib:libmatrix_client$secondaryArchSuffix
# lib:libmatrix_client$secondaryArchSuffix
lib:libolm$secondaryArchSuffix
lib:libQt5Concurrent$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
@@ -45,6 +47,7 @@ REQUIRES="
lib:libQt5QuickWidgets$secondaryArchSuffix
lib:libQt5Svg$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libre2$secondaryArchSuffix
lib:libspdlog$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -61,7 +64,7 @@ BUILD_REQUIRES="
devel:libgstsdp_1.0$secondaryArchSuffix
devel:libgstwebrtc_1.0$secondaryArchSuffix
devel:liblmdb$secondaryArchSuffix
devel:libmatrix_client$secondaryArchSuffix >= 0.5.1
# devel:libmatrix_client$secondaryArchSuffix >= 0.5.1
devel:libolm$secondaryArchSuffix
devel:liborc_0.4$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
@@ -76,6 +79,7 @@ BUILD_PREREQUIRES="
cmd:a2x
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:git
cmd:linguist$secondaryArchSuffix >= 5
cmd:make
cmd:pkg_config$secondaryArchSuffix
@@ -87,6 +91,8 @@ BUILD()
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DCMAKE_BUILD_TYPE=Release \
-DSCREENSHARE_X11=OFF \
-DUSE_BUNDLED_MTXCLIENT=ON \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-lnetwork -lz" \
-Wno-dev
make -C build $jobArgs
@@ -113,4 +119,6 @@ INSTALL()
addResourcesToBinaries nheko.rdef $appsDir/Nheko
addAppDeskbarSymlink $appsDir/Nheko
prepareInstalledDevelLib libmatrix_client
}