pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch hotfix/v9.2.1 into master

Browse Source
This commit is contained in:
papacarlo
2025-12-25 10:58:41 +00:00
parent 23a4454ebf 30c87ab129
commit f77df80f00
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win-linux/package/linux/Makefile
View File

@ -317,7 +317,7 @@ deb/build/package.config :
mkdir -p $(@D) && echo "package = deb" > $@ mkdir -p $(@D) && echo "package = deb" > $@
$(DEB) : build $(DEB_DEPS) $(DEB) : build $(DEB_DEPS)
cd deb/build && dpkg-buildpackage -b -uc -us cd deb/build && dpkg-buildpackage -b -uc -us -a$(DEB_ARCH)
$(RPM_SUSE) : build rpm-suse/$(PACKAGE_NAME).spec $(RPM_SUSE) : build rpm-suse/$(PACKAGE_NAME).spec
cd rpm-suse && rpmbuild -bb \ cd rpm-suse && rpmbuild -bb \

2
win-linux/package/windows/utils.iss
View File

@ -88,7 +88,7 @@ begin
upgradecode := '{DC9BAE42-810B-423A-9E25-E4073F1C7B00}'; //arm64 upgradecode := '{DC9BAE42-810B-423A-9E25-E4073F1C7B00}'; //arm64
Result := msiproductupgrade(upgradecode, '14.0.0.0'); Result := msiproductupgrade(upgradecode, '14.32.31332.0');
#else #else
#ifndef _WIN_XP #ifndef _WIN_XP

6
win-linux/src/prop/cmainwindowimpl.cpp
View File

@ -112,6 +112,12 @@ void CMainWindowImpl::refreshAboutVersion()
# elif defined(_M_IX86) # elif defined(_M_IX86)
_json_obj["arch"] = "x86"; _json_obj["arch"] = "x86";
# endif # endif
#else
# if defined(__aarch64__)
_json_obj["arch"] = "arm64";
# elif defined(__x86_64__)
_json_obj["arch"] = "x64";
# endif
#endif #endif
_json_obj["edition"] = _license; _json_obj["edition"] = _license;