git: a6b4b0c0cc0c - main - www/onlyoffice-documentserver: Fix build with ICU 76.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Feb 2025 00:27:44 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a6b4b0c0cc0c4e2f00e419c737a55f551014fb01
commit a6b4b0c0cc0c4e2f00e419c737a55f551014fb01
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2025-02-20 23:43:04 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-02-20 23:43:08 +0000
www/onlyoffice-documentserver: Fix build with ICU 76.1
Import patch to fix build
Source:
https://github.com/MikaelUrankar/onlyoffice-documentserver-ports/commit/5398d404cb22a07fd2de2b4f5dfa5ad7805f2135
PR: 284332
---
...a-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch | 20 ++++++++++++++++++--
.../patch-core_UnicodeConverter_UnicodeConverter.pro | 5 +++--
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch
index c1a7d9628e1c..a42f98ec9f12 100644
--- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch
+++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch
@@ -1,4 +1,4 @@
-https://github.com/yao-pkg/pkg-fetch/blob/main/patches/node.v18.18.2.cpp.patch
+https://raw.githubusercontent.com/yao-pkg/pkg-fetch/refs/tags/v3.5.7/patches/node.v18.18.2.cpp.patch
+ local FreeBSD patches
@@ -20,7 +20,23 @@ https://github.com/yao-pkg/pkg-fetch/blob/main/patches/node.v18.18.2.cpp.patch
diff --git node/configure.py node/configure.py
index 7006ee6581..12fb2ac8d1 100755
--- node/configure.py
-@@ -580,3 +589,349 @@ + 'cflags_cc': [ '-frtti', '-fno-lto' ],
+@@ -25,6 +34,15 @@ - o['cflags']+=['-msign-return-address=all']
+ o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
+
+ if options.node_snapshot_main is not None:
++@@ -1829,7 +1829,7 @@ def configure_intl(o):
++ elif with_intl == 'system-icu':
++ # ICU from pkg-config.
++ o['variables']['v8_enable_i18n_support'] = 1
++- pkgicu = pkg_config('icu-i18n')
+++ pkgicu = pkg_config(['icu-i18n', 'icu-uc'])
++ if not pkgicu[0]:
++ error('''Could not load pkg-config data for "icu-i18n".
++ See above errors or the README.md.''')
+ diff --git node/deps/v8/include/v8-initialization.h node/deps/v8/include/v8-initialization.h
+ index 3d59c73f7c..00b2de4524 100644
+ --- node/deps/v8/include/v8-initialization.h
+@@ -580,3 +599,349 @@ + 'cflags_cc': [ '-frtti', '-fno-lto' ],
'cflags_cc!': [ '-fno-rtti' ],
}],
[ 'OS == "mac" or OS == "ios"', {
diff --git a/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.pro b/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.pro
index 0c5e2c1fa9ab..d2ff67118687 100644
--- a/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.pro
+++ b/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.pro
@@ -1,10 +1,11 @@
--- core/UnicodeConverter/UnicodeConverter.pro.orig 2021-09-30 12:13:32 UTC
+++ core/UnicodeConverter/UnicodeConverter.pro
-@@ -15,6 +15,11 @@ include(../Common/base.pri)
+@@ -13,6 +13,12 @@ DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
+
DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
- ADD_DEPENDENCY(kernel)
+core_freebsd {
++ CONFIG += c++17
+ QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
+ QMAKE_LFLAGS += -Wl,--disable-new-dtags
+}