i updated it, stop screaming

3 files changed, 47 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57e04c4fac3a..b48167bf56f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,12 @@
 pkgbase = myoffice-standard-home-edition-bin
 	pkgdesc = A set of office applications for creating text and spreadsheet documents. Home edition.
-	pkgver = 1.28.0.4
-	pkgrel = 2022.01
+	pkgver = 2.3.0
+	pkgrel = 1
 	url = https://myoffice.ru/products/standard-home-edition/
 	install = myoffice-standard-home-edition-bin.install
 	arch = x86_64
 	groups = myoffice
 	license = EULA
-	depends = abseil-cpp
-	depends = cuneiform
-	depends = curl
-	depends = expat
 	depends = fontconfig
 	depends = freetype2
 	depends = glib2
@@ -18,7 +14,7 @@ pkgbase = myoffice-standard-home-edition-bin
 	depends = krb5
 	depends = libcups
 	depends = libglvnd
-	depends = libpng12
+	depends = libpng
 	depends = libpulse
 	depends = libx11
 	depends = libxcb
@@ -26,22 +22,20 @@ pkgbase = myoffice-standard-home-edition-bin
 	depends = libxkbcommon
 	depends = libxkbcommon-x11
 	depends = libxrender
-	depends = libzip
 	depends = link-grammar
 	depends = lua
 	depends = mono
-	depends = openssl
+	depends = openssl-1.1
+	depends = pcre2
 	depends = pixman
 	depends = qt5-base
 	depends = qt5-multimedia
 	depends = qt5-svg
-	depends = tidy
-	depends = xalan-c
-	depends = xerces-c
 	depends = zlib
+	depends = bc
 	options = !strip
 	options = !emptydirs
-	source_x86_64 = https://preset.myoffice-app.ru/myoffice-standard-home-edition_2022.01-1.28.0.4_amd64.deb
-	sha512sums_x86_64 = 649ba6ab13ec37be835ab83474ccff8d9991ca49ca17b8344011a8b9ce01891ba782bac5012a78e15ca340b8e2233e53c2eb478977c9adc946efc35a13122195
+	source_x86_64 = 
+	sha512sums_x86_64 = 5535337e271e70c5f1acc06d309232e16da105b6a8e37192ed72803dd5608b048ff8e13528cf5ae8efb2c8c919db1143841cf72dc12a46e300685b5cb4ba6c8e
 
 pkgname = myoffice-standard-home-edition-bin
diff --git a/PKGBUILD b/PKGBUILD
index fc65cda048cd..3c595f4b198d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,33 @@
 # Generated by debtap
 # Maintainer: TheK0tYaRa
-pkgname=myoffice-standard-home-edition-bin
-# The version doesn't matter as it always installs latest
-pkgver=1.28.0.4
-pkgrel=2022.01
+###
+#	${_my_pkg}_2.3.0_amd64.deb
+###
+_my_pkg=myoffice-standard-home-edition
+pkgname=${_my_pkg}-bin
+# The version shouldn't matter as it always installs latest. Except when the install script from debtap needs a version change.
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="A set of office applications for creating text and spreadsheet documents. Home edition."
 arch=('x86_64')
 url="https://myoffice.ru/products/standard-home-edition/"
 license=('EULA')
 groups=('myoffice')
-depends=('abseil-cpp' 'cuneiform' 'curl' 'expat' 'fontconfig' 'freetype2' 'glib2' 'hunspell' 'krb5'
-	'libcups' 'libglvnd' 'libpng12' 'libpulse' 'libx11' 'libxcb' 'libxext' 'libxkbcommon' 'libxkbcommon-x11'
-	'libxrender' 'libzip' 'link-grammar' 'lua' 'mono' 'openssl' 'pixman' 'qt5-base' 'qt5-multimedia'
-	'qt5-svg' 'tidy' 'xalan-c' 'xerces-c' 'zlib')
+depends=('fontconfig' 'freetype2' 'glib2' 'hunspell' 'krb5' 'libcups' 'libglvnd' 'libpng' 'libpulse'
+	'libx11' 'libxcb' 'libxext' 'libxkbcommon' 'libxkbcommon-x11' 'libxrender' 'link-grammar' 'lua'
+	'mono' 'openssl-1.1' 'pcre2' 'pixman' 'qt5-base' 'qt5-multimedia' 'qt5-svg' 'zlib' 'bc')
 options=('!strip' '!emptydirs')
 install=${pkgname}.install
