diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-04-09 17:17:18 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-10 00:08:17 +0000 |
| commit | 94bf43317cb70e98e6b868e62c0f52f2df79553d (patch) | |
| tree | 7e36d9cdae223d0d63d55a1a7cff407c77da06ea /testing | |
| parent | b7d74654ee45433591c019340ec68c649dfe0f33 (diff) | |
| download | aports-94bf43317cb70e98e6b868e62c0f52f2df79553d.tar.bz2 aports-94bf43317cb70e98e6b868e62c0f52f2df79553d.tar.xz | |
testing/nheko: upgrade to 0.6.4
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/nheko/APKBUILD | 77 | ||||
| -rw-r--r-- | testing/nheko/modern-spdlog.patch | 22 |
2 files changed, 68 insertions, 31 deletions
diff --git a/testing/nheko/APKBUILD b/testing/nheko/APKBUILD index 0c0611ee33..21ed5487e6 100644 --- a/testing/nheko/APKBUILD +++ b/testing/nheko/APKBUILD @@ -1,55 +1,70 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=nheko -pkgver=0.4.3 -pkgrel=1 +pkgver=0.6.4 +pkgrel=0 pkgdesc="Qt5-based client for Matrix protocol" -url="https://github.com/mujx/nheko" -arch="" # Current version is deprecated, needs to be transferred to nheko reborn -license="GPL-3.0+" +url="https://github.com/Nheko-Reborn/nheko/releases" +arch="all" +license="GPL-3.0-or-later" options="!check" # no test suite -makedepends="clang cmake qt5-qtbase-dev qt5-qttools-dev qt5-qtmultimedia-dev qt5-qtsvg-dev libsodium-dev lmdb-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/mujx/nheko/archive/v$pkgver.tar.gz" +makedepends=" + cmake + ninja + boost-dev + lmdb-dev + lmdbxx + tweeny + qt5-qtbase-dev + qt5-qttools-dev + qt5-qtmultimedia-dev + qt5-qtsvg-dev + zlib-dev + openssl-dev + olm-dev + nlohmann-json + cmark-dev + spdlog-dev + mtxclient-dev + libsodium-dev + " +source="$pkgname-$pkgver.tar.gz::https://github.com/Nheko-Reborn/nheko/archive/v$pkgver.tar.gz + modern-spdlog.patch + " -builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + default_prepare + sed -e '/-Wall/d' \ + -e '/-Wextra/d' \ + -e '/-Werror/d' \ + -e '/-pedantic/d' \ + -e '/-pipe/d' \ + -i CMakeLists.txt +} build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build - cd "$builddir"/build - cmake \ + cmake -B build \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_SKIP_RPATH=True \ -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -stdlib=libstdc++" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_C_COMPILER=clang \ - ${CMAKE_CROSSOPTS} .. - make + $CMAKE_CROSSOPTS . + ninja -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + ninja -C build check } package() { - cd "$builddir"/build - install -D -m755 nheko "$pkgdir"/usr/bin/nheko - install -D -m644 ../resources/nheko-256.png "$pkgdir"/usr/share/pixmaps/nheko-256.png - install -D -m644 ../resources/nheko.desktop "$pkgdir"/usr/share/applications/nheko.desktop - - local size dir - for size in 16 32 48 64 128 256 512; do - dir="$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps - install -D -m644 ../resources/nheko-${size}.png "$dir"/nheko.png; - done + ninja -C build install } -sha512sums="b9ad4131b75af7ee3b79cb89d63313e94f76a6a6672c5c02b264ebec75a2a2525de266d6e4d07482736b714188a5a1eba721802ff951ee4d77f8cbf571758777 nheko-0.4.3.tar.gz" +sha512sums="782673a3ae642029307517798e5be96cf0473cd4261af891988a35dfeb5e2e724d2c034407f62addd2e15973d287d11c6590d70cca739c705354cb0151536470 nheko-0.6.4.tar.gz +0552de80a9ce1add4ec852c376ddc0d8cb326b3c78d83d6bc4f98a4fd1a13ee4e04f322f7bbc629eafb917b4072cc9986756d31ca1e0152875060a01c2896d1b modern-spdlog.patch" diff --git a/testing/nheko/modern-spdlog.patch b/testing/nheko/modern-spdlog.patch new file mode 100644 index 0000000000..c6d724a8ec --- /dev/null +++ b/testing/nheko/modern-spdlog.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fda60b7..cca69ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + add_definitions(-DBOOST_MPL_LIMIT_LIST_SIZE=30) + add_definitions(-DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) ++add_definitions(-DSPDLOG_COMPILED_LIB) ++add_definitions(-DSPDLOG_FMT_EXTERNAL) + + include(GNUInstallDirs) + +@@ -395,6 +397,7 @@ set(COMMON_LIBS + MatrixClient::MatrixClient + ${Boost_LIBRARIES} + cmark::cmark ++ spdlog::spdlog + Qt5::Widgets + Qt5::Svg + Qt5::Concurrent + |