new gog installer version

author: Constantin Nickel 2019-05-24 04:56:44 +0200
committer: Constantin Nickel 2019-05-24 04:56:44 +0200
commit: 56ed2613a909f5d4259c5a67acd3acfc2252b42f (patch)
tree: 965611e6712652bc653feef8926f940509993a64
parent: 1c0cc9a06aa01d35ec02107e0b0cd2d369cbabb7 (diff)
download: aur-56ed2613a909f5d4259c5a67acd3acfc2252b42f.tar.gz
8 files changed, 69 insertions, 128 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1aed927fe099..246cc7d01c7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,35 @@
 pkgbase = jagged-alliance-deadly-games-gog
 	pkgdesc = A turn-based tactics game developed as a sequel of Jagged Alliance and features new missions and a multiplayer mode.
-	pkgver = 2.0.0.2
+	pkgver = 1.13
 	pkgrel = 1
 	url = https://www.gog.com/game/jagged_alliance_deadly_games
 	install = jagged-alliance-deadly-games-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_ja_dg_2.0.0.2.exe::gogdownloader://jagged_alliance_deadly_games/installer_win_en
+	source = setup_jagged_alliance_-_deadly_games_1.13_(28044).exe::gogdownloader://jagged_alliance_deadly_games/installer_win_en
 	source = jagged-alliance-deadly-games-gog.sh
 	source = jagged-alliance-deadly-games-gog.desktop
+	source = dosboxjadg_single.conf
+	source = dosboxjadg_client.conf
+	source = dosboxjadg_server.conf
+	source = dosboxjadg_settings.conf
 	source = dosbox_windowed.conf
 	source = dosbox_ipx.conf
-	source = simple-net-config.patch
-	source = fix-dosbox-mounts.patch
 	source = fix-permissions.sh
-	sha256sums = ba1cbc5f037f4e39b5cc4f89952f3995843cc3c34073eb6207537a286f0dec51
+	sha256sums = 9a0ea3c3eaacefdfe8a85e3fb29e6e5377e0d667143a4ca68ca8fea9b1d946f7
 	sha256sums = c82f0f84ff1af66da90182e11c3ce39c2b32ff8d8eb52d4a8b98073e52b92a9a
 	sha256sums = a036530c481cb7763ed778366d046636ca1695f8da1d518e98a72a4f86b4dc14
+	sha256sums = 39bc6cb3a8dedb823bc2a789984d74773fcf684dff1a82b839007a4aac3d8926
+	sha256sums = c7cfa75590d3845f7c8fc05098e34f4a5a7183a755199dfbeb9c695aeef63ec1
+	sha256sums = d9bf5991403007f2c5bfe008b10cf5895c43558c4f4ed442b0c7caa638c1540a
+	sha256sums = 5e38bfa13dc57bc8c6bc9ff28f7b2268ea043f918dc247aba89daad29e78f665
 	sha256sums = 50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578
 	sha256sums = e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8
-	sha256sums = fa78eb7a3cf09896d011bcf06ca509661db281151b5c1f54c28713f874fc6880
-	sha256sums = fd647a02d2d6894e5998d141281b269a6fd51fe0fd60774109f47d5feb7eed18
 	sha256sums = 5bd5ad321e40676448871190cfe55294279c3bf0703e71e97a28c138ebe44937
 
 pkgname = jagged-alliance-deadly-games-gog
diff --git a/PKGBUILD b/PKGBUILD
index 152883ffcf5c..6b4b8ae67c4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,38 @@
 # Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
 
 pkgname=jagged-alliance-deadly-games-gog
-pkgver=2.0.0.2
+pkgver=1.13
 pkgrel=1
 pkgdesc="A turn-based tactics game developed as a sequel of Jagged Alliance and features new missions and a multiplayer mode."
 url="https://www.gog.com/game/jagged_alliance_deadly_games"
 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_ja_dg_$pkgver.exe"::"gogdownloader://jagged_alliance_deadly_games/installer_win_en"
+source=("setup_jagged_alliance_-_deadly_games_${pkgver}_(28044).exe"::"gogdownloader://jagged_alliance_deadly_games/installer_win_en"
         "jagged-alliance-deadly-games-gog.sh"
         "jagged-alliance-deadly-games-gog.desktop"
+        "dosboxjadg_single.conf"
+        "dosboxjadg_client.conf"
+        "dosboxjadg_server.conf"
+        "dosboxjadg_settings.conf"
         "dosbox_windowed.conf"
         "dosbox_ipx.conf"
-        "simple-net-config.patch"
-        "fix-dosbox-mounts.patch"
         "fix-permissions.sh")
 
