www/onlyoffice-documentserver: Update to 7.0.1.50

Update to 7.0.1.50
  Cleanup patches
  Remove obsolete dependencies (they were required to build v8)
  Don't force the installation of the database server, the server can be hosted anywhere.
  Fix a build fs violation (with PYTHONDONTWRITEBYTECODE=1)
  Various fix in pkg-message

Changes: https://github.com/ONLYOFFICE/DocumentServer/blob/master/CHANGELOG.md#701
This commit is contained in:
Mikael Urankar 2022-03-07 10:03:24 +01:00
parent a502b5dbc4
commit 0e03a8f10f
8 changed files with 82 additions and 158 deletions

View file

@ -1,7 +1,6 @@
PORTNAME= onlyoffice-documentserver PORTNAME= onlyoffice-documentserver
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 7.0.0.133 DISTVERSION= 7.0.1.50
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES+= LOCAL/mikael/v8/:source1 \ MASTER_SITES+= LOCAL/mikael/v8/:source1 \
LOCAL/mikael/onlyoffice/:source2 \ LOCAL/mikael/onlyoffice/:source2 \
@ -11,8 +10,8 @@ DISTFILES+= v8-6.8.275.32_all.tar.gz:source1 \
v8-6.8.275.32_122aarch64.tar.gz:source1 \ v8-6.8.275.32_122aarch64.tar.gz:source1 \
v8-6.8.275.32_122amd64.tar.gz:source1 \ v8-6.8.275.32_122amd64.tar.gz:source1 \
node-v16.13.0.tar.gz:source3 \ node-v16.13.0.tar.gz:source3 \
npm-cache-onlyoffice-${DISTVERSION}.tar.gz:source2 \ optipng-0.7.7.tar.gz:source4 \
optipng-0.7.7.tar.gz:source4 onlyoffice-${DISTVERSION}-npm-cache.tar.gz:source2 \
MAINTAINER= mikael@FreeBSD.org MAINTAINER= mikael@FreeBSD.org
COMMENT= Secure office and productivity apps COMMENT= Secure office and productivity apps
@ -23,13 +22,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS= aarch64 amd64
ONLY_FOR_ARCHS_REASON= uses aarch64 or amd64 binaries ONLY_FOR_ARCHS_REASON= uses aarch64 or amd64 binaries
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ BUILD_DEPENDS= boost-libs>0:devel/boost-libs \
binutils>=0:devel/binutils \
boost-libs>0:devel/boost-libs \
glib>=2.54:devel/glib20 \ glib>=2.54:devel/glib20 \
gn:devel/gn \
java:java/openjdk11 \ java:java/openjdk11 \
ninja:devel/ninja \
npm:www/npm-node16 npm:www/npm-node16
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
libcurl.so:ftp/curl \ libcurl.so:ftp/curl \
@ -47,7 +42,7 @@ USE_QT= qmake_build
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= ONLYOFFICE GH_ACCOUNT= ONLYOFFICE
GH_PROJECT= DocumentServer GH_PROJECT= DocumentServer
GH_TAGNAME= v7.0.0 GH_TAGNAME= v7.0.1
GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \ GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \
ONLYOFFICE:core-fonts:v${DISTVERSION}:corefonts/core-fonts \ ONLYOFFICE:core-fonts:v${DISTVERSION}:corefonts/core-fonts \
ONLYOFFICE:dictionaries:v${DISTVERSION}:dictionaries/dictionaries \ ONLYOFFICE:dictionaries:v${DISTVERSION}:dictionaries/dictionaries \
@ -77,9 +72,9 @@ OPTIONS_SINGLE= DB
OPTIONS_SINGLE_DB= MYSQL PGSQL OPTIONS_SINGLE_DB= MYSQL PGSQL
OPTIONS_DEFAULT= PGSQL OPTIONS_DEFAULT= PGSQL
MYSQL_USES+= mysql:server MYSQL_USES+= mysql:client
PGSQL_USES+= pgsql PGSQL_USES+= pgsql
PGSQL_VARS= WANT_PGSQL=server PGSQL_VARS= WANT_PGSQL=client
BINARY_ALIAS= python=${PYTHON_CMD} BINARY_ALIAS= python=${PYTHON_CMD}
USE_LDCONFIG= yes USE_LDCONFIG= yes
@ -105,6 +100,10 @@ MAKE_ENV= BUILD_NUMBER="1" \
PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \ PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \
PRODUCT_VERSION="${DISTVERSION}" PRODUCT_VERSION="${DISTVERSION}"
# Don't create __pycache__ directory when executing node-gyp
# This is a workaround to avoid filesystem violations during poudriere build
MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1
DOS2UNIX_FILES= document-server-package/common/documentserver/nginx/includes/http-common.conf.m4 DOS2UNIX_FILES= document-server-package/common/documentserver/nginx/includes/http-common.conf.m4
CONFLICTS_BUILD=devel/googletest CONFLICTS_BUILD=devel/googletest

