.forgejo/bin/check_ver.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# expects the following env variables:
-# downstream: downstream repo
-
-repo=${downstream/*\/}
-
-curl --silent $downstream/binary-amd64/Packages > Packages
-
-owned_by_you=$(awk -F ': ' '{if($1=="Package"){print $2}}' Packages | sort | uniq)
-
-echo "Found $(printf '%s\n' $owned_by_you | wc -l ) packages"
-
-rm -f out_of_date not_in_anitya
-
-for pkg in $owned_by_you; do
-	upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Debian" | jq -r '.items.[].stable_version')
-	downstream_version=$(sed -n "/^Package: $pkg$/,/^$/p" Packages| awk -F ': ' '{if($1=="Version"){print $2 }}' | sort -V | tail -n 1)
-	downstream_version=${downstream_version/-*}
-
-	echo $upstream_version
-	echo $downstream_version
-
-	if [ -z "$upstream_version" ]; then
-		echo "$pkg not in anitya"
-		echo "$pkg" >> not_in_anitya
-	elif [ "$downstream_version" != "$(printf '%s\n' $upstream_version $downstream_version | sort -V | head -n 1)" ]; then
-		echo "$pkg higher downstream"
-		continue
-	elif [ "$upstream_version" != "$downstream_version" ]; then
-		echo "$pkg upstream version $upstream_version does not match downstream version $downstream_version"
-		echo "$pkg $downstream_version $upstream_version $repo" >> out_of_date
-	fi
-done

.forgejo/bin/create_issue.sh

@@ -1,165 +0,0 @@
-#!/bin/bash
-
-# expects:
-# env variable FORGEJO_TOKEN
-# file out_of_date
-
-IFS='
-'
-repo=${downstream/*\/}
-
-does_it_exist() {
-	name=$1
-	downstream_version=$2
-	upstream_version=$3
-	repo=$4
-
-	query="$repo/$name: upgrade to $upstream_version"
-	query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )"
-
-	result="$(curl --silent -X 'GET' \
-		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
-		-H 'accept: application/json' \
-		-H "authorization: Basic $FORGEJO_TOKEN"
-	)"
-
-	if [ "$result" == "[]" ]; then
-		return 1
-	fi
-}
-
-is_it_old() {
-	name=$1
-	downstream_version=$2
-	upstream_version=$3
-	repo=$4
-
-	query="$repo/$name: upgrade to"
-	query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )"
-
-	result="$(curl --silent -X 'GET' \
-		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
-		-H 'accept: application/json' \
-		-H "authorization: Basic $FORGEJO_TOKEN"
-	)"
-
-	result_title="$(echo $result | jq -r '.[].title' )"
-	result_id="$(echo $result | jq -r '.[].number' )"
-	result_upstream_version="$(echo $result_title | awk '{print $4}')"
-
-	if [ "$upstream_version" != "$result_upstream_version" ]; then
-		echo $result_id
-	else
-		echo 0
-	fi
-}
-
-update_title() {
-	name=$1
-	downstream_version=$2
-	upstream_version=$3
-	repo=$4
-	id=$5
-
-	result=$(curl --silent -X 'PATCH' \
-		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues/$id" \
-		-H 'accept: application/json' \
-		-H "authorization: Basic $FORGEJO_TOKEN" \
-		-H 'Content-Type: application/json' \
-		-d "{
-			\"title\": \"$repo/$name: upgrade to $upstream_version\"
-		}"
-	)
-	
-	return 0
-}
-
-create_issue() {
-	name=$1
-	downstream_version=$2
-	upstream_version=$3
-	repo=$4
-
-	result=$(curl --silent -X 'POST' \
-		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues" \
-		-H 'accept: application/json' \
-		-H "authorization: Basic $FORGEJO_TOKEN" \
-		-H 'Content-Type: application/json' \
-		-d "{
-			\"title\": \"$repo/$name: upgrade to $upstream_version\",
-			\"labels\": [
-				$LABEL_NUMBER
-			]
-		}")
-
-	return 0
-}
-
-if [ -f out_of_date ]; then
-	out_of_date="$(cat out_of_date)"
-
-	echo "Detected $(wc -l out_of_date) out-of-date packages, creating issues"
-
-	for pkg in $out_of_date; do
-		name="$(echo $pkg | awk '{print $1}')"
-		downstream_version="$(echo $pkg | awk '{print $2}')"
-		upstream_version="$(echo $pkg | awk '{print $3}')"
-		repo="$(echo $pkg | awk '{print $4}')"
-
-		if does_it_exist $name $downstream_version $upstream_version $repo; then
-			echo "Issue for $repo/$name already exists"
-			continue
-		fi
-
-		id=$(is_it_old $name $downstream_version $upstream_version $repo)
-	
-		if [  "$id" != "0" ] && [ -n "$id" ]; then
-			echo "Issue for $repo/$name needs updating"
-			update_title $name $downstream_version $upstream_version $repo $id
-			continue
-		fi
-
-		echo "Creating issue for $repo/$name"
-		create_issue $name $downstream_version $upstream_version $repo
-	done
-fi
-
-if [ -f not_in_anitya ]; then
-	query="Add missing $repo packages to anitya"
-	query="$(echo $query | sed 's| |%20|g')"
-
-	result="$(curl --silent -X 'GET' \
-		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
-		-H 'accept: application/json' \
-		-H "authorization: Basic $FORGEJO_TOKEN"
-	)"
-
-	if [ "$result" == "[]" ]; then
-		echo "Creating anitya issue"
-		result=$(curl --silent -X 'POST' \
-			"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues" \
-			-H 'accept: application/json' \
-			-H "authorization: Basic $FORGEJO_TOKEN" \
-			-H 'Content-Type: application/json' \
-			-d "{
-				\"title\": \"Add missing $repo packages to anitya\",
-				\"body\": \"- [ ] $(sed '{:q;N;s/\n/\\n- [ ] /g;t q}' not_in_anitya)\",
-				\"labels\": [
-					$LABEL_NUMBER
-				]
-			}")
-
-	else
-		echo "Updating anitya issue"
-		result_id="$(echo $result | jq -r '.[].number' )"
-		result=$(curl --silent -X 'PATCH' \
-			"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues/$result_id" \
-			-H 'accept: application/json' \
-			-H "authorization: Basic $FORGEJO_TOKEN" \
-			-H 'Content-Type: application/json' \
-			-d "{
-				\"body\": \"- [ ] $(sed '{:q;N;s/\n/\\n- [ ] /g;t q}' not_in_anitya)\"
-			}"
-		)
-	fi
-fi

.forgejo/workflows/check-pkg.yml

@@ -1,24 +0,0 @@
-on:
-  workflow_dispatch:
-
-jobs:
-  check-user:
-    name: Check user repo
-    runs-on: x86_64
-    container:
-      image: alpine:latest
-    env:
-      downstream:  https://forge.ilot.io/api/packages/ilot/debian/dists/jammy/main
-      FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
-      LABEL_NUMBER: 4
-    steps:
-      - name: Environment setup
-        run: apk add grep coreutils gawk curl wget bash nodejs git jq sed
-      - name: Get scripts
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - name: Check out-of-date packages
-        run: ${{ github.workspace }}/.forgejo/bin/check_ver.sh
-      - name: Create issues
-        run: ${{ github.workspace }}/.forgejo/bin/create_issue.sh

.forgejo/workflows/release-build.yaml

@@ -9,16 +9,15 @@ jobs:
     container:
       image: ubuntu:22.04
     env:
-      pkgver: 8.3.3
+      pkgver: 8.1.1
-      buildno: 21
+      buildno: 39
       qtver: 5.15.3
     steps:
       - name: Environment setup
         run: |
           cat /etc/os-release
           apt-get update
-          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper clang-14 lld-14
+          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper
-          # node version set in build_tools/scripts/build_server variable pkg_target
           curl -sL https://deb.nodesource.com/setup_16.x | bash -
           apt-get install -y nodejs
           npm install -g pkg grunt grunt-cli
@@ -35,9 +34,8 @@ jobs:
       - name: Applying patches
         run: |
           cd build
-          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
+          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
           git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
-          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_common-officefileformatchecker2-add-limits-include.patch
       - name: Development setup
         run: |
           mkdir -p build/build_tools/system_qt-$qtver/gcc_64

.forgejo/workflows/test-build.yaml

@@ -8,15 +8,15 @@ jobs:
     container:
       image: ubuntu:22.04
     env:
-      pkgver: 8.2.2
+      pkgver: 8.1.1
-      buildno: 22
+      buildno: 39
       qtver: 5.15.3
     steps:
       - name: Environment setup
         run: |
           cat /etc/os-release
           apt-get update
-          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper clang-14 lld-14
+          apt-get install -y git make g++ bzip2 sudo patch python2 curl lsb-release p7zip-full qtbase5-dev debhelper
           curl -sL https://deb.nodesource.com/setup_16.x | bash -
           apt-get install -y nodejs
           npm install -g pkg grunt grunt-cli
@@ -33,7 +33,7 @@ jobs:
       - name: Applying patches
         run: |
           cd build
-          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-use-system-clang.patch
+          git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/core_v8-no-enum-constexrp-conversion.patch
           git apply -v --ignore-space-change --ignore-whitespace $GITHUB_WORKSPACE/disable-licensing-limits.patch
       - name: Development setup
         run: |

core_common-officefileformatchecker2-add-limits-include.patch

@@ -1,12 +0,0 @@
-diff --git a/core/Common/OfficeFileFormatChecker2.cpp b/core/Common/OfficeFileFormatChecker2.cpp
-index d2887d78..43c28a0b 100644
---- a/core/Common/OfficeFileFormatChecker2.cpp
-+++ b/core/Common/OfficeFileFormatChecker2.cpp
-@@ -44,6 +44,7 @@
- 
- #include "3dParty/pole/pole.h"
- #include <algorithm>
-+#include <limits>
- 
- #include "OfficeFileFormatDefines.h"
- 

core_v8-no-enum-constexrp-conversion.patch

@@ -0,0 +1,34 @@
+diff --git a/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch
+new file mode 100644
+index 0000000000..5a1a8067a6
+--- /dev/null
++++ b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch
+@@ -0,0 +1,14 @@
++diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
++index 5ea2f213..29fa7742 100644
++--- a/build/config/compiler/BUILD.gn
+++++ b/build/config/compiler/BUILD.gn
++@@ -1548,6 +1548,9 @@ config("default_warnings") {
++           # TODO(https://crbug.com/989932): Evaluate and possibly enable.
++           "-Wno-implicit-int-float-conversion",
++
+++          "-Wno-enum-constexpr-conversion",
+++
+++
++           # TODO(https://crbug.com/999886): Clean up, enable.
++           "-Wno-final-dtor-non-final-class",
++
+diff --git a/build_tools/scripts/core_common/modules/v8_89.py b/core/build_tools/core_common/modules/v8_89.py
+index 9643263..35ee1fe 100644
+--- a/build_tools/scripts/core_common/modules/v8_89.py
++++ b/build_tools/scripts/core_common/modules/v8_89.py
+@@ -150,6 +150,8 @@ def make():
+              "use_custom_libcxx=false",
+              "treat_warnings_as_errors=false"]
+ 
++  base.cmd("patch", ["-p1", "-i", "../../v8/tools/no-enum-constexrp-conversion.patch"])
++
+   if config.check_option("platform", "linux_64"):
+     base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")])
+     base.cmd("ninja", ["-C", "out.gn/linux_64"])
+

core_v8-use-system-clang.patch

@@ -1,12 +0,0 @@
---- a/build_tools/scripts/core_common/modules/v8_89.py
-+++ b/build_tools/scripts/core_common/modules/v8_89.py
-@@ -48,6 +48,8 @@ def make_args(args, platform, is_64=True, is_debug=False):
-   
-   if (platform == "linux"):
-     args_copy.append("is_clang=true")
-+    args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"")
-+    args_copy.append("clang_use_chrome_plugins=false")
-     args_copy.append("use_sysroot=false")
-   if (platform == "windows"):
-     args_copy.append("is_clang=false")
-

disable-licensing-limits.patch

@@ -26,6 +26,61 @@ open source.
 
 ---
 
+diff --git a/server/Common/sources/constants.js b/server/Common/sources/constants.js
+index 3e8e7aaa..aad4d05f 100644
+--- a/server/Common/sources/constants.js
++++ b/server/Common/sources/constants.js
+@@ -85,8 +85,8 @@ exports.LICENSE_RESULT = {
+   NotBefore: 16
+ };
+ 
+-exports.LICENSE_CONNECTIONS = 20;
+-exports.LICENSE_USERS = 3;
++exports.LICENSE_CONNECTIONS = 999999;
++exports.LICENSE_USERS = 999999;
+ exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
+ 
+ exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
+diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js
+index 5df8d693..3fd9de14 100644
+--- a/server/Common/sources/license.js
++++ b/server/Common/sources/license.js
+@@ -45,24 +45,24 @@ exports.readLicense = function*() {
+ 		count: 1,
+ 		type: c_LR.Success,
+ 		light: false,
+-		packageType: constants.PACKAGE_TYPE_OS,
++		packageType: constants.PACKAGE_TYPE_I,
+ 		mode: constants.LICENSE_MODE.None,
+-		branding: false,
++		branding: true,
+ 		connections: constants.LICENSE_CONNECTIONS,
+ 		connectionsView: constants.LICENSE_CONNECTIONS,
+-		customization: false,
+-		advancedApi: false,
+-		usersCount: 0,
+-		usersViewCount: 0,
++		customization: true,
++		advancedApi: true,
++		usersCount: constants.LICENSE_CONNECTIONS,
++		usersViewCount: constants.LICENSE_CONNECTIONS,
+ 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
+-		hasLicense: false,
+-		plugins: false,
++		hasLicense: true,
++		plugins: true,
+ 		buildDate: oBuildDate,
+ 		startDate: startDate,
+-		endDate: null,
++		endDate: new Date("2099-01-01T23:59:59.000Z"),
+ 		customerId: "",
+-		alias: ""
++		alias: "community"
+ 	}, null];
+ };
+ 
+-exports.packageType = constants.PACKAGE_TYPE_OS;
++exports.packageType = constants.PACKAGE_TYPE_I;
 diff --git a/server/DocService/sources/server.js b/server/DocService/sources/server.js
 index 76303af9..9d2e6888 100644
 --- a/server/DocService/sources/server.js
@@ -40,6 +95,19 @@ index 76303af9..9d2e6888 100644
  
  try {
 
+diff --git a/server/FileConverter/sources/convertermaster.js b/server/FileConverter/sources/convertermaster.js
+index 46615032..6ce2d3e6 100644
+--- a/server/FileConverter/sources/convertermaster.js
++++ b/server/FileConverter/sources/convertermaster.js
+@@ -92,7 +92,7 @@ if (cluster.isMaster) {
+ 
+   updateLicense();
+ 
+-  fs.watchFile(cfgLicenseFile, updateLicense);
++  // fs.watchFile(cfgLicenseFile, updateLicense);
+   setInterval(updateLicense, 86400000);
+ } else {
+   const converter = require('./converter');
 diff --git a/server/Makefile b/server/Makefile
 index e8e1308f..23f7e2ef 100644
 --- a/server/Makefile
@@ -90,70 +158,3 @@ index ec7b37a2c..bfd879583 100644
 +EditorUIController.isSupportEditFeature = () => true;
  
  export default EditorUIController;
-diff --git a/server/Common/sources/constants.js b/server/Common/sources/constants.js
-index 700696ff..d8bb9178 100644
---- a/server/Common/sources/constants.js
-+++ b/server/Common/sources/constants.js
-@@ -87,8 +87,8 @@ exports.LICENSE_RESULT = {
-   NotBefore: 16
- };
- 
--exports.LICENSE_CONNECTIONS = 20;
--exports.LICENSE_USERS = 3;
-+exports.LICENSE_CONNECTIONS = 999999;
-+exports.LICENSE_USERS = 999999;
- exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
- 
- exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
-diff --git a/server/FileConverter/sources/convertermaster.js b/server/FileConverter/sources/convertermaster.js
-index 2209e8c9..feef6247 100644
---- a/server/FileConverter/sources/convertermaster.js
-+++ b/server/FileConverter/sources/convertermaster.js
-@@ -90,7 +90,7 @@ if (cluster.isMaster) {
- 
-   updateLicense();
- 
--  fs.watchFile(cfgLicenseFile, updateLicense);
-+  // fs.watchFile(cfgLicenseFile, updateLicense);
-   setInterval(updateLicense, 86400000);
- } else {
-   const converter = require('./converter');
-diff --git a/server/Common/sources/license.js b/server/Common/sources/license.js
-index d43ee210..9e787b08 100644
---- a/server/Common/sources/license.js
-+++ b/server/Common/sources/license.js
-@@ -44,24 +44,24 @@ exports.readLicense = async function () {
- 	return [{
- 		count: 1,
- 		type: c_LR.Success,
--		packageType: constants.PACKAGE_TYPE_OS,
-+		packageType: constants.PACKAGE_TYPE_I,
- 		mode: constants.LICENSE_MODE.None,
--		branding: false,
-+		branding: true,
- 		connections: constants.LICENSE_CONNECTIONS,
- 		connectionsView: constants.LICENSE_CONNECTIONS,
--		customization: false,
--		advancedApi: false,
--		usersCount: 0,
--		usersViewCount: 0,
-+		customization: true,
-+		advancedApi: true,
-+		usersCount: constants.LICENSE_CONNECTIONS,
-+		usersViewCount: constants.LICENSE_CONNECTIONS,
- 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
--		hasLicense: false,
-+		hasLicense: true,
- 		buildDate: oBuildDate,
- 		startDate: startDate,
--		endDate: null,
-+		endDate: new Date("2099-01-01T23:59:59.000Z"),
- 		customerId: "",
--		alias: "",
-+		alias: "community",
- 		multitenancy: false
- 	}, null];
- };
- 
--exports.packageType = constants.PACKAGE_TYPE_OS;
-+exports.packageType = constants.PACKAGE_TYPE_I;