From 62d267907c506b2bdb1f362c819ba68daa60668d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 6 Sep 2023 13:32:28 -0400 Subject: [PATCH] Properly setup system_qt link --- user/onlyoffice-document-server/APKBUILD | 27 +++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/user/onlyoffice-document-server/APKBUILD b/user/onlyoffice-document-server/APKBUILD index 1061fad..4f1050b 100644 --- a/user/onlyoffice-document-server/APKBUILD +++ b/user/onlyoffice-document-server/APKBUILD @@ -3,7 +3,8 @@ pkgname=onlyoffice-document-server pkgver=7.3.3 -_buildno=50 +_buildno=60 +_webtag=d26dc3f8736709e502e05f4daf50b29f96923b42 pkgrel=0 pkgdesc="ONLYOFFICE Docs is a free collaborative online office suite" url="https://github.com/ONLYOFFICE/DocumentServer" @@ -15,6 +16,7 @@ makedepends=" bash g++ nodejs + clang npm autoconf automake @@ -52,6 +54,9 @@ options="!check" # No testsuite source=" $pkgname-$pkgver.tar.gz::https://lab.ilot.io/mirrors/onlyoffice-document-server/-/releases/v$pkgver/downloads/tarball/onlyoffice-document-server-v$pkgver.tar.gz $pkgname-build_tools-$pkgver.$_buildno.tar.gz::https://github.com/ONLYOFFICE/build_tools/archive/refs/tags/v$pkgver.$_buildno.tar.gz + $pkgname-document-server-integration-$pkgver.$_buildno.tar.gz::https://github.com/ONLYOFFICE/document-server-integration/archive/refs/tags/v$pkgver.$_buildno.tar.gz + $pkgname-document-templates-$pkgver.$_buildno.tar.gz::https://github.com/ONLYOFFICE/document-templates/archive/refs/tags/v$pkgver.$_buildno.tar.gz + $pkgname-onlyoffice-io-$_webtag.tar.gz::https://github.com/ONLYOFFICE/onlyoffice.github.io/archive/$_webtag.tar.gz server_fix-makefile.patch server_restore-mobile-editing.patch web-apps_restore-mobile-editing.patch @@ -62,7 +67,16 @@ builddir="$srcdir"/$pkgname-v$pkgver prepare() { mv ../build_tools-$pkgver.$_buildno build_tools + mv ../document-server-integration-$pkgver.$_buildno document-server-integration + mv ../document-templates-$pkgver.$_buildno document-templates + mv ../onlyoffice.github.io-$_webtag onlyoffice.github.io default_prepare + + mkdir -p "$srcdir"/system_qt/clang_64 + ln -s /usr/lib "$srcdir"/system_qt/clang_64/lib + ln -s /usr/lib/qt5/bin "$srcdir"/system_qt/clang_64/bin + ln -s /usr/lib/qt5/plugins "$srcdir"/system_qt/clang_64/plugins + npm install -g --prefix "$srcdir"/npm_cache pkg grunt grunt-cli gifsicle # overrides rpi for certain 3rd party libraries as already provided by system # sed -i '/icu.make()/d' build_tools/scripts/core_common/make_common.py @@ -94,7 +108,11 @@ build() { export PATH="$PATH:$srcdir/npm_cache/bin" msg "Building core" cd "$builddir"/build_tools - ./configure.py --update 0 --module "server" + ./configure.py \ + --update 0 \ + --module "server" \ + --qt-dir "$srcdir"/system_qt \ + --compiler clang_64 ./make.py } @@ -109,7 +127,10 @@ package() { sha512sums=" e4601334830932515e4ba165eeeab935059d80523fcb4888da0b88b5fe6b3a2feff1f9c60166f4dbbaceabe546fe075f253b302eb0a7510c3b7762a06ab38755 onlyoffice-document-server-7.3.3.tar.gz -176b9a7649fc1d4f2e633de706d019ddb09011bf2baebce18d2b9aa5a523c69240eb6efaed32d665fc47a09b2e8931f0163a9aafc30dc3390e0a6c479b6dda73 onlyoffice-document-server-build_tools-7.3.3.50.tar.gz +8f9833765838803b6ca7abed12b35a791b4f81e5c6d248b773e0c63fda4f3e54a4df60199fd5c9ef0fe9c0444dccad13a01244b947a5af8f91e2c854435f5a54 onlyoffice-document-server-build_tools-7.3.3.60.tar.gz +ec02da8a8ee92c69ee8089b5f32fb817bc700f65670228a6205ef5afd26c85804931da0dfdc19f7739d5bf6b09732c3a5c5f46a0571b2ee68043c2ce6bf55478 onlyoffice-document-server-document-server-integration-7.3.3.60.tar.gz +24bda1feadf6b47cb556691fcfe71d60f7c34eb00da293f58ba4713c21754eeb146535befc511608477678cd7bc1fb8cf1a379c25300a43e2a7461d4225ed2e0 onlyoffice-document-server-document-templates-7.3.3.60.tar.gz +0144fdd79d1c633fbc54b24fef9bf9e4386fa7d46e67012b05786484dad9a5264e31f7de55eae23067e473483250b678138f86fb00b93aff801e21ddcbded0ad onlyoffice-document-server-onlyoffice-io-d26dc3f8736709e502e05f4daf50b29f96923b42.tar.gz dce838e901720cf18ccc8035e02b9f8fea0f38a448124321663612027058467de152bfc9c257a3bd14a0ab33a00962f604e1d6c5a7040d7f1b117d260e286839 server_fix-makefile.patch 7c70d7392040ed415da0cdce91c71926624c20a36f850ba9affaff3353368830cc172c243cebc608d72051627c7e44de232818c93453b8c7e58314f05e450b2d server_restore-mobile-editing.patch 5d5758b59c2e8e2b6a31d99efb7e3ad42c60ab035af3641be5f3d84f02a1ea5abf51a380cfc55e403569ebdf3620a9c67c81b8bd0ba4632fc0b5f0506e9cf57e web-apps_restore-mobile-editing.patch