-sha256sums=('ba1cbc5f037f4e39b5cc4f89952f3995843cc3c34073eb6207537a286f0dec51'
+sha256sums=('9a0ea3c3eaacefdfe8a85e3fb29e6e5377e0d667143a4ca68ca8fea9b1d946f7'
             'c82f0f84ff1af66da90182e11c3ce39c2b32ff8d8eb52d4a8b98073e52b92a9a'
             'a036530c481cb7763ed778366d046636ca1695f8da1d518e98a72a4f86b4dc14'
+            '39bc6cb3a8dedb823bc2a789984d74773fcf684dff1a82b839007a4aac3d8926'
+            'c7cfa75590d3845f7c8fc05098e34f4a5a7183a755199dfbeb9c695aeef63ec1'
+            'd9bf5991403007f2c5bfe008b10cf5895c43558c4f4ed442b0c7caa638c1540a'
+            '5e38bfa13dc57bc8c6bc9ff28f7b2268ea043f918dc247aba89daad29e78f665'
             '50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
             'e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8'
-            'fa78eb7a3cf09896d011bcf06ca509661db281151b5c1f54c28713f874fc6880'
-            'fd647a02d2d6894e5998d141281b269a6fd51fe0fd60774109f47d5feb7eed18'
             '5bd5ad321e40676448871190cfe55294279c3bf0703e71e97a28c138ebe44937')
 
 # You need to download the gog.com installer file to this directory ($PWD),
@@ -40,35 +44,34 @@ 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_ja_dg_$pkgver.exe
+    innoextract -e -L -d "$srcdir"/setup "setup_jagged_alliance_-_deadly_games_${pkgver}_(28044).exe"
     # convert icon
-    icotool -x app/gfw_high.ico
+    icotool -x setup/goggame-1207658690.ico
     # create launchers
     for _m in client server settings; do
         sed "s|Exec=jagged-alliance-deadly-games|& --$_m|;s|Name=Jagged Alliance: Deadly Games|& (${_m^})|" \
                     $pkgname.desktop > jagged-alliance-deadly-games-$_m.desktop
     done
+
+    cp setup/__support/app/dosboxjadg.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}
-    # 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,goggame-1207658690.*,*.dll,*.zip,__redist,__support}
 }
 
 package() {
     # data
     install -d "$pkgdir"/opt/jagged-alliance-deadly-games
-    cp -r app/* "$pkgdir"/opt/jagged-alliance-deadly-games
+    cp -r setup/* "$pkgdir"/opt/jagged-alliance-deadly-games
     # fix permissions script
     install -Dm755 fix-permissions.sh "$pkgdir"/opt/jagged-alliance-deadly-games
     # additional dosbox config
-    install -m644 dosbox_windowed.conf "$pkgdir"/opt/jagged-alliance-deadly-games
-    install -m644 dosbox_ipx.conf "$pkgdir"/opt/jagged-alliance-deadly-games
+    install -m644 *.conf "$pkgdir"/opt/jagged-alliance-deadly-games
     # doc + licenses
     install -d "$pkgdir"/usr/share/{doc,licenses}/$pkgname
     ln -s -t "$pkgdir"/usr/share/doc/$pkgname /opt/jagged-alliance-deadly-games/{dg113.txt,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/jagged-alliance-deadly-games.desktop
     install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/jagged-alliance-deadly-games
@@ -76,5 +79,5 @@ package() {
         install -m644 jagged-alliance-deadly-games-$_m.desktop "$pkgdir"/usr/share/applications
     done
     # icon
-    install -Dm644 gfw_high_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/jagged-alliance-deadly-games.png
+    install -Dm644 goggame-1207658690_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/jagged-alliance-deadly-games.png
 }
diff --git a/dosboxjadg_client.conf b/dosboxjadg_client.conf
new file mode 100644
index 000000000000..18eb0c49f39d
--- /dev/null
+++ b/dosboxjadg_client.conf
@@ -0,0 +1,6 @@
+[IPX]
+ipx=true
+
+[autoexec]
+IPXNET CONNECT 127.0.0.1 19900
+cls
diff --git a/dosboxjadg_server.conf b/dosboxjadg_server.conf
new file mode 100644
index 000000000000..0d1bd5fdf85f
--- /dev/null
+++ b/dosboxjadg_server.conf
@@ -0,0 +1,6 @@
+[IPX]
+ipx=true
+
+[autoexec]
+IPXNET STARTSERVER 19900
+cls
diff --git a/dosboxjadg_settings.conf b/dosboxjadg_settings.conf
new file mode 100644
index 000000000000..b224dc753ecf
--- /dev/null
+++ b/dosboxjadg_settings.conf
@@ -0,0 +1,10 @@
+[IPX]
+ipx=false
+
+[autoexec]
+mount C "."
+imgmount d "jadg.gog" -t iso -fs iso
+c:
+cls
+setsound.exe
+exit
diff --git a/dosboxjadg_single.conf b/dosboxjadg_single.conf
new file mode 100644
index 000000000000..c979633a6eb2
--- /dev/null
+++ b/dosboxjadg_single.conf
@@ -0,0 +1,12 @@
+[IPX]
+ipx=false
+
+[autoexec]
+mount C "."
+imgmount d "jadg.gog" -t iso -fs iso
+c:
+cls
+@echo off
+intro\sms320 /flic=D:\intro\dgcredit.sms /snd=.\intro
+dg
+exit
diff --git a/fix-dosbox-mounts.patch b/fix-dosbox-mounts.patch
deleted file mode 100644
index bb70f1811c24..000000000000
--- a/fix-dosbox-mounts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/app/dosboxjadg_settings.conf b/app/dosboxjadg_settings.conf
---- a/app/dosboxjadg_settings.conf
-+++ b/app/dosboxjadg_settings.conf
-@@ -6,8 +6,8 @@ ipx=false
- # Lines in this section will be run at startup.
- 
- @ECHO OFF
--mount C ".."
--imgmount d "..\jadg.gog" -t iso -fs iso
-+mount C "."
-+imgmount d "jadg.gog" -t iso -fs iso
- c:
- cls
- SETSOUND.EXE
-diff --git a/app/dosboxjadg_single.conf b/app/dosboxjadg_single.conf
---- a/app/dosboxjadg_single.conf
-+++ b/app/dosboxjadg_single.conf
-@@ -5,8 +5,8 @@ ipx=false
- # Lines in this section will be run at startup.
- @ECHO OFF
- 
--mount C ".."
--imgmount d "..\jadg.gog" -t iso -fs iso
-+mount C "."
-+imgmount d "jadg.gog" -t iso -fs iso
- c:
- cls
- @echo off
diff --git a/simple-net-config.patch b/simple-net-config.patch
deleted file mode 100644
index dab05b447b3a..000000000000
--- a/simple-net-config.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/app/dosboxjadg_client.conf b/app/dosboxjadg_client.conf
---- a/app/dosboxjadg_client.conf
-+++ b/app/dosboxjadg_client.conf
-@@ -1,18 +1,6 @@
- [IPX]
--Enable=1
--Connection=1
- ipx=true
- 
--
- [autoexec]
--# Lines in this section will be run at startup.
--@ECHO OFF
--mount C ".."
--imgmount d "..\jadg.gog" -t iso -fs iso
--c:
-+IPXNET CONNECT 127.0.0.1 19900
- cls
--@echo off
--IPXNET CONNECT 127.0.0.1
--.\INTRO\SMS320 /flic=D:\intro\dgcredit.sms /snd=.\intro
--DG
--exit
-\ No newline at end of file
-diff --git a/app/dosboxjadg_server.conf b/app/dosboxjadg_server.conf
---- a/app/dosboxjadg_server.conf
-+++ b/app/dosboxjadg_server.conf
-@@ -1,18 +1,6 @@
- [IPX]
--Enable=1
--Connection=1
- ipx=true
- 
- [autoexec]
--# Lines in this section will be run at startup.
--@ECHO OFF
--
--mount C ".."
--imgmount d "..\jadg.gog" -t iso -fs iso
--c:
-+IPXNET STARTSERVER 19900
- cls
--@echo off
--IPXNET STARTSERVER
--.\INTRO\SMS320 /flic=D:\intro\dgcredit.sms /snd=.\intro
--DG
--exit
-\ No newline at end of file
-diff --git a/app/dosboxjadg_settings.conf b/app/dosboxjadg_settings.conf
---- a/app/dosboxjadg_settings.conf
-+++ b/app/dosboxjadg_settings.conf
-@@ -1,7 +1,5 @@
- [IPX]
--Enable=1
--Connection=1
--ipx=true
-+ipx=false
- 
- 
- [autoexec]
-diff --git a/app/dosboxjadg_single.conf b/app/dosboxjadg_single.conf
---- a/app/dosboxjadg_single.conf
-+++ b/app/dosboxjadg_single.conf
-@@ -1,7 +1,5 @@
- [IPX]
--Enable=1
--Connection=1
--ipx=true
-+ipx=false
- 
- [autoexec]
- # Lines in this section will be run at startup.
author	Constantin Nickel	2019-05-24 04:56:44 +0200
committer	Constantin Nickel	2019-05-24 04:56:44 +0200
commit	56ed2613a909f5d4259c5a67acd3acfc2252b42f (patch)
tree	965611e6712652bc653feef8926f940509993a64
parent	1c0cc9a06aa01d35ec02107e0b0cd2d369cbabb7 (diff)
download	aur-56ed2613a909f5d4259c5a67acd3acfc2252b42f.tar.gz