new gog installer version

1 files changed, 25 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e0cdf2c0f1c0..64bfbda3b014 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,40 @@
 # Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
 
 pkgname=dungeon-keeper-gold-gog
-pkgver=2.1.0.7
+pkgver=10.1
 pkgrel=1
 pkgdesc="Construct and manage a dungeon, recruiting and catering for minions to run it and defend it from enemy invaders."
 url="https://www.gog.com/game/dungeon_keeper"
 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_dungeon_keeper_gold_$pkgver.exe"::"gogdownloader://dungeon_keeper/installer_win_en"
+source=("setup_dungeon_keeper_gold_${pkgver}_(28184).exe"::"gogdownloader://dungeon_keeper/installer_win_en"
         "dungeon-keeper-gold-gog.sh"
         "dungeon-keeper-gold-gog.desktop"
+        "dosboxdk_single.conf"
+        "dosboxdk_addon.conf"
+        "dosboxdk_client.conf"
+        "dosboxdk_server.conf"
+        "dosboxdk_settings.conf"
         "dosbox_windowed.conf"
         "dosbox_ipx.conf"
-        "simple-net-config.patch"
-        "fix-dosbox-mounts.patch"
         "fix-permissions.sh")
 
-sha256sums=('d92ba5f824ce123b281fda9f103d80a0c00af8be06e3c565b596894053233f29'
+sha256sums=('7c108532b5f0549c8c265ffa6ae7744a6d0f785856434b90911fa8276b031004'
             'a7944e92e1109d5a741ac5147d9a82b911d5d67295d275e0db3bed076abc28fd'
             'bdbab0f3525b380d81cea61713009251da55a13c222ee4b4117afec12e90d4f9'
+            '06ae3f1330695dd990a32438f509a92960c4b4725bbeb1f29d8d155c6a50a722'
+            '98bba4add1533899b9f52ccb85f47e019b612234c1440e936d028dc39b185f9d'
+            '2fdfcf1543d1194bf88fb9064c3a8b3b83769c2d723220d4d637d4a60c1905b7'
+            'be5399a17a4769fe7c1fb66b25cef6ed8f0baff82d73233dcfb7d0f3a6c45ef4'
+            'f2f1742182bd7322f62c46e105172f9a634432a698309b58ed21961db02363c1'
             '50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
             'e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8'
-            '36f076e6e0aa21d51c98507e4036d30a93234c94dcb0f77752b7ce97caea4f0d'
-            '0031fe886d4f163f38ae7a3cdfbafd0b7c43045aa16e4b23b128d0656a83a645'
             'bbfa392edd4ac36e2c274d22b07bf2f9115e3f134b0b7c8b146538d2d0b36c2a')
 
 # You need to download the gog.com installer file to this directory ($PWD),
@@ -40,10 +46,10 @@ 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_dungeon_keeper_gold_$pkgver.exe
+    innoextract -e -L -d "$srcdir"/setup "setup_dungeon_keeper_gold_${pkgver}_(28184).exe"
     # convert icon
-    icotool -x app/goggame-1207658934.ico
-    icotool -x app/gfw_high_addon.ico
+    icotool -x setup/goggame-1207658934.ico
+    icotool -x setup/gfw_high_addon.ico
     # create launchers
     sed "s/Dungeon Keeper/Deeper Dungeons/;s/dungeon-keeper/deeper-dungeons/" \
             $pkgname.desktop > deeper-dungeons.desktop
@@ -51,27 +57,26 @@ prepare() {
         sed "s|Exec=dungeon-keeper|& --$_m|;s|Name=Dungeon Keeper|& (${_m^})|" \
                     $pkgname.desktop > dungeon-keeper-$_m.desktop
     done
+
+    cp setup/__support/app/dosboxdk.conf "$srcdir"
+    cp setup/tmp/eula.txt "$srcdir"
+
     # remove bundled dosbox, windows stuff and gog client files
-    rm -rf app/{dosbox/,*.ico,*.dll,goggame-1207658934.*,*.zip,__support}
-    # simplified net config for start script
-    patch -p1 -i "$srcdir"/simple-net-config.patch
-    # fix mount directory
-    patch -p1 -i "$srcdir"/fix-dosbox-mounts.patch
+    rm -rf setup/{app,commonappdata,dosbox,tmp,*.ico,*.dll,goggame-1207658934.*,*.zip,__redist,__support}
 }
 
 package() {
     # data
     install -d "$pkgdir"/opt/dungeon-keeper-gold
-    cp -r app/* "$pkgdir"/opt/dungeon-keeper-gold
+    cp -r setup/* "$pkgdir"/opt/dungeon-keeper-gold
     # fix permissions script
     install -Dm755 fix-permissions.sh "$pkgdir"/opt/dungeon-keeper-gold
     # additional dosbox config
-    install -m644 dosbox_windowed.conf "$pkgdir"/opt/dungeon-keeper-gold
-    install -m644 dosbox_ipx.conf "$pkgdir"/opt/dungeon-keeper-gold
+    install -m644 *.conf "$pkgdir"/opt/dungeon-keeper-gold
     # doc + licenses
     install -d "$pkgdir"/usr/share/{doc,licenses}/$pkgname
     ln -s -t "$pkgdir"/usr/share/doc/$pkgname /opt/dungeon-keeper-gold/manual.pdf
-    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/dungeon-keeper.desktop
     install -Dm644 deeper-dungeons.desktop "$pkgdir"/usr/share/applications/deeper-dungeons.desktop