Update to 4.0.10665

2 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb47b1d2be2c..eee3bae335c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gog-heroes-of-might-and-magic-3-complete-edition
-	pkgdesc = Heroes of Might & Magic III and its expansions: Armageddon's Blade and The Shadow of Death (with HD patch)
-	pkgver = 2.0.1.17
-	pkgrel = 6
+	pkgdesc = Heroes of Might & Magic III and its expansions: Armageddon's Blade and The Shadow of Death (with optional HD patch)
+	pkgver = 4.0.10665
+	pkgrel = 1
 	url = https://www.gog.com/game/heroes_of_might_and_magic_3_complete_edition
 	arch = i686
 	arch = x86_64
@@ -9,14 +9,12 @@ pkgbase = gog-heroes-of-might-and-magic-3-complete-edition
 	license = custom
 	makedepends = lgogdownloader>=2.25
 	depends = wine
-	source = setup_homm3_complete_2.0.0.16.exe::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1installer1
-	source = patch_heroes_of_might_and_magic_3_complete_2.0.1.17.exe::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1patch1
+	source = setup_homm3_complete_4.0.10665.exe::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1installer0
 	source = gog-heroes-of-might-and-magic-3-complete-edition
 	source = gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor
 	source = gog-heroes-of-might-and-magic-3-complete-edition-map-editor
 	source = gog-heroes-of-might-and-magic-3-complete-edition.install
-	sha256sums = d90bed0fd7e5338045f5f9983fdc7390297025ac1accdbc2f9bbec217a066468
-	sha256sums = 9c6ca90dacc621f0bb333a3f5fb6df8b06af2afee571beea14782c989177ff5a
+	sha256sums = 36ec54b5c8b5612f71ca1066c372dc33efbb39485efffe91dea55b73b6e6335b
 	sha256sums = bb1cec5ef9de917ae69bb04d661d843986b038a277871557387cd66c7292604d
 	sha256sums = 2165809683969955bca129f1960efa5111aaa703ac891df29b809f4ce5b30eaa
 	sha256sums = 5265ae79418a0c376d2f98cc52c5fc2ed34af802080e00c229754efe9f8e91d6
diff --git a/PKGBUILD b/PKGBUILD
index 08ef483b65b1..75fc65359cc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,23 @@
 pkgname=gog-heroes-of-might-and-magic-3-complete-edition
