new gog installer version

9 files changed, 78 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10a1d78d7605..85b32a4f40e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,33 @@
 pkgbase = simcity-2000-gog
 	pkgdesc = Now you can design any city you can imagine and SimCity 2000 will bring it, and its resident Sims, to life.
-	pkgver = 2.0.0.15
+	pkgver = 1.0se
 	pkgrel = 1
 	url = https://www.gog.com/game/simcity_2000_special_edition
 	install = simcity-2000-gog.install
 	arch = any
 	groups = games
 	license = custom:eula
-	makedepends = innoextract
+	makedepends = innoextract-git
 	makedepends = icoutils
 	depends = dosbox
 	optdepends = unionfs-fuse: mounting game folder to home for savegames and settings
-	source = setup_sc2000_se_2.0.0.15.exe::gogdownloader://simcity_2000_special_edition/installer_win_en
+	source = setup_simcity_2000_special_edition_1.0se_(28187).exe::gogdownloader://simcity_2000_special_edition/installer_win_en
 	source = simcity-2000-gog.desktop
 	source = simcity-2000-gog.sh
+	source = dosboxsc2000_single.conf
+	source = dosboxsc2000_scurk.conf
+	source = dosboxsc2000_willtv.conf
+	source = dosboxsc2000_settings.conf
 	source = dosbox_windowed.conf
-	source = fix-dosbox-output.patch
-	source = fix-dosbox-mounts.patch
 	source = fix-permissions.sh
-	sha256sums = ae31e0600be24e23d0605ad5c8b002d7b4770a52e6e7f3b9e164c57edaa2740c
+	sha256sums = 794b9e2e9eb242f99d4a107c7b474b3069506d9ebb5e438d8531eb9193bafdd2
 	sha256sums = 471482788dbfe607758a13e338241c39f8e8af1efa37d8d4f17310ded2374707
-	sha256sums = 87aaf64369ff565df3ff5f72fdfc4a3ca4209cfa0ba21d7d9ed0d43e7bce0d4c
+	sha256sums = 5364a8fc69aecf2fb1980b8f1cd988ad0bbd1c31000e78842210eef28c94612d
+	sha256sums = 9a0b89a2bf114caea1d90a4c57e6e2b2558764c1bc1d84d915d10d853cef733a
+	sha256sums = 487ddedcc8fe98975250cf2436676d227e87bc582611250beec716865f2846bb
+	sha256sums = ec412cfaa82a392a68ab64c288495fca35e51b83fa5224ad977f5dbdf4577da4
+	sha256sums = cacee617487281f6c998924316735f12890780f208916689f955b4aa5fa42949
 	sha256sums = 50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578
-	sha256sums = f9e3d53e0d1098fef7ffbc488158ac32a5b2a4e9ff97fa0e54c99b14c24a1a59
-	sha256sums = 21f2ef32bb3c766329954dd7438a33c1afe48bd09a2d5644270240c415b1dca7
 	sha256sums = 29dbb68855c778d664f603bca889f7b156acaeed7a39f50bf35a60f13d6d0e12
 
 pkgname = simcity-2000-gog
diff --git a/PKGBUILD b/PKGBUILD
index 69fa64bf7953..24150cbd78ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,36 @@
 # Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
 
 pkgname=simcity-2000-gog
-pkgver=2.0.0.15
+pkgver=1.0se
 pkgrel=1
 pkgdesc="Now you can design any city you can imagine and SimCity 2000 will bring it, and its resident Sims, to life."
 url="https://www.gog.com/game/simcity_2000_special_edition"
 license=('custom:eula')
 groups=('games')
 arch=('any')
-makedepends=('innoextract' 'icoutils')
+makedepends=('innoextract-git' 'icoutils')
 depends=('dosbox')
 optdepends=('unionfs-fuse: mounting game folder to home for savegames and settings')
 install=$pkgname.install
 
