From d74b2c3f20b57082b19f3d57e3073c61b2ab8929 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 6 Sep 2023 14:34:19 -0400 Subject: [PATCH] Attempt musl build fix --- user/onlyoffice-document-server/APKBUILD | 2 + .../core_fix-musl-build.patch | 79 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 user/onlyoffice-document-server/core_fix-musl-build.patch diff --git a/user/onlyoffice-document-server/APKBUILD b/user/onlyoffice-document-server/APKBUILD index 39c8b61..9540c67 100644 --- a/user/onlyoffice-document-server/APKBUILD +++ b/user/onlyoffice-document-server/APKBUILD @@ -62,6 +62,7 @@ source=" server_restore-mobile-editing.patch web-apps_restore-mobile-editing.patch build_tools-untarget-pkg.patch + core_fix-musl-build.patch " builddir="$srcdir"/$pkgname-v$pkgver @@ -139,4 +140,5 @@ dce838e901720cf18ccc8035e02b9f8fea0f38a448124321663612027058467de152bfc9c257a3bd 7c70d7392040ed415da0cdce91c71926624c20a36f850ba9affaff3353368830cc172c243cebc608d72051627c7e44de232818c93453b8c7e58314f05e450b2d server_restore-mobile-editing.patch 5d5758b59c2e8e2b6a31d99efb7e3ad42c60ab035af3641be5f3d84f02a1ea5abf51a380cfc55e403569ebdf3620a9c67c81b8bd0ba4632fc0b5f0506e9cf57e web-apps_restore-mobile-editing.patch ad2ebbc5293ff3203b4fd84016910b4074f145febcbae28ba5ff5f8c4514c7da2a7b5b35d80ae37919a3794ff12e93af0bd9787175eda86bb546b13c98d3029e build_tools-untarget-pkg.patch +edf83d229459cba87029cecde2777fdc5b4717eed965fe91a4223475bc85e0c99cbc25b9be8de4497c0b14d96b0fe4bee77dd2174c6f59cc9a82ef6c96a1feae core_fix-musl-build.patch " diff --git a/user/onlyoffice-document-server/core_fix-musl-build.patch b/user/onlyoffice-document-server/core_fix-musl-build.patch new file mode 100644 index 0000000..4b0bb14 --- /dev/null +++ b/user/onlyoffice-document-server/core_fix-musl-build.patch @@ -0,0 +1,79 @@ +diff --git a/core/DesktopEditor/graphics/BaseThread.cpp.orig b/core/DesktopEditor/graphics/BaseThread.cpp +index df64ee0..beba342 100644 +--- a/core/DesktopEditor/graphics/BaseThread.cpp.orig ++++ b/core/DesktopEditor/graphics/BaseThread.cpp +@@ -136,7 +136,7 @@ namespace NSThreads + public: + __native_thread() : CThreadDescriptor() + { +- m_thread = NULL; ++ m_thread = 0; + } + virtual ~__native_thread() + { +diff --git a/core/DesktopEditor/cximage/CxImage/ximagif.cpp.orig b/core/DesktopEditor/cximage/CxImage/ximagif.cpp +index 4fbcf1e..fef552f 100644 +--- a/core/DesktopEditor/cximage/CxImage/ximagif.cpp.orig ++++ b/core/DesktopEditor/cximage/CxImage/ximagif.cpp +@@ -86,7 +86,7 @@ namespace NSGeneratePalette + + if ( ( X + Width ) > SrcWidth || ( Y + Height ) > SrcHeigth || NULL == pSrc ) + { +- return NULL; ++ return 0; + } + + (*pImage) = new CImage8bit (); +diff --git a/core/DesktopEditor/doctrenderer/nativecontrol.h.orig b/core/DesktopEditor/doctrenderer/nativecontrol.h +index 22a99e3..c49cc88 100644 +--- a/core/DesktopEditor/doctrenderer/nativecontrol.h.orig ++++ b/core/DesktopEditor/doctrenderer/nativecontrol.h +@@ -327,7 +327,7 @@ namespace NSNativeControl + + if (m_map_access_directories.end() == m_map_access_directories.find(NSFile::GetDirectoryName(strFile))) + { +- *pData = NULL; ++ *pData = 0; + dwLen = 0; + return; + } +diff --git a/core/UnicodeConverter/UnicodeConverter.cpp.orig b/core/UnicodeConverter/UnicodeConverter.cpp +index 61f1403..60d517f 100644 +--- a/core/UnicodeConverter/UnicodeConverter.cpp.orig ++++ b/core/UnicodeConverter/UnicodeConverter.cpp +@@ -131,7 +131,7 @@ namespace NSUnicodeConverter + char *sResCur = sResStart; + const char *sResLimit = sResCur + nOutputLen * ucnv_getMaxCharSize(conv); + +- ucnv_fromUnicode(conv, &sResCur, sResLimit, &pOutputStart, pOutputLimit, NULL, TRUE, &status); ++ ucnv_fromUnicode(conv, &sResCur, sResLimit, &pOutputStart, pOutputLimit, NULL, true, &status); + if (U_SUCCESS(status)) + { + sRes = std::string(sResStart, sResCur - sResStart); +@@ -180,7 +180,7 @@ namespace NSUnicodeConverter + char *sResCur = sResStart; + const char *sResLimit = sResCur + sRes.size(); + +- ucnv_fromUnicode(conv, &sResCur, sResLimit, &pUCharStart, pUCharLimit, NULL, TRUE, &status); ++ ucnv_fromUnicode(conv, &sResCur, sResLimit, &pUCharStart, pUCharLimit, NULL, true, &status); + if (U_SUCCESS(status)) + { + sRes.resize(sResCur - sResStart); +@@ -223,7 +223,7 @@ namespace NSUnicodeConverter + UChar* target = targetStart; + UChar* targetLimit = target + uBufSize; + +- ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, TRUE, &status); ++ ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, true, &status); + if (U_SUCCESS(status)) + { + size_t nTargetSize = target - targetStart; +@@ -278,7 +278,7 @@ namespace NSUnicodeConverter + UChar* target = targetStart; + UChar* targetLimit = target + uBufSize; + +- ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, TRUE, &status); ++ ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, true, &status); + if (U_SUCCESS(status)) + { + size_t nTargetSize = target - targetStart;