-# source_i686=("PUT_FULL_URL_FOR_DOWNLOADING_i386_DEB_PACKAGE_HERE")
-source_x86_64=("$( echo $( curl -s 'https://myoffice.ru/products/standard-home-edition/' | grep '.deb' | sed 's/.\+<a href=\"\|\" .\+//g' ) | cut -d ' ' -f 1 )")
-# sha512sums_i686=('PUT_SHA512SUM_OF_i386_DEB_PACKAGE_HERE')
-sha512sums_x86_64=('649ba6ab13ec37be835ab83474ccff8d9991ca49ca17b8344011a8b9ce01891ba782bac5012a78e15ca340b8e2233e53c2eb478977c9adc946efc35a13122195')
+
+source_x86_64=("$( echo $( curl -s 'https://myoffice.ru/products/standard-home-edition/' | grep '_amd64.deb' | sed 's/.\+<a href=\"\|\" .\+//g' ) | cut -d ' ' -f 1 )")
+sha512sums_x86_64=('5535337e271e70c5f1acc06d309232e16da105b6a8e37192ed72803dd5608b048ff8e13528cf5ae8efb2c8c919db1143841cf72dc12a46e300685b5cb4ba6c8e')
+
 package(){
 	# Extract package data
 	tar xzf data.tar.gz -C "${pkgdir}"
 	# Fix directory structure differences
 	cd "${pkgdir}"
-	install -D -m644 "./usr/local/bin/myoffice-standard-home-edition/Resources/UI/tt/LicenseAgreements.rcc" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -D -m644 "usr/local/bin/myoffice-standard-home-edition/Resources/UI/tt/LicenseAgreements.rcc" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	mkdir usr/bin 2> /dev/null; mv usr/local/bin/* usr/bin; rm -rf usr/local/bin
 	rm -rf usr/local
 	cd ..
diff --git a/myoffice-standard-home-edition-bin.install b/myoffice-standard-home-edition-bin.install
index e152a7d75e4a..5ad20c0caf44 100644
--- a/myoffice-standard-home-edition-bin.install
+++ b/myoffice-standard-home-edition-bin.install
@@ -20,7 +20,7 @@ post_install() {
 	# The placeholder is overriden during the package configuration
 	SCRIPT_DIR="/usr/bin/myoffice-standard-home-edition"
 
-	source "${SCRIPT_DIR}/Common.1.28.0.sh"
+	source "${SCRIPT_DIR}/Common.2.3.0.sh"
 
 	# Initialize licensing - for linux create cache of HW ids, due to reading of them requires root access
 	createHardwareIdCache()
@@ -68,8 +68,29 @@ post_install() {
 	    registerAppMenu "${name}.desktop"
 	done
 
+	removeFromDefaults()
+	{
+	    local defaults_file=$(readlink -f "$1")
+
+	    if [ -w "${defaults_file}" ] ; then
+	        local tmp_defaults_file=$(mktemp "/tmp/defaults-XXXXXX.list")
+	        cp "${defaults_file}" "${tmp_defaults_file}"
+
+	        for name in "${APPS[@]}"; do
+	            sed -i "s/;*${name}.desktop//" "${tmp_defaults_file}"
+	        done
+	        sed -i "s/=;/=/" "${tmp_defaults_file}"
+
+	        grep -v "=$" "${tmp_defaults_file}" > "${defaults_file}" 2> /dev/null
+	        rm -f "${tmp_defaults_file}"
+	    fi
+	}
+
 	IFW_MENU_DEST_DIR=$(probe_menu_installation_path)
 
+	# remove apps from defaults (fix for EDESK-465)
+	removeFromDefaults "${IFW_MENU_DEST_DIR}/defaults.list"
+
 	# Registering our own mime types
 	if [[ "${ENABLE_MIME_REGISTRATION}" != "0" ]]; then
 	    xdg-mime install --mode system --novendor "${SCRIPT_DIR}/myoffice_mimes.xml" > /dev/null 2> /dev/null
@@ -328,7 +349,7 @@ pre_remove() {
 	SCRIPT_DIR="/usr/bin/myoffice-standard-home-edition"
 	CONFIG_DIR="New Cloud Technologies Ltd."
 
-	source "${SCRIPT_DIR}/Common.1.28.0.sh"
+	source "${SCRIPT_DIR}/Common.2.3.0.sh"
 
 	if [[ "${TAG}" == "upgrade" || "${TAG}" == "1" ]]; then
 	    echo "Skipping uninstall step..."