View file

@ -1,4 +1,4 @@
TIMESTAMP = 1643198986 TIMESTAMP = 1646292390
SHA256 (v8-6.8.275.32_all.tar.gz) = 9a62989b8965970c0cc67aef911b4937b822fe91a41e9d6977e797ed1326504b SHA256 (v8-6.8.275.32_all.tar.gz) = 9a62989b8965970c0cc67aef911b4937b822fe91a41e9d6977e797ed1326504b
SIZE (v8-6.8.275.32_all.tar.gz) = 65333304 SIZE (v8-6.8.275.32_all.tar.gz) = 65333304
SHA256 (v8-6.8.275.32_122aarch64.tar.gz) = c7311440b3d97a0caa41406de43fd77fc45f1c0f627cea8c54466a7ab78ca69a SHA256 (v8-6.8.275.32_122aarch64.tar.gz) = c7311440b3d97a0caa41406de43fd77fc45f1c0f627cea8c54466a7ab78ca69a
@ -7,56 +7,56 @@ SHA256 (v8-6.8.275.32_122amd64.tar.gz) = 78d13788f4e3608a7b6765621353aa9f334f549
SIZE (v8-6.8.275.32_122amd64.tar.gz) = 10328115 SIZE (v8-6.8.275.32_122amd64.tar.gz) = 10328115
SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f
SIZE (node-v16.13.0.tar.gz) = 63735070 SIZE (node-v16.13.0.tar.gz) = 63735070
SHA256 (npm-cache-onlyoffice-7.0.0.133.tar.gz) = 5fc9a9fbb5df370e3aa91288ef28c350ddf52f28be8ce0e85c7477053006d5e8
SIZE (npm-cache-onlyoffice-7.0.0.133.tar.gz) = 313289046
SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452 SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
SIZE (optipng-0.7.7.tar.gz) = 2329555 SIZE (optipng-0.7.7.tar.gz) = 2329555
SHA256 (ONLYOFFICE-DocumentServer-v7.0.0.133-v7.0.0_GH0.tar.gz) = c228d579a1434ecf9df1319efa8bc7ac6f4a814b50bf98d6564d4cd1d50aa3eb SHA256 (onlyoffice-7.0.1.50-npm-cache.tar.gz) = cb61c61cb4e72fc6b18fe560d45c742b4c57ff0f971381db7b4407aaca371f54
SIZE (ONLYOFFICE-DocumentServer-v7.0.0.133-v7.0.0_GH0.tar.gz) = 51546 SIZE (onlyoffice-7.0.1.50-npm-cache.tar.gz) = 148399002
SHA256 (ONLYOFFICE-core-v7.0.0.133_GH0.tar.gz) = 6fa8f092609a79849fcaede100eeb893d89a8b29dd20a269546270e16b04dcd8 SHA256 (ONLYOFFICE-DocumentServer-v7.0.1.50-v7.0.1_GH0.tar.gz) = 1b5a529bc53c3e3d2c1502a610aa7670d9b2a470b41bc195964507b48726fc7d
SIZE (ONLYOFFICE-core-v7.0.0.133_GH0.tar.gz) = 83982867 SIZE (ONLYOFFICE-DocumentServer-v7.0.1.50-v7.0.1_GH0.tar.gz) = 52186
SHA256 (ONLYOFFICE-core-fonts-v7.0.0.133_GH0.tar.gz) = fcb6813d2e47d97574ff84f4a45f59a31988793e4b9ec6a4fcfcc4eb9b2cdece SHA256 (ONLYOFFICE-core-v7.0.1.50_GH0.tar.gz) = d4f0ba20e92e1e9286e43ccb48c540f324c540398720200a9eb9de875ac3794b
SIZE (ONLYOFFICE-core-fonts-v7.0.0.133_GH0.tar.gz) = 95253814 SIZE (ONLYOFFICE-core-v7.0.1.50_GH0.tar.gz) = 83969143
SHA256 (ONLYOFFICE-dictionaries-v7.0.0.133_GH0.tar.gz) = 0b3255e0ebe7693a2516f13e33d7763b724ed72baac917ff11454bbb6867f048 SHA256 (ONLYOFFICE-core-fonts-v7.0.1.50_GH0.tar.gz) = 182e4c8b797ffdd1e2e85602074e1c1ea0e27a1b181297d36db8ff9759e8eeac
SIZE (ONLYOFFICE-dictionaries-v7.0.0.133_GH0.tar.gz) = 40190006 SIZE (ONLYOFFICE-core-fonts-v7.0.1.50_GH0.tar.gz) = 95257795
SHA256 (ONLYOFFICE-document-server-integration-v7.0.0.133_GH0.tar.gz) = 8c1cd189c73649571158c42bf817aacac19d4538df7a657df5eec2b4709a2812 SHA256 (ONLYOFFICE-dictionaries-v7.0.1.50_GH0.tar.gz) = f0809bcb3541216ebaca5500376e5f541b13c7456eace70f3c8f71a3945c0010
SIZE (ONLYOFFICE-document-server-integration-v7.0.0.133_GH0.tar.gz) = 5246759 SIZE (ONLYOFFICE-dictionaries-v7.0.1.50_GH0.tar.gz) = 41048395
SHA256 (ONLYOFFICE-document-templates-v7.0.0.133_GH0.tar.gz) = 15ae1c9114d10e660f8dd620e2b22c2c1ba3334eb8de141d2ad8f971f4867ac3 SHA256 (ONLYOFFICE-document-server-integration-v7.0.1.50_GH0.tar.gz) = 28d77ca1c925391fe934c05ddf84850f8c0dd495ebeae5f12dcb06b3630e6759
SIZE (ONLYOFFICE-document-templates-v7.0.0.133_GH0.tar.gz) = 2152333 SIZE (ONLYOFFICE-document-server-integration-v7.0.1.50_GH0.tar.gz) = 5246757
SHA256 (ONLYOFFICE-sdkjs-v7.0.0.133_GH0.tar.gz) = f23421f23fd576bfb3b51db9af54d0924f4bea2e5c03ac2ceef96df975c5780c SHA256 (ONLYOFFICE-document-templates-v7.0.1.50_GH0.tar.gz) = 72c613cd4da5406c784a7557b3e4f71447cb7064b866fc91632d15f5f28a4d95
SIZE (ONLYOFFICE-sdkjs-v7.0.0.133_GH0.tar.gz) = 11798678 SIZE (ONLYOFFICE-document-templates-v7.0.1.50_GH0.tar.gz) = 2152341
SHA256 (ONLYOFFICE-server-v7.0.0.133_GH0.tar.gz) = 25e2287feb0817960296ffb1287a15cab8ab156964b57f96c9a3a65a0500f3c5 SHA256 (ONLYOFFICE-sdkjs-v7.0.1.50_GH0.tar.gz) = cf30f4a82e06f0a5d58200df749112ab9b61319f6aa21f340f544606d5965edf
SIZE (ONLYOFFICE-server-v7.0.0.133_GH0.tar.gz) = 251263 SIZE (ONLYOFFICE-sdkjs-v7.0.1.50_GH0.tar.gz) = 11799701
SHA256 (ONLYOFFICE-web-apps-v7.0.0.133_GH0.tar.gz) = 8115126338c8e3eb86878d103ed24f72be675fee08a5450db75f9132d633460a SHA256 (ONLYOFFICE-server-v7.0.1.50_GH0.tar.gz) = 85d81d960745b5c2ca721dbf7ee3601014c07fd42720c09a4507a5ef6dc743e8
SIZE (ONLYOFFICE-web-apps-v7.0.0.133_GH0.tar.gz) = 256708229 SIZE (ONLYOFFICE-server-v7.0.1.50_GH0.tar.gz) = 251287
SHA256 (ONLYOFFICE-plugin-highlightcode-v7.0.0.133_GH0.tar.gz) = af47ac3de5e869b414ab2b90bd08a14df80716d588ed461e5155ef26604d9462 SHA256 (ONLYOFFICE-web-apps-v7.0.1.50_GH0.tar.gz) = add54fd48a4df1bc995c4db3841ebfcc65e9bcfdb989028db399d135f610741a
SIZE (ONLYOFFICE-plugin-highlightcode-v7.0.0.133_GH0.tar.gz) = 245229 SIZE (ONLYOFFICE-web-apps-v7.0.1.50_GH0.tar.gz) = 256706099
SHA256 (ONLYOFFICE-plugin-macros-v7.0.0.133_GH0.tar.gz) = 54af0dc2b5c831427b19aa8926dfb81bbf1c507de439d2b90ee7c994427703d9 SHA256 (ONLYOFFICE-plugin-highlightcode-v7.0.1.50_GH0.tar.gz) = ac954a25f7e4e2d1dd6d06ff28a605ce3ddc71461ca01649696fd118089814a5
SIZE (ONLYOFFICE-plugin-macros-v7.0.0.133_GH0.tar.gz) = 2646817 SIZE (ONLYOFFICE-plugin-highlightcode-v7.0.1.50_GH0.tar.gz) = 245216
SHA256 (ONLYOFFICE-plugin-mendeley-v7.0.0.133_GH0.tar.gz) = 3a5c215f0d4bcb4c6c47e7026d0bca310b67fdad717be7b63effe6a09974a88b SHA256 (ONLYOFFICE-plugin-macros-v7.0.1.50_GH0.tar.gz) = 6a23f3a68e018bb8c7c87e524c3e0eaae2a4c57a508c128bc04670d313162dab
SIZE (ONLYOFFICE-plugin-mendeley-v7.0.0.133_GH0.tar.gz) = 417558 SIZE (ONLYOFFICE-plugin-macros-v7.0.1.50_GH0.tar.gz) = 2646822
SHA256 (ONLYOFFICE-plugin-ocr-v7.0.0.133_GH0.tar.gz) = 0ccd17625ebf999d488fcbf6162276701cb6296f038057b8497697f546b6a4df SHA256 (ONLYOFFICE-plugin-mendeley-v7.0.1.50_GH0.tar.gz) = 200a36e4595c1dc2be26ed3d9ca113aacb6fb6878ed185a6e45a05ca69c88e92
SIZE (ONLYOFFICE-plugin-ocr-v7.0.0.133_GH0.tar.gz) = 169527 SIZE (ONLYOFFICE-plugin-mendeley-v7.0.1.50_GH0.tar.gz) = 417646
SHA256 (ONLYOFFICE-plugin-photoeditor-v7.0.0.133_GH0.tar.gz) = 8c253508cb40cae9b492eadebfba08704ad7d62db1f8b0025d54db559fd210c6 SHA256 (ONLYOFFICE-plugin-ocr-v7.0.1.50_GH0.tar.gz) = 9bde090945d5c879c2c93eac26874a4ad114aacb502e29690ca3aa1edbaf784f
SIZE (ONLYOFFICE-plugin-photoeditor-v7.0.0.133_GH0.tar.gz) = 201060 SIZE (ONLYOFFICE-plugin-ocr-v7.0.1.50_GH0.tar.gz) = 169530
SHA256 (ONLYOFFICE-plugin-speech-v7.0.0.133_GH0.tar.gz) = 33424bb8405d09a07c3c90039a366157fbfc7fc85c6217800ad9ed639c7ed0c6 SHA256 (ONLYOFFICE-plugin-photoeditor-v7.0.1.50_GH0.tar.gz) = cf278fc18d239e462efd9acfe0f2a777c2fe28ab701eecafb9d6e6ab8095d2e0
SIZE (ONLYOFFICE-plugin-speech-v7.0.0.133_GH0.tar.gz) = 68220 SIZE (ONLYOFFICE-plugin-photoeditor-v7.0.1.50_GH0.tar.gz) = 201064
SHA256 (ONLYOFFICE-plugin-thesaurus-v7.0.0.133_GH0.tar.gz) = 7603e3be3dd229430972fd2c7938ac8f705efc819cf70bc95016fc6ec3075068 SHA256 (ONLYOFFICE-plugin-speech-v7.0.1.50_GH0.tar.gz) = 0b84e8a73bd1ad2d4990b1a3fad858aef348f5ff23d5f605df9af7695c289b10
SIZE (ONLYOFFICE-plugin-thesaurus-v7.0.0.133_GH0.tar.gz) = 42917 SIZE (ONLYOFFICE-plugin-speech-v7.0.1.50_GH0.tar.gz) = 68212
SHA256 (ONLYOFFICE-plugin-translator-v7.0.0.133_GH0.tar.gz) = de4fd8f415fcab2ce4e4d1fb938221128ab8e768ef005f5c0b0060e6f29eb097 SHA256 (ONLYOFFICE-plugin-thesaurus-v7.0.1.50_GH0.tar.gz) = e57cc0bc93aaeea7d484b16b5a6a638a7c2c7447fbc43092bb9a4b764255e197
SIZE (ONLYOFFICE-plugin-translator-v7.0.0.133_GH0.tar.gz) = 140898 SIZE (ONLYOFFICE-plugin-thesaurus-v7.0.1.50_GH0.tar.gz) = 42915
SHA256 (ONLYOFFICE-plugin-youtube-v7.0.0.133_GH0.tar.gz) = 77eb671a352b181177ccb9ee4eb5ddac85a26eb86f3fb33d77c65788254a64eb SHA256 (ONLYOFFICE-plugin-translator-v7.0.1.50_GH0.tar.gz) = 56e31d9bbcfd38922a532c33f8a4e26a757485dd86c6530b0c5b17f456a08dde
SIZE (ONLYOFFICE-plugin-youtube-v7.0.0.133_GH0.tar.gz) = 11642 SIZE (ONLYOFFICE-plugin-translator-v7.0.1.50_GH0.tar.gz) = 140899
SHA256 (ONLYOFFICE-plugin-zotero-v7.0.0.133_GH0.tar.gz) = e45f1e5481ea29ddcd98ee826bde1a0fd493eee410f97eccec81d62be9fa02b7 SHA256 (ONLYOFFICE-plugin-youtube-v7.0.1.50_GH0.tar.gz) = 64997e6f3e029313287377eef60b837721553efaa704b6a2db4272042c9b3564
SIZE (ONLYOFFICE-plugin-zotero-v7.0.0.133_GH0.tar.gz) = 33819 SIZE (ONLYOFFICE-plugin-youtube-v7.0.1.50_GH0.tar.gz) = 11652
SHA256 (ONLYOFFICE-build_tools-v7.0.0.133_GH0.tar.gz) = 30e411008065e744b6c7cb8dd93737445541615f1a7f7f88ff48f7ccb33482c5 SHA256 (ONLYOFFICE-plugin-zotero-v7.0.1.50_GH0.tar.gz) = 793a16650815428b612444208735933a82e73d49662e521bda6c3e31c382bb0f
SIZE (ONLYOFFICE-build_tools-v7.0.0.133_GH0.tar.gz) = 4091744 SIZE (ONLYOFFICE-plugin-zotero-v7.0.1.50_GH0.tar.gz) = 33815
SHA256 (ONLYOFFICE-DocumentBuilder-v7.0.0.133_GH0.tar.gz) = ba782719859074b0fbd72b1ce519f2ee2ee239120ee6833084e6d7b047c551d9 SHA256 (ONLYOFFICE-build_tools-v7.0.1.50_GH0.tar.gz) = 57864c0dfb85b6632cd7e30b17dccbf878432d16d319c43b6bc3092710f25a8c
SIZE (ONLYOFFICE-DocumentBuilder-v7.0.0.133_GH0.tar.gz) = 1271108 SIZE (ONLYOFFICE-build_tools-v7.0.1.50_GH0.tar.gz) = 4091890
SHA256 (ONLYOFFICE-DocumentBuilder-v7.0.1.50_GH0.tar.gz) = ce9d0923518930360d020a51ab8dd71abbbfabaa5d50cf40ba53bc06718169d5
SIZE (ONLYOFFICE-DocumentBuilder-v7.0.1.50_GH0.tar.gz) = 1271121
SHA256 (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 20a58e72bb2e3eaede5acbeaa6284769d9ec4606f39869da8b7edcc1aefc9e63 SHA256 (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 20a58e72bb2e3eaede5acbeaa6284769d9ec4606f39869da8b7edcc1aefc9e63
SIZE (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 13283 SIZE (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 13283
SHA256 (ONLYOFFICE-document-server-package-v7.0.0.133_GH0.tar.gz) = a9dba7bbf3a45da5f822e87fefa5da6e261eaf811231293fb7ae017417b93160 SHA256 (ONLYOFFICE-document-server-package-v7.0.1.50_GH0.tar.gz) = 1faf0a02e14db2fcfb45c733bbfbf33ca39675dbc02c3e32ef8ea46b68889825
SIZE (ONLYOFFICE-document-server-package-v7.0.0.133_GH0.tar.gz) = 171524 SIZE (ONLYOFFICE-document-server-package-v7.0.1.50_GH0.tar.gz) = 171919
SHA256 (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = ed83020cbe07877c7323d475491803797fac12ce4086966011c81023b9852c4b SHA256 (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = ed83020cbe07877c7323d475491803797fac12ce4086966011c81023b9852c4b
SIZE (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = 97209 SIZE (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = 97209
SHA256 (google-gumbo-parser-aa91b27_GH0.tar.gz) = 1360f85c02fb2573a10f00abcddebc8f1ff277a16f66553439193af93afae335 SHA256 (google-gumbo-parser-aa91b27_GH0.tar.gz) = 1360f85c02fb2573a10f00abcddebc8f1ff277a16f66553439193af93afae335

View file

@ -1,13 +1,14 @@
--- build_tools/build.pro.orig 2021-12-12 19:27:25 UTC --- build_tools/build.pro.orig 2021-12-12 19:27:25 UTC
+++ build_tools/build.pro +++ build_tools/build.pro
@@ -8,6 +8,10 @@ include($$PWD/common.pri) --- build_tools/build.pro.orig 2022-02-28 14:20:10.000000000 +0100
+++ build_tools/build.pro 2022-03-03 10:11:49.033261000 +0100
@@ -8,6 +8,9 @@ include($$PWD/common.pri)
CONFIG += ordered CONFIG += ordered
+core_freebsd { +core_freebsd {
+ CONFIG += no_desktop_apps + CONFIG += no_desktop_apps
+ CONFIG += no_use_htmlfileinternal
+} +}
core_windows { core_windows {
CONFIG += core_and_multimedia desktop:CONFIG += core_and_multimedia
} }

View file

@ -1,29 +0,0 @@
--- build_tools/make.py.orig 2021-11-16 07:07:24 UTC
+++ build_tools/make.py
@@ -13,6 +13,7 @@ import build_js
import build_server
import deploy
import make_common
+import os
import develop
# parse configuration
@@ -54,7 +55,17 @@ base.check_build_version(base_dir)
# update
if ("1" == config.option("update")):
repositories = base.get_repositories()
- base.update_repositories(repositories)
+# base.update_repositories(repositories)
+
+ # Apply patches if available
+ patchdir = base_dir + '/patches/' + base.host_platform()
+ if os.path.exists(patchdir) :
+ for root, dirs, files in os.walk(patchdir) :
+ for filename in files :
+ tmpdir = base_dir + '/../' + filename.split('.', 1)[0]
+ print('Patching directory %s' % tmpdir)
+ base.cmd("patch", ["-d", tmpdir, "-i", patchdir + "/" + filename])
+
base.configure_common_apps()

View file

@ -73,12 +73,11 @@
if base.is_dir("v8/third_party/binutils/Linux_x64/Release/bin"): if base.is_dir("v8/third_party/binutils/Linux_x64/Release/bin"):
for file in os.listdir("v8/third_party/binutils/Linux_x64/Release/bin"): for file in os.listdir("v8/third_party/binutils/Linux_x64/Release/bin"):
@@ -160,6 +163,11 @@ def make(): @@ -160,6 +163,10 @@ def make():
base_args64 = "target_cpu=\\\"x64\\\" v8_target_cpu=\\\"x64\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false" base_args64 = "target_cpu=\\\"x64\\\" v8_target_cpu=\\\"x64\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false"
base_args32 = "target_cpu=\\\"x86\\\" v8_target_cpu=\\\"x86\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false" base_args32 = "target_cpu=\\\"x86\\\" v8_target_cpu=\\\"x86\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false"
+ +
+# v8_monolithic=true
+# if config.check_option("platform", "freebsd_64"): +# if config.check_option("platform", "freebsd_64"):
+# base.cmd2("gn", ["gen", "out.gn/freebsd_64", "--args=\"v8_monolithic=true is_debug=false v8_static_library=true is_component_build=false is_clang=true use_sysroot=false treat_warnings_as_errors=false clang_use_chrome_plugins=false use_lld=true use_custom_libcxx=false v8_use_external_startup_data=false is_component_build=false\""]) +# base.cmd2("gn", ["gen", "out.gn/freebsd_64", "--args=\"v8_monolithic=true is_debug=false v8_static_library=true is_component_build=false is_clang=true use_sysroot=false treat_warnings_as_errors=false clang_use_chrome_plugins=false use_lld=true use_custom_libcxx=false v8_use_external_startup_data=false is_component_build=false\""])
+# base.cmd("ninja", ["-C", "out.gn/freebsd_64"]) +# base.cmd("ninja", ["-C", "out.gn/freebsd_64"])

View file

@ -1,6 +1,6 @@
--- build_tools/tools/freebsd/automate.py.orig 2021-12-18 16:54:46 UTC --- build_tools/tools/freebsd/automate.py.orig 2021-12-18 16:54:46 UTC
+++ build_tools/tools/freebsd/automate.py +++ build_tools/tools/freebsd/automate.py
@@ -0,0 +1,104 @@ @@ -0,0 +1,54 @@
+#!/usr/bin/env python +#!/usr/bin/env python
+ +
+import sys +import sys
@ -9,66 +9,16 @@
+import os +import os
+import subprocess +import subprocess
+ +
+def get_branch_name(directory): +branch = "master"
+ cur_dir = os.getcwd()
+ os.chdir(directory)
+ # detect build_tools branch
+ #command = "git branch --show-current"
+ command = "git symbolic-ref --short -q HEAD"
+ popen = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+ current_branch = "master"
+ try:
+ stdout, stderr = popen.communicate()
+ popen.wait()
+ current_branch = stdout.strip().decode("utf-8")
+ finally:
+ popen.stdout.close()
+ popen.stderr.close()
+ os.chdir(cur_dir)
+ return current_branch
+
+def install_deps():
+ if base.is_file("./packages_complete"):
+ return
+
+ # dependencies
+ packages = ["git-lite",
+ "bash",
+ "png",
+ "jpeg-turbo",
+ "p7zip",
+ "qt5-qmake",
+ "boost-libs",
+ "openjdk8",
+ "openjdk11",
+ "subversion"]
+
+# base.cmd("sudo", ["pkg", "install"] + packages)
+ base.set_env('QT_SELECT', 'qt5')
+
+ # nodejs
+# if not base.is_file("./node_js_setup_10.x"):
+# base.cmd("sudo", ["touch", "./node_js_setup_10.x"])
+# base.cmd("sudo", ["npm", "install", "-g", "npm@6"])
+
+ return
+
+if not base.is_file("./node_js_setup_10.x"):
+ print("install dependencies...")
+ install_deps()
+
+if not base.is_dir("./qt"):
+ base.cmd("mkdir", ["qt",])
+ base.cmd("ln", ["-s", "/usr/local/lib/qt5", "qt/clang_64"])
+
+# Apply a patch on the node_gyp cache in case of npm-node10 use..
+#base.cmd("bash", ["patch_nodegyp.sh",])
+
+branch = get_branch_name("../..")
+ +
+array_args = sys.argv[1:] +array_args = sys.argv[1:]
+array_modules = [] +array_modules = []
+ +
+base.set_env('QT_SELECT', 'qt5')
+if not base.is_dir("./qt"):
+ base.cmd("mkdir", ["qt",])
+ base.cmd("ln", ["-s", "/usr/local/lib/qt5", "qt/clang_64"])
+
+config = {} +config = {}
+for arg in array_args: +for arg in array_args:
+ if (0 == arg.find("--")): + if (0 == arg.find("--")):
@ -99,7 +49,7 @@
+ +
+build_tools_params = ["--branch", branch, +build_tools_params = ["--branch", branch,
+ "--module", modules, + "--module", modules,
+ "--update", "1", + "--update", "0",
+ "--platform", "freebsd_64", + "--platform", "freebsd_64",
+ "--qt-dir", os.getcwd() + "/qt"] + "--qt-dir", os.getcwd() + "/qt"]
+ +

View file

@ -4,14 +4,13 @@
CONFIGURATION: CONFIGURATION:
------------- -------------
The configuration file can be found (or created) at the following path: The configuration file can be found (or created) at the following path:
%%ETCDIR%%/documentserver/local.json. %%ETCDIR%%/documentserver/local.json
The default values are available in the default.json configuration file, The default values are available in the default.json configuration file,
which is available in the folders above. Please do not edit the contents of the which is available in the folders above. Please do not edit the contents of the
default.json file directly. The default values will be restored each time you default.json file directly. The default values will be restored each time you
upgrade Document Server to a new version and all your changes will be lost. upgrade Document Server to a new version and all your changes will be lost.
1. Enable services at startup in the /etc/rc.conf file: 1. Enable services at startup in the /etc/rc.conf file:
postgresql_enable="YES"
nginx_enable="YES" nginx_enable="YES"
rabbitmq_enable="YES" rabbitmq_enable="YES"
supervisord_enable="YES" supervisord_enable="YES"
@ -19,7 +18,7 @@ upgrade Document Server to a new version and all your changes will be lost.
Optionally in case of a jail with local IP and no internet access: Optionally in case of a jail with local IP and no internet access:
update /etc/hosts in order to resolve your nextcloud server to its local IP update /etc/hosts in order to resolve your nextcloud server to its local IP
2. Set up the database (either PostgreSQL or MySQL): 2. Install a database server and set up the database (either PostgreSQL or MySQL):
For PostgreSQL (don't forget to change the password): For PostgreSQL (don't forget to change the password):
# service postgresql initdb # service postgresql initdb
# service postgresql start # service postgresql start
@ -56,7 +55,6 @@ files = %%ETCDIR%%/documentserver/supervisor/*.conf
5. Set up nginx: 5. Set up nginx:
- nginx sample configuration files are located in: %%ETCDIR%%/documentserver/nginx - nginx sample configuration files are located in: %%ETCDIR%%/documentserver/nginx
Do not edit them as they will be restored everytime the port is updated.
- start nginx: - start nginx:
# service nginx start # service nginx start

View file

@ -401,6 +401,12 @@ lib/libkernel_network.so
%%WWWDIR%%/documentserver/dictionaries/uk_UA/th_uk_UA.idx %%WWWDIR%%/documentserver/dictionaries/uk_UA/th_uk_UA.idx
%%WWWDIR%%/documentserver/dictionaries/uk_UA/uk_UA.aff %%WWWDIR%%/documentserver/dictionaries/uk_UA/uk_UA.aff
%%WWWDIR%%/documentserver/dictionaries/uk_UA/uk_UA.dic %%WWWDIR%%/documentserver/dictionaries/uk_UA/uk_UA.dic
%%WWWDIR%%/documentserver/dictionaries/uz_Cyrl_UZ/README.md
%%WWWDIR%%/documentserver/dictionaries/uz_Cyrl_UZ/uz_Cyrl_UZ.aff
%%WWWDIR%%/documentserver/dictionaries/uz_Cyrl_UZ/uz_Cyrl_UZ.dic
%%WWWDIR%%/documentserver/dictionaries/uz_Latn_UZ/README.md
%%WWWDIR%%/documentserver/dictionaries/uz_Latn_UZ/uz_Latn_UZ.aff
%%WWWDIR%%/documentserver/dictionaries/uz_Latn_UZ/uz_Latn_UZ.dic
%%WWWDIR%%/documentserver/dictionaries/vi_VN/vi_VN.aff %%WWWDIR%%/documentserver/dictionaries/vi_VN/vi_VN.aff
%%WWWDIR%%/documentserver/dictionaries/vi_VN/vi_VN.dic %%WWWDIR%%/documentserver/dictionaries/vi_VN/vi_VN.dic
%%WWWDIR%%/documentserver/dictionaries/vi_VN/vi_VN_Vietnamese.txt %%WWWDIR%%/documentserver/dictionaries/vi_VN/vi_VN_Vietnamese.txt