update xdotool

3 files changed, 23 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60f58674c492..c8947aed0be2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = stm32cubeprog
 	pkgdesc = An all-in-one multi-OS software tool for programming STM32 products.
 	pkgver = 2.12.0
-	pkgrel = 0
+	pkgrel = 1
 	url = https://www.st.com/en/development-tools/stm32cubeprog.html
 	arch = x86_64
 	license = custom:SLA0048
 	makedepends = xdotool
-	makedepends = xorg-server-xvfb
 	makedepends = icoutils
 	makedepends = fontconfig
 	makedepends = gsfonts
@@ -17,6 +16,6 @@ pkgbase = stm32cubeprog
 	source = en.stm32cubeprg-lin-v2-12-0.zip::https://www.st.com/content/ccc/resource/technical/software/utility/group0/2c/71/de/d9/d5/2f/4f/4c/stm32cubeprg-lin-v2-12-0/files/stm32cubeprg-lin-v2-12-0.zip/jcr:content/translations/en.stm32cubeprg-lin-v2-12-0.zip
 	source = stm32cubeprog.xdotool
 	sha256sums = 239d222424ce8d6976e9800007e04db7ba96ff2148f96730b4dd1fdc6169b9a2
-	sha256sums = c66a87cd604128ed7732b760c5efd334538f0e832b17491ad1fd34c46084b3e5
+	sha256sums = 7896311cf3f4a49cafcd541d188543760ea0289bc327f183d5d38321b93db93b
 
 pkgname = stm32cubeprog
diff --git a/PKGBUILD b/PKGBUILD
index f06d4f63c8e4..83861c1d3daa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=stm32cubeprog
 _pkgname="STM32CubeProgrammer"
 pkgver=2.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="An all-in-one multi-OS software tool for programming STM32 products."
 arch=('x86_64')
 url="https://www.st.com/en/development-tools/stm32cubeprog.html"
@@ -26,7 +26,7 @@ license=('custom:SLA0048')
 depends=('stlink'
          'libusb')
 makedepends=('xdotool'
-             'xorg-server-xvfb'
+#              'xorg-server-xvfb'
              'icoutils'
              'fontconfig'
              'gsfonts')
@@ -39,7 +39,7 @@ _pkg_main_url_index="2c/71/de/d9/d5/2f/4f/4c"
 source=("en.${_pkg_main_name}.zip::https://www.st.com/content/ccc/resource/technical/software/utility/group0/${_pkg_main_url_index}/${_pkg_main_name}/files/${_pkg_main_name}.zip/jcr:content/translations/en.${_pkg_main_name}.zip"
         "${pkgname}.xdotool")
 sha256sums=('239d222424ce8d6976e9800007e04db7ba96ff2148f96730b4dd1fdc6169b9a2'
-            'c66a87cd604128ed7732b760c5efd334538f0e832b17491ad1fd34c46084b3e5')
+            '7896311cf3f4a49cafcd541d188543760ea0289bc327f183d5d38321b93db93b')
 
 prepare() {
   cat > ${pkgname}.xvfb <<END
@@ -62,7 +62,8 @@ build() {
   mkdir -p build
 
   # use xvfb-run and xdotool to cheat the Installer
-  xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -w 5 ./${pkgname}.xvfb
+#   xvfb-run --auto-servernum --server-args="-screen 0, 1920x1080x24" -w 5 ./${pkgname}.xvfb
+  ./${pkgname}.xvfb
 
   # convert ico to icon
   mkdir -p icon
diff --git a/stm32cubeprog.xdotool b/stm32cubeprog.xdotool
index 3010b2d20654..a4b896dc66db 100644
--- a/stm32cubeprog.xdotool
+++ b/stm32cubeprog.xdotool
@@ -9,7 +9,6 @@ mousemove 1456 992 click 1
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
 mousemove 1456 992 click 1 
 
-
 # Accept License agreement
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
 mousemove 1122 912 click 1 
@@ -18,13 +17,24 @@ mousemove 1122 912 click 1
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
 mousemove 1456 992 click  1 
 
+# Click ST Privacy and Terams of Use
+search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus -sync
+mousemove 1122 650 click  1
+mousemove 1122 680 click  1
+
+# Click Next
+search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync
+mousemove 1456 992 click  1
+
 # Set Path of Installation
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus -sync 
-mousemove 1531 650 click  1 
+mousemove 1540 670 click  1
+
 # input the path of pkgdir
 type $1
 
-mousemove 1482 781 click  1
+# Click Save
+mousemove 1482 820 click  1
 
 # Click Next
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
@@ -39,7 +49,7 @@ mousemove 1322 806 click  1
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
 mousemove 1456 992 click  1 
 
-sleep 20
+sleep 25
 
 # Click Next
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
@@ -51,12 +61,12 @@ mousemove 1181 683 click  1
 
 # Cancel Create additional shortcus on the desktop
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
-mousemove 1181 705 click  1 
+mousemove 1181 710 click  1
 
 # Click Next
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
 mousemove 1456 992 click  1 
 
-# Click Next
+# Click Done
 search --name "STM32CubeProgrammer Installation Wizard" windowmove --sync 960 540   windowfocus --sync 
 mousemove 1542 989 click  1