Merge branch hotfix/v8.1.1 into release/v8.2.0

.github/workflows/check.yml

@@ -1,25 +1,24 @@
-name: Markdown check
+name: Markdown Lint
 
 on:
  workflow_dispatch:
  push:
  branches:
- - '*'
+ - '**'
  paths:
  - '*.md'
  - 'develop/*.md'
  - 'scripts/**.md'
+ - '.markdownlint.jsonc'
 
 jobs:
  markdownlint:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - uses: DavidAnson/markdownlint-cli2-action@v9
+ - uses: actions/checkout@v4
+ - uses: DavidAnson/markdownlint-cli2-action@v16
  with:
- command: config
  globs: |
- .markdownlint.jsonc
  *.md
  develop/*.md
- scripts/**.md
+ scripts/**.md

.github/workflows/update-version.yml

@@ -3,16 +3,13 @@ name: Update hard-coded version
 on: workflow_dispatch
 
 jobs:
-
  update-version:
  if: >-
  ${{ contains(github.ref, 'refs/heads/hotfix/v') ||
  contains(github.ref, 'refs/heads/release/v') }}
  runs-on: ubuntu-latest
  steps:
-
- - name: Checkout
- uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  token: ${{ secrets.PUSH_TOKEN }}
 
@@ -25,9 +22,9 @@ jobs:
  run: echo "${{ env.version }}" > version
 
  - name: Commit & push changes
- uses: EndBug/add-and-commit@v8
+ uses: EndBug/add-and-commit@v9
  with:
  author_name: github-actions[bot]
  author_email: github-actions[bot]@users.noreply.github.com
- message: Update hard-coded version to v${{ env.version }}
+ message: Update hard-coded version to ${{ env.version }}
  add: version

README.md

@@ -196,9 +196,8 @@ LD_LIBRARY_PATH=./ ./DesktopEditors
  **Note**: The created database must have **onlyoffice** both for user and password.
 
  ```bash
- sudo -i -u postgres psql -c "CREATE DATABASE onlyoffice;"
- sudo -i -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';"
- sudo -i -u postgres psql -c "GRANT ALL privileges ON DATABASE onlyoffice TO onlyoffice;"
+ sudo -i -u postgres psql -c "CREATE USER onlyoffice WITH PASSWORD 'onlyoffice';"
+ sudo -i -u postgres psql -c "CREATE DATABASE onlyoffice OWNER onlyoffice;"
  ```
 
 3. Configure the database:

develop/README.md

@@ -61,7 +61,6 @@ Clone development modules to the work dir
 * `server` repo is located [here](https://github.com/ONLYOFFICE/server/)
 
 ```bash
-cd ../..
 git clone https://github.com/ONLYOFFICE/sdkjs.git
 git clone https://github.com/ONLYOFFICE/web-apps.git
 git clone https://github.com/ONLYOFFICE/server.git
@@ -75,14 +74,15 @@ along with the relative paths to the required folders.
 The folders `sdkjs` and `web-apps` are required for proper development workflow.
 The folders `server` is optional
 
+**Note**: Run command with the current working directory
+containing `sdkjs`, `web-apps`...
+
 **Note**: ONLYOFFICE server uses port 80.
 Look for another application using port 80 and stop it
 
 **Note**: Server start with `sdkjs` and `web-apps` takes 15 minutes
 and takes 20 minutes with `server`
 
-**Note**: Run command from work dir with development modules
-
 ### docker run on Windows (PowerShell)
 
 **Note**: Run PowerShell as administrator to fix EACCES error when installing

scripts/base.py

@@ -1354,7 +1354,7 @@ def copy_sdkjs_plugins(dst_dir, is_name_as_guid=False, is_desktop_local=False, i
  plugins_dir = __file__script__path__ + "/../../onlyoffice.github.io/sdkjs-plugins/content"
  plugins_list_config = config.option("sdkjs-plugin")
  if isXp:
- plugins_list_config="photoeditor, macros, drawio, highlightcode, doc2md"
+ plugins_list_config="photoeditor, macros, highlightcode, doc2md"
  if ("" == plugins_list_config):
  return
  plugins_list = plugins_list_config.rsplit(", ")
@@ -1743,3 +1743,14 @@ def check_tools():
  create_dir(directory + "/qt")
  cmd("python", [directory + "/arm/build_qt.py", "--arch", "arm64", directory + "/qt/arm64"])
  return
+
+def apply_patch(file, patch):
+ patch_content = readFile(patch)
+ index1 = patch_content.find("<<<<<<<")
+ index2 = patch_content.find("=======")
+ index3 = patch_content.find(">>>>>>>")
+ file_content_old = patch_content[index1 + 7:index2].strip()
+ file_content_new = patch_content[index2 + 7:index3].strip()
+ #file_content_new = "\n#if 0" + file_content_old + "#else" + file_content_new + "#endif\n"
+ replaceInFile(file, file_content_old, file_content_new)
+ return

scripts/core_common/modules/android/icu_android.py

@@ -49,7 +49,6 @@
 
  "-DUCONFIG_NO_COLLATION=0",
  "-DUCONFIG_NO_FORMATTING=0",
- "-DUCONFIG_NO_LEGACY_CONVERSION=1",
  "-DUCONFIG_NO_REGULAR_EXPRESSIONS=0",
  "-DUCONFIG_NO_TRANSLITERATION=0",
 

scripts/core_common/modules/socket_io.py

@@ -27,8 +27,16 @@ def make():
  base_dir = base.get_script_dir() + "/../../core/Common/3dParty/socketio"
  if not base.is_dir(base_dir + "/socket.io-client-cpp"):
  base.cmd_in_dir(base_dir, "git", ["clone", "https://github.com/socketio/socket.io-client-cpp.git"])
+ base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["checkout", "da779141a7379cc30c870d48295033bc16a23c66"])
  base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["submodule", "init"])
  base.cmd_in_dir(base_dir + "/socket.io-client-cpp", "git", ["submodule", "update"])
+ base.cmd_in_dir(base_dir + "/socket.io-client-cpp/lib/asio", "git", ["checkout", "230c0d2ae035c5ce1292233fcab03cea0d341264"])
+ base.cmd_in_dir(base_dir + "/socket.io-client-cpp/lib/websocketpp", "git", ["checkout", "56123c87598f8b1dd471be83ca841ceae07f95ba"])
+ # patches
+ base.apply_patch(base_dir + "/socket.io-client-cpp/lib/websocketpp/websocketpp/impl/connection_impl.hpp", base_dir + "/patches/websocketpp.patch")
+ base.apply_patch(base_dir + "/socket.io-client-cpp/src/internal/sio_client_impl.cpp", base_dir + "/patches/sio_client_impl_fail.patch")
+ base.apply_patch(base_dir + "/socket.io-client-cpp/src/internal/sio_client_impl.cpp", base_dir + "/patches/sio_client_impl_open.patch")
+ base.apply_patch(base_dir + "/socket.io-client-cpp/src/internal/sio_client_impl.cpp", base_dir + "/patches/sio_client_impl_close_timeout.patch")
 
  # no tls realization (remove if socket.io fix this)
  dst_dir = base_dir + "/socket.io-client-cpp/src_no_tls"

version

@@ -1 +1 @@
-8.1.0
+8.1.1