force WINEARCH=win32

Signed-off-by: Oleksandr Natalenko <oleksandr@redhat.com>

2 files changed, 18 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 723167a8ed7b..b72a8ec997cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Oleksandr Natalenko <oleksandr@natalenko.name>
 pkgname=microsip
 pkgver=3.19.29
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source portable SIP softphone for Windows based on PJSIP stack"
 arch=(x86_64)
 url="https://www.microsip.org/"
@@ -16,7 +16,7 @@ source=("MicroSIP-Lite-${pkgver}.zip"::"https://www.microsip.org/downloads/?file
 		"${pkgname}.reg")
 
 sha256sums=('bd9a2669f493c1f510d7a6153a072115c9d2571f441395239895c6d6535a9a55'
-            'e909ea376443dab9824f1efe7f838fe63833526c51a694c010c868e371a97ea4'
+            'f35b60d2da37bb7d7a8a224eb8a392680824078179629d75c4f3efd3b0693980'
             'd588c2b2e38e12d2be3dfdd9f2a63690293b884c7df240c441e271725b9a2ca2'
             '4d33d040f772c4b1f1652b8af59342bdec600fd3de875e7ef6ee1a43fc3415cf'
             'c97cde99004dbee5cb9b05a7b6bad117e5ec63cb1032fa56efdf07a4b27e3c1d')
diff --git a/microsip b/microsip
index 15cb73d0f2ab..500c5bf7e63d 100755
--- a/microsip
+++ b/microsip
@@ -3,6 +3,7 @@
 __REV=3
 __APPNAME=$(basename $0)
 __WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local}/wine/${__APPNAME}"
+__WINEARCH="win32"
 __APPDIR="${__WINEPREFIX}/dosdevices/c:/${__APPNAME}"
 __INSTALLED="${__APPDIR}/.installed.${__REV}"
 __APPCFG="${XDG_CONFIG_HOME:-$HOME/.config}/${__APPNAME}"
@@ -12,13 +13,20 @@ __TMPREGFILE=$(mktemp)
 __DPI=$(xdpyinfo -display $DISPLAY | grep -A 2 "screen #0:" | grep "resolution:" | grep -oE '[0-9]+x[0-9]+' | cut -d 'x' -f 1)
 __DPIX=$(printf %08x ${__DPI})
 
+# force 32-bit prefix
+__QUIRK1="${__APPDIR}/.quirk.1"
+
 __symlink() {
 	ln -sf "$1" "${__APPDIR}/${1##*/}"
 }
 
+if [[ -d "${__WINEPREFIX}" ]] && [[ ! -f "${__QUIRK1}" ]]; then
+	rm -rf "${__WINEPREFIX}"
+fi
+
 if [[ ! -f "${__INSTALLED}" ]]; then
 	mkdir -p "${__WINEPREFIX}"
-	WINEPREFIX="${__WINEPREFIX}" wineboot -u
+	WINEPREFIX="${__WINEPREFIX}" WINEARCH="${__WINEARCH}" wineboot -u
 
 	mkdir -p "${__APPDIR}"
 
@@ -26,7 +34,7 @@ if [[ ! -f "${__INSTALLED}" ]]; then
 	sed -i "s/{DPI}/${__DPIX}/g" "${__TMPREGFILE}"
 	iconv -f utf-8 -t utf-16le "${__TMPREGFILE}" >"${__REGFILE}"
 	rm -f "${__TMPREGFILE}"
-	WINEPREFIX="${__WINEPREFIX}" regedit "${__REGFILE}"
+	WINEPREFIX="${__WINEPREFIX}" WINEARCH="${__WINEARCH}" regedit "${__REGFILE}"
 	rm -f "${__REGFILE}"
 
 	__symlink "/usr/share/licenses/${__APPNAME}/License.txt"
@@ -53,5 +61,10 @@ if [[ ! -f "${__INSTALLED}" ]]; then
 	touch "${__INSTALLED}"
 fi
 
-WINEPREFIX="${__WINEPREFIX}" wine "${__APPDIR}/microsip.exe"
+if [[ ! -f "${__QUIRK1}" ]]; then
+	touch "${__QUIRK1}"
+fi
+
+
+WINEPREFIX="${__WINEPREFIX}" WINEARCH="${__WINEARCH}" wine "${__APPDIR}/microsip.exe"