-pkgver=2.0.1.17
-pkgrel=6
+pkgver=4.0.10665
+pkgrel=1
 _gamename=${pkgname#gog-}
 _gamename=${_gamename//-/_}
-_unpatchedver=2.0.0.16
 _gamehdpatchname="HoMM3%20HD%20Latest.exe"
 
-pkgdesc="Heroes of Might & Magic III and its expansions: Armageddon's Blade and The Shadow of Death (with HD patch)"
+pkgdesc="Heroes of Might & Magic III and its expansions: Armageddon's Blade and The Shadow of Death (with optional HD patch)"
 arch=("i686" "x86_64")
 url="https://www.gog.com/game/heroes_of_might_and_magic_3_complete_edition"
 license=("custom")
 groups=("games")
 
-source=("setup_homm3_complete_${_unpatchedver}.exe::gogdownloader://${_gamename}/en1installer1"
-        "patch_${_gamename%_edition}_${pkgver}.exe::gogdownloader://${_gamename}/en1patch1"
-#        "http://h3hota.com/HD/HoMM3%20HD%20Latest.exe"
+source=("setup_homm3_complete_${pkgver}.exe::gogdownloader://${_gamename}/en1installer0"
+        #"http://h3hota.com/HD/HoMM3%20HD%20Latest.exe"
         "${pkgname}"
         "${pkgname}-campaign-editor"
         "${pkgname}-map-editor"
         "${pkgname}.install")
-sha256sums=('d90bed0fd7e5338045f5f9983fdc7390297025ac1accdbc2f9bbec217a066468'
-            '9c6ca90dacc621f0bb333a3f5fb6df8b06af2afee571beea14782c989177ff5a'
+sha256sums=('36ec54b5c8b5612f71ca1066c372dc33efbb39485efffe91dea55b73b6e6335b'
 #            'SKIP'
             'bb1cec5ef9de917ae69bb04d661d843986b038a277871557387cd66c7292604d'
             '2165809683969955bca129f1960efa5111aaa703ac891df29b809f4ce5b30eaa'
@@ -39,17 +36,15 @@ build() {
   export XDG_DATA_HOME="$srcdir"/tmp/local
 
   install -m755 -d "$srcdir"/tmp "$srcdir"/tmp/env "$srcdir"/tmp/local
-  msg "Running GOG installer"
-  wine "$srcdir"/setup_homm3_complete_${_unpatchedver}.exe /verysilent
-  # Unfortunately, /verysilent doesn't prevent the installation is successful
+  msg "Running GOG installer (Don't customize or launch game)"
+  wine "${srcdir}/setup_homm_3_complete_${pkgver}.exe"
+  # Unfortunately, /verysilent doesn't work
   # messagebox from showing up and blocking. Manual intervention is required
-  msg "Installing patches (don't launch game yet)"
-  wine "${srcdir}"/patch_${_gamename%_edition}_${pkgver}.exe /verysilent
 #  msg "Installing HD patch"
 #  wine "${srcdir}/${_gamehdpatchname}" /verysilent
   msg "Extracting HKEY_LOCAL_MACHINE registry"
   regedit -e ${srcdir}/local_machine.reg "HKEY_LOCAL_MACHINE\Software\New World Computing"
-  sed -i 's,C:\\\\GOG Games\\\\Heroes of Might and Magic 3 Complete,Z:\\\\opt\\\\gog\\\\heroes-of-might-and-magic-3-complete-edition,g' local_machine.reg
+  sed -i 's,C:\\\\GOG Games\\\\homm 3 complete,Z:\\\\opt\\\\gog\\\\homm 3 complete,g' local_machine.reg
 }
 
 package() {
@@ -57,12 +52,12 @@ package() {
   install -Dm644 ${srcdir}/local_machine.reg ${pkgdir}/usr/share/${pkgname}/local_machine.reg
 
   # Install license
-  install -Dm644 "${srcdir}/tmp/env/drive_c/GOG Games/Heroes of Might and Magic 3 Complete/EULA.txt" "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 "${srcdir}/tmp/env/drive_c/GOG Games/homm 3 complete/EULA.txt" "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 
   # Install game
   install -m755 -d "${pkgdir}"/opt/gog/
   # mv instead of cp to save disk space
-  mv "${srcdir}/tmp/env/drive_c/GOG Games/Heroes of Might and Magic 3 Complete" ${pkgdir}/opt/gog/${pkgname#gog-}
+  mv "${srcdir}/tmp/env/drive_c/GOG Games/homm 3 complete" ${pkgdir}/opt/gog/${pkgname#gog-}
   # Remove unneeded files
   rm -rf ${pkgdir}/opt/gog/${pkgname#gog-}/unins*
   rm -rf ${pkgdir}/opt/gog/${pkgname#gog-}/*.lnk
@@ -79,16 +74,16 @@ package() {
   
   # Install .desktop file and icons
   install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Heroes of Might and Magic 3 Complete.desktop" ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Heroes 3 Map Editor.desktop"                  ${pkgdir}/usr/share/applications/${pkgname}-map-editor.desktop
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Heroes 3 Campaign Editor.desktop"             ${pkgdir}/usr/share/applications/${pkgname}-campaign-editor.desktop
+  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Tools/Map Editor.desktop"                  ${pkgdir}/usr/share/applications/${pkgname}-map-editor.desktop
+  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Tools/Campaign Editor.desktop"             ${pkgdir}/usr/share/applications/${pkgname}-campaign-editor.desktop
   for res in 16 32 48 256
   do
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/3679_gfw_high.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png
+    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/303B_goggame-1207658787.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png
   done
   for res in 16 32 48 64
   do
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/0500_h3maped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-map-editor.png
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/472F_h3ccmped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-campaign-editor.png
+    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/E15D_h3maped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-map-editor.png
+    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/BE0A_h3ccmped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-campaign-editor.png
   done
   # Edit out wine jumbled entries from .desktop file
   for file in ${pkgname} ${pkgname}-map-editor ${pkgname}-campaign-editor