Merge pull request #223 from DmDS/master

a few edits for the successful compilation of ver 22.05 and a new config.

Author: husisusi

bin/onlinePrep.sh

@@ -4,8 +4,8 @@
 ## idempotent functions to define if LibreOffice Online has to be compiled
 ## Installation of requirements for Libreoffice Online build only
 ## Download & install LibreOffice Online Sources
-cp /usr/local/lib/libPocoCrypto.so.82 /usr/lib/
-cp /usr/local/lib/libPocoXML.so.82 /usr/lib/
+cp /usr/local/lib/libPocoCrypto.so.* /usr/lib/
+cp /usr/local/lib/libPocoXML.so.* /usr/lib/
 set -e
 SearchGitOpts=''
 [ -n "${cool_src_branch}" ] && SearchGitOpts="${SearchGitOpts} -b ${cool_src_branch}"

bin/systemSetup.sh

@@ -88,9 +88,9 @@ apt-get build-dep libreoffice -y
 
 if [ "${DIST}" = "Debian" ]; then
     if [ "${CODENAME}" = "buster" ] || [ "${CODENAME}" = "bullseye" ];then
-	curl -fsSL https://deb.nodesource.com/setup_17.x | sudo -E bash -
+	curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
 	apt-get install nodejs -y
-	export npm_install="8.5.5"
+	export npm_install="8.14.0"
 	curl https://www.npmjs.com/install.sh | sh
 	apt install python3-polib -y
 	npm install -g browserify
@@ -108,4 +108,3 @@ fi
 
 getent passwd cool || (useradd cool -G sudo; mkdir /home/cool)
 chown cool:cool /home/cool -R
-

lib/default.cfg

@@ -30,7 +30,7 @@ with-fonts, with-galleries=no, with-lang=, with-linker-hash-style=both, with-sys
 with-system-zlib, without-branding, without-help, without-java,
 without-junit, without-myspell-dicts, without-package-format, without-system-jars,
 without-system-jpeg, without-system-libpng, without-system-libxml,
-without-system-openssl, without-system-poppler, without-system-postgresql,with-webdav=serf'
+without-system-openssl, without-system-poppler, without-system-postgresql,with-webdav'
 lo_non_free_ttf=false
 poco_version_latest=$(curl -s https://pocoproject.org/ | awk -F'Latest Release: ' '{printf $2}' | grep -Eo '^[^ ]+.\w')
 poco_default_dir="/opt/poco"  # just here for environnment checks

officeonline-install.cfg

@@ -1,21 +1,23 @@
 set_name='collabora'
-set_core_regex='co-2021'
-set_online_regex='^distro/collabora/co-21-11$'
+set_core_regex='co-22.05'
+set_online_regex='master'
 
 #### LibreOffice parameters ###
 lo_src_repo='https://github.com/LibreOffice/core.git'
-lo_src_branch='^distro/collabora/co-2021$'
-lo_src_commit='' #the short/full id of a git commit
+lo_src_branch='distro/collabora/co-22.05'
+lo_src_commit=''
 lo_dir="/opt/libreoffice"
-lo_forcebuild=false # force compilation
-lo_non_free_ttf=true # add Microsoft fonts to Ubuntu
+lo_forcebuild=true
+lo_non_free_ttf=true
 
 #### POCO parameters ###
 poco_version=$poco_version_latest #latest releases available
 poco_forcebuild=false
 
 #### LibreOffice Online parameters ###
 cool_src_repo="https://github.com/CollaboraOnline/online.git"
+lool_src_branch='master'
+lool_src_tag='cp-22.05.4-1'
 cool_dir="/opt/cool"
 cool_configure_opts="--disable-werror --with-lokit-path=${lo_dir}/include"
 cool_logfile='/var/log/coolwsd.log'
@@ -25,4 +27,4 @@ cool_localstatedir='/var'
 cool_forcebuild=true
 cool_maxcon=200
 cool_maxdoc=100
-coolwsd_service_name='coolwsd' # system name for the cool web socket daemon
+coolwsd_service_name='coolwsd'