-source=("setup_sc2000_se_$pkgver.exe"::"gogdownloader://simcity_2000_special_edition/installer_win_en"
+source=("setup_simcity_2000_special_edition_${pkgver}_(28187).exe"::"gogdownloader://simcity_2000_special_edition/installer_win_en"
         "simcity-2000-gog.desktop"
         "simcity-2000-gog.sh"
+        "dosboxsc2000_single.conf"
+        "dosboxsc2000_scurk.conf"
+        "dosboxsc2000_willtv.conf"
+        "dosboxsc2000_settings.conf"
         "dosbox_windowed.conf"
-        "fix-dosbox-output.patch"
-        "fix-dosbox-mounts.patch"
         "fix-permissions.sh")
 
-sha256sums=('ae31e0600be24e23d0605ad5c8b002d7b4770a52e6e7f3b9e164c57edaa2740c'
+sha256sums=('794b9e2e9eb242f99d4a107c7b474b3069506d9ebb5e438d8531eb9193bafdd2'
             '471482788dbfe607758a13e338241c39f8e8af1efa37d8d4f17310ded2374707'
-            '87aaf64369ff565df3ff5f72fdfc4a3ca4209cfa0ba21d7d9ed0d43e7bce0d4c'
+            '5364a8fc69aecf2fb1980b8f1cd988ad0bbd1c31000e78842210eef28c94612d'
+            '9a0b89a2bf114caea1d90a4c57e6e2b2558764c1bc1d84d915d10d853cef733a'
+            '487ddedcc8fe98975250cf2436676d227e87bc582611250beec716865f2846bb'
+            'ec412cfaa82a392a68ab64c288495fca35e51b83fa5224ad977f5dbdf4577da4'
+            'cacee617487281f6c998924316735f12890780f208916689f955b4aa5fa42949'
             '50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
-            'f9e3d53e0d1098fef7ffbc488158ac32a5b2a4e9ff97fa0e54c99b14c24a1a59'
-            '21f2ef32bb3c766329954dd7438a33c1afe48bd09a2d5644270240c415b1dca7'
             '29dbb68855c778d664f603bca889f7b156acaeed7a39f50bf35a60f13d6d0e12')
 
 # You need to download the gog.com installer file to this directory ($PWD),
@@ -38,34 +42,36 @@ DLAGENTS+=('gogdownloader::/usr/bin/awk BEGIN{print"Please\ download\ the\ file\
 
 prepare() {
     # extract installer (convert files to lowercase, as DOS does not care)
-    innoextract -e -L -d "$srcdir" setup_sc2000_se_$pkgver.exe
+    innoextract -e -L -d "$srcdir"/setup "setup_simcity_2000_special_edition_${pkgver}_(28187).exe"
     # convert icon
-    icotool -x app/gfw_high.ico
+    icotool -x setup/goggame-1207658969.ico
     # create launchers
     for _m in scurk settings; do
         sed "s|Exec=simcity-2000|& --$_m|;s|Name=Simcity 2000|& (${_m^})|" \
                     $pkgname.desktop > simcity-2000-$_m.desktop
     done
+
+    cp setup/__support/app/dosboxsc2000.conf "$srcdir"
+    cp setup/tmp/eula.txt "$srcdir"
+
     # remove bundled dosbox, windows stuff and gog client files
-    rm -rf app/{dosbox/,*.ico,*.dll,*.zip,__support}
-    # fix dosbox output
-    patch -p1 -i "$srcdir"/fix-dosbox-output.patch
-    # fix dosbox mounts
-    patch -p1 -i "$srcdir"/fix-dosbox-mounts.patch
+    rm -rf setup/{app/,commonappdata/,dosbox/,tmp/,goggame-*,*.ico,*.dll,*.zip,__redist,__support}
 }
 
 package() {
     # data
     install -d "$pkgdir"/opt/simcity-2000
-    cp -r app/* "$pkgdir"/opt/simcity-2000
+    cp -r setup/* "$pkgdir"/opt/simcity-2000
     # fix permissions script
     install -Dm755 fix-permissions.sh "$pkgdir"/opt/simcity-2000
+    # dosbox config
+    install -m644 dosboxsc2000*.conf "$pkgdir"/opt/simcity-2000
     # additional dosbox config
     install -m644 dosbox_windowed.conf "$pkgdir"/opt/simcity-2000
     # doc + licenses
     install -d "$pkgdir"/usr/share/{doc,licenses}/$pkgname
     ln -s -t "$pkgdir"/usr/share/doc/$pkgname /opt/simcity-2000/{manual.pdf,readme.txt}
-    install -m644 tmp/{gog_,}eula.txt "$pkgdir"/usr/share/licenses/$pkgname
+    install -m644 eula.txt "$pkgdir"/usr/share/licenses/$pkgname
     # .desktop files and launchers
     install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/simcity-2000.desktop
     install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/simcity-2000
@@ -73,5 +79,5 @@ package() {
         install -m644 simcity-2000-$_m.desktop "$pkgdir"/usr/share/applications
     done
     # icon
-    install -Dm644 gfw_high_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/simcity-2000.png
+    install -Dm644 goggame-1207658969_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/simcity-2000.png
 }
diff --git a/dosboxsc2000_scurk.conf b/dosboxsc2000_scurk.conf
new file mode 100644
index 000000000000..63f14286d657
--- /dev/null
+++ b/dosboxsc2000_scurk.conf
@@ -0,0 +1,8 @@
+[autoexec]
+@echo off
+mount C "."
+imgmount d "sc2000se.dat" -t iso -fs iso
+c:
+cls
+scurk
+exit
diff --git a/dosboxsc2000_settings.conf b/dosboxsc2000_settings.conf
new file mode 100644
index 000000000000..ea85f0cb73cb
--- /dev/null
+++ b/dosboxsc2000_settings.conf
@@ -0,0 +1,8 @@
+[autoexec]
+@echo off
+mount C "."
+imgmount d "sc2000se.dat" -t iso -fs iso
+c:
+cls
+call install
+exit
diff --git a/dosboxsc2000_single.conf b/dosboxsc2000_single.conf
new file mode 100644
index 000000000000..0f9a863d9796
--- /dev/null
+++ b/dosboxsc2000_single.conf
@@ -0,0 +1,10 @@
+[autoexec]
+@echo off
+mount C "."
+imgmount d "sc2000se.dat" -t iso -fs iso
+c:
+cls
+
+intro
+loadfix -1 sc2k %1
+exit
diff --git a/dosboxsc2000_willtv.conf b/dosboxsc2000_willtv.conf
new file mode 100644
index 000000000000..0f885911802d
--- /dev/null
+++ b/dosboxsc2000_willtv.conf
@@ -0,0 +1,8 @@
+[autoexec]
+@echo off
+mount C "."
+imgmount d "sc2000se.dat" -t iso -fs iso
+c:
+cls
+willtv
+exit
diff --git a/fix-dosbox-mounts.patch b/fix-dosbox-mounts.patch
deleted file mode 100644
index 41befbb333a6..000000000000
--- a/fix-dosbox-mounts.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/app/dosboxsc2000_addon.conf b/app/dosboxsc2000_addon.conf
---- a/app/dosboxsc2000_addon.conf
-+++ b/app/dosboxsc2000_addon.conf
-@@ -1,8 +1,8 @@
- [autoexec]

- # Lines in this section will be run at startup.

--mount C ".."

-+mount C "."

- @echo off

--imgmount d "..\SC2000SE.DAT" -t iso -fs iso

-+imgmount d "sc2000se.dat" -t iso -fs iso

- c:

- cls

- SCURK.COM

-diff --git a/app/dosboxsc2000_settings.conf b/app/dosboxsc2000_settings.conf
---- a/app/dosboxsc2000_settings.conf
-+++ b/app/dosboxsc2000_settings.conf
-@@ -1,8 +1,8 @@
- [autoexec]

- # Lines in this section will be run at startup.

- @echo off

--mount C ".."

--imgmount d "..\SC2000SE.DAT" -t iso -fs iso

-+mount C "."

-+imgmount d "sc2000se.dat" -t iso -fs iso

- c:

- cls

- call install.exe

-diff --git a/app/dosboxsc2000_single.conf b/app/dosboxsc2000_single.conf
---- a/app/dosboxsc2000_single.conf
-+++ b/app/dosboxsc2000_single.conf
-@@ -1,8 +1,8 @@
- [autoexec]

- # Lines in this section will be run at startup.

- @echo off

--mount C ".."

--imgmount d "..\SC2000SE.DAT" -t iso -fs iso

-+mount C "."

-+imgmount d "sc2000se.dat" -t iso -fs iso

- c:

- cls

- call SC2000.BAT

diff --git a/fix-dosbox-output.patch b/fix-dosbox-output.patch
deleted file mode 100644
index 62456a90402a..000000000000
--- a/fix-dosbox-output.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/app/dosboxsc2000.conf b/app/dosboxsc2000.conf
---- a/app/dosboxsc2000.conf
-+++ b/app/dosboxsc2000.conf
-@@ -19,7 +19,7 @@ fullscreen=true
- fulldouble=false

- fullresolution=original

- windowresolution=original

--output=ddraw

-+output=overlay

- autolock=true

- sensitivity=100

- waitonerror=true

diff --git a/simcity-2000-gog.sh b/simcity-2000-gog.sh
index 84ac5d5b175e..a89693acbdbd 100644
--- a/simcity-2000-gog.sh
+++ b/simcity-2000-gog.sh
@@ -9,6 +9,7 @@ cat <<EOF
                 --settings      Change settings
                 --addon         Start the addon Urban Renewal Kit
                 --scurk         Start the addon Urban Renewal Kit
+                --willtv        Start WillTV
     Examples:
 
     $script --windowed
@@ -29,7 +30,7 @@ fi
 
 script=${0##*/}
 
-TEMP=$(getopt -o h --long help,windowed,addon,settings,scurk \
+TEMP=$(getopt -o h --long help,windowed,addon,settings,scurk,willtv \
      -n "$script" -- "$@")
 
 if [ $? != 0 ] ; then exit 1 ; fi
@@ -42,6 +43,7 @@ while true; do
         --windowed) WINDOWED=1; shift ;;
         --settings) START_SETTINGS=1; WINDOWED=1; shift ;;
         --addon|--scurk) START_ADDON=1; shift ;;
+        --willtv) START_WILLTV=1; shift ;;
         --) shift; break ;;
     esac
 done
@@ -54,8 +56,10 @@ fi
 
 if [ "$START_SETTINGS" ]; then
     configs+=('-conf' 'dosboxsc2000_settings.conf')
+elif [ "$START_WILLTV" ] ; then
+    configs+=('-conf' 'dosboxsc2000_willtv.conf')
 elif [ "$START_ADDON" ] ; then
-    configs+=('-conf' 'dosboxsc2000_addon.conf')
+    configs+=('-conf' 'dosboxsc2000_scurk.conf')
 else
     configs+=('-conf' 'dosboxsc2000_single.conf')
 fi