From 12580a07eeaf7f6fa7fec88fddad87297e76d658 Mon Sep 17 00:00:00 2001 From: fossdd Date: Sun, 12 Jan 2025 20:17:28 +0100 Subject: [PATCH] community/chatterino2: modernize * update APKBUILD to CMake newapkbuild template * use rapidjson package instead of submodule * remove depends; libs are tracked by abuild --- community/chatterino2/APKBUILD | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/community/chatterino2/APKBUILD b/community/chatterino2/APKBUILD index b968cdd8f80..6df6d82787f 100644 --- a/community/chatterino2/APKBUILD +++ b/community/chatterino2/APKBUILD @@ -5,7 +5,6 @@ _crash_handler_commit=9753fe802710b2df00f2287ec2e1ca78c251d085 _libcommuni_commit=030710ad53dda1541601ccabbad36a12a9e90c78 _magicenum_commit=e55b9b54d5cf61f8e117cafb17846d7d742dd3b4 _miniaudio_commit=4a5b74bef029b3592c54b6048650ee5f972c1a48 -_rapidjson_commit=d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5 _sanitizers_cmake_commit=0573e2ea8651b9bb3083f193c41eb086497cc80a _serialize_commit=17946d65a41a72b447da37df6e314cded9650c32 _settings_commit=9e9c2f65f4ae195a96329a90fd6ae24c24fb8f2f @@ -16,16 +15,6 @@ pkgdesc="Chat client for twitch.tv" url="https://chatterino.com/" arch="all" license="MIT" -depends=" - boost1.84-libs - openssl - qt6-qt5compat - qt6-qtbase - qt6-qtimageformats - qt6-qtkeychain - qt6-qtsvg - qt6-qttools - " makedepends=" boost-dev cmake @@ -37,6 +26,8 @@ makedepends=" qt6-qtsvg-dev qt6-qttools-dev qtkeychain-dev + samurai + rapidjson-dev " source="$pkgname-$pkgver.tar.gz::https://github.com/Chatterino/chatterino2/archive/refs/tags/v$pkgver.tar.gz $pkgname-crash-handler-$_crash_handler_commit.tar.gz::https://github.com/Chatterino/crash-handler/archive/$_crash_handler_commit.tar.gz @@ -46,7 +37,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Chatterino/chatterino2/archi libcommuni-$_libcommuni_commit.tar.gz::https://github.com/Chatterino/libcommuni/archive/$_libcommuni_commit.tar.gz magicenum-$_magicenum_commit.tar.gz::https://github.com/Neargye/magic_enum/archive/$_magicenum_commit.tar.gz miniaudio-$_miniaudio_commit.tar.gz::https://github.com/mackron/miniaudio/archive/$_miniaudio_commit.tar.gz - rapidjson-$_rapidjson_commit.tar.gz::https://github.com/Tencent/rapidjson/archive/$_rapidjson_commit.tar.gz sanitizers-cmake-$_sanitizers_cmake_commit.tar.gz::https://github.com/arsenm/sanitizers-cmake/archive/$_sanitizers_cmake_commit.tar.gz websocketpp-$_websocketpp_commit.tar.gz::https://github.com/zaphoyd/websocketpp/archive/$_websocketpp_commit.tar.gz " @@ -59,7 +49,6 @@ prepare() { mv "$srcdir"/libcommuni-*/* "$srcdir"/chatterino2-$pkgver/lib/libcommuni/ mv "$srcdir"/magic_enum-*/* "$srcdir"/chatterino2-$pkgver/lib/magic_enum/ mv "$srcdir"/miniaudio-*/* "$srcdir"/chatterino2-$pkgver/lib/miniaudio/ - mv "$srcdir"/rapidjson-*/* "$srcdir"/chatterino2-$pkgver/lib/rapidjson/ mv "$srcdir"/sanitizers-cmake-*/* "$srcdir"/chatterino2-$pkgver/cmake/sanitizers-cmake/ mv "$srcdir"/serialize-*/* "$srcdir"/chatterino2-$pkgver/lib/serialize/ mv "$srcdir"/settings-*/* "$srcdir"/chatterino2-$pkgver/lib/settings/ @@ -68,20 +57,24 @@ prepare() { } build() { - cmake \ - -DCMAKE_BUILD_TYPE=Release \ + if [ "$CBUILD" != "$CHOST" ]; then + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=None \ -DUSE_SYSTEM_QTKEYCHAIN=ON \ -DUSE_PRECOMPILED_HEADERS=OFF \ -DBUILD_WITH_QT6=ON \ -DCHATTERINO_UPDATER=OFF \ - . - cmake --build . + $crossopts + cmake --build build } package() { - install -Dm755 bin/chatterino -t "$pkgdir"/usr/bin/ - install -Dm644 resources/com.chatterino.chatterino.desktop -t "$pkgdir"/usr/share/applications/ - install -Dm644 resources/icon.png "$pkgdir"/usr/share/pixmaps/com.chatterino.chatterino.png + DESTDIR="$pkgdir" cmake --install build } sha512sums=" @@ -93,7 +86,6 @@ ab99d3de67a75a2ded9d6a2310e8693d197fe53445816d9213b5d38d6e4f25abe3cf9a6e3b37ad90 4a056c6c69b5a6b1f29118034f7769de68f06c99549714272f515182e118bb744ba43956795ec42f1b283c89c30db53b19ac27988c31d185132ce71741e3b062 libcommuni-030710ad53dda1541601ccabbad36a12a9e90c78.tar.gz 466ba8e6e9122e55fb49b1a842b3f88ddc5faa5ea096df445dec1feba0c9db09748e735874b7839bf5f822f39480fa556a6bfaac0855c065df23b00ce45c5b3d magicenum-e55b9b54d5cf61f8e117cafb17846d7d742dd3b4.tar.gz d9328238e738280fccc34ae0d6d6ac68a171a30aef53defd5d74b6991b1c8dd63d0d433ede52d50f191984cefdabf414913b3f458d39a4fe16e0ade4beefaf7a miniaudio-4a5b74bef029b3592c54b6048650ee5f972c1a48.tar.gz -1770668c954e1bfa40da3956ccf2252703d2addb058bb8c0bf579abac585262452d0e15dcfed9ac2fa358c0da305d706226fdab8310b584017aba98e4f31db4f rapidjson-d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5.tar.gz 80d1c471492a771b12291e36cc7523e65c8f9add5b14643c9554156bbcc3e1753772054998306c3f89d33b7f5c9969e89670e16428a72040033b41329c9cb71b sanitizers-cmake-0573e2ea8651b9bb3083f193c41eb086497cc80a.tar.gz 5449a10086c1b80d0d2865bac90539f64613156050816e97a2da1a2bc1f6710ac72305747e839a13e49b2ce1b25610480c110743aef60d7d148f2c39339289c4 websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz "