summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Nickel2019-05-22 22:09:08 +0200
committerConstantin Nickel2019-05-22 22:11:27 +0200
commit594cd6149b56ebb633f1c3f011ebf10cf645ae5e (patch)
tree0ac01dbfd221264a90222f819945481b8fa669d1
parentf7eb19b64f5be4bedf0e462723b1bdacbd1b11ff (diff)
downloadaur-594cd6149b56ebb633f1c3f011ebf10cf645ae5e.tar.gz
new gog installer version
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD36
-rw-r--r--dosboxja_settings.conf11
-rw-r--r--dosboxja_single.conf11
-rw-r--r--fix-dosbox-mounts.patch28
5 files changed, 52 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d954d5ae3b..a087dd5ee63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,29 @@
pkgbase = jagged-alliance-gog
pkgdesc = A turn-based tactics game that takes place on the fictional South Atlantic island of Metavira.
- pkgver = 2.0.0.2
+ pkgver = 1.13
pkgrel = 1
url = https://www.gog.com/game/jagged_alliance
install = jagged-alliance-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_jagged_alliance_2.0.0.2.exe::gogdownloader://jagged_alliance/installer_win_en
+ source = setup_jagged_alliance_1.13_(28044).exe::gogdownloader://jagged_alliance/installer_win_en
source = jagged-alliance-gog.sh
source = jagged-alliance-gog.desktop
+ source = dosboxja_single.conf
+ source = dosboxja_settings.conf
source = dosbox_windowed.conf
- source = fix-dosbox-mounts.patch
source = fix-permissions.sh
- sha256sums = c4800b3a93b1a83f77f69824fc9fa2c8e800b6d3657e959b6f1fb6347a688988
+ sha256sums = 03b2652cc2352fd84e98344e019503aa33ef7eb8a884112a5c219f07c6366aa6
sha256sums = 0859a50cc4aaa025bbb4211f3b80ea11e997f6da12408c23c9a3f7b1cc9af03c
sha256sums = ea3f11dce620e6f1f9c2d6712c9168fe3216e6df5751f01f2ead022e1e746874
+ sha256sums = d6ba58df35379ce0662f73ecdf0e5b45b28950b1584f55c2dcfa675a4c432389
+ sha256sums = aaa680209f8f979e8250983c621268a30bfac3ca551f4dee50e88704bffb8059
sha256sums = 50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578
- sha256sums = f799b02666773c286c96c9bd6583540dc17f78e263ed54efbfbbe8bec7ab7ea7
sha256sums = 68233aebc7a7ba578fda0ab0744ecfa9a3d5964c27e81c1d080a9f522cf78a89
pkgname = jagged-alliance-gog
diff --git a/PKGBUILD b/PKGBUILD
index 3d0c9b0a1ab..e4d3a54e50f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,32 @@
# Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
pkgname=jagged-alliance-gog
-pkgver=2.0.0.2
+pkgver=1.13
pkgrel=1
pkgdesc="A turn-based tactics game that takes place on the fictional South Atlantic island of Metavira."
url="https://www.gog.com/game/jagged_alliance"
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_jagged_alliance_$pkgver.exe"::"gogdownloader://jagged_alliance/installer_win_en"
+source=("setup_jagged_alliance_${pkgver}_(28044).exe"::"gogdownloader://jagged_alliance/installer_win_en"
"jagged-alliance-gog.sh"
"jagged-alliance-gog.desktop"
+ "dosboxja_single.conf"
+ "dosboxja_settings.conf"
"dosbox_windowed.conf"
- "fix-dosbox-mounts.patch"
"fix-permissions.sh")
-sha256sums=('c4800b3a93b1a83f77f69824fc9fa2c8e800b6d3657e959b6f1fb6347a688988'
+sha256sums=('03b2652cc2352fd84e98344e019503aa33ef7eb8a884112a5c219f07c6366aa6'
'0859a50cc4aaa025bbb4211f3b80ea11e997f6da12408c23c9a3f7b1cc9af03c'
'ea3f11dce620e6f1f9c2d6712c9168fe3216e6df5751f01f2ead022e1e746874'
+ 'd6ba58df35379ce0662f73ecdf0e5b45b28950b1584f55c2dcfa675a4c432389'
+ 'aaa680209f8f979e8250983c621268a30bfac3ca551f4dee50e88704bffb8059'
'50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
- 'f799b02666773c286c96c9bd6583540dc17f78e263ed54efbfbbe8bec7ab7ea7'
'68233aebc7a7ba578fda0ab0744ecfa9a3d5964c27e81c1d080a9f522cf78a89')
# You need to download the gog.com installer file to this directory ($PWD),
@@ -36,32 +38,38 @@ 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_jagged_alliance_$pkgver.exe
+ innoextract -e -L -d "$srcdir"/setup "setup_jagged_alliance_${pkgver}_(28044).exe"
# convert icon
- icotool -x app/gfw_high.ico
+ icotool -x setup/app/goggame-1207658689.ico
# create launchers
for _m in settings; do
sed "s|Exec=jagged-alliance|& --$_m|;s|Name=Jagged Alliance|& (${_m^})|" \
$pkgname.desktop > jagged-alliance-$_m.desktop
done
+
+ cp setup/__support/app/dosboxja.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 mount directory
- patch -p1 -i "$srcdir"/fix-dosbox-mounts.patch
+ rm -rf setup/{app/,commonappdata/,dosbox/,tmp/,*.ico,*.dll,*.zip,__redist,__support}
}
package() {
# data
install -d "$pkgdir"/opt/jagged-alliance
- cp -r app/* "$pkgdir"/opt/jagged-alliance
+ cp -r "$srcdir"/setup/* "$pkgdir"/opt/jagged-alliance
# fix permissions script
install -Dm755 fix-permissions.sh "$pkgdir"/opt/jagged-alliance
+ # dosbox config
+ install -m644 dosboxja.conf "$pkgdir"/opt/jagged-alliance
+ install -m644 dosboxja_single.conf "$pkgdir"/opt/jagged-alliance
+ install -m644 dosboxja_settings.conf "$pkgdir"/opt/jagged-alliance
# additional dosbox config
install -m644 dosbox_windowed.conf "$pkgdir"/opt/jagged-alliance
# doc + licenses
install -d "$pkgdir"/usr/share/{doc,licenses}/$pkgname
ln -s -t "$pkgdir"/usr/share/doc/$pkgname /opt/jagged-alliance/{manual.pdf,quickrefcard.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/jagged-alliance.desktop
install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/jagged-alliance
@@ -69,5 +77,5 @@ package() {
install -m644 jagged-alliance-$_m.desktop "$pkgdir"/usr/share/applications
done
# icon
- install -Dm644 gfw_high_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/jagged-alliance.png
+ install -Dm644 goggame-1207658689_7_256x256x32.png "$pkgdir"/usr/share/pixmaps/jagged-alliance.png
}
diff --git a/dosboxja_settings.conf b/dosboxja_settings.conf
new file mode 100644
index 00000000000..0f6c0593160
--- /dev/null
+++ b/dosboxja_settings.conf
@@ -0,0 +1,11 @@
+[IPX]
+ipx=false
+
+[autoexec]
+@ECHO OFF
+mount C "."
+imgmount d "ja1.gog" -t iso -fs iso
+c:
+cls
+setsound.exe
+exit
diff --git a/dosboxja_single.conf b/dosboxja_single.conf
new file mode 100644
index 00000000000..6e640072b76
--- /dev/null
+++ b/dosboxja_single.conf
@@ -0,0 +1,11 @@
+[IPX]
+ipx=false
+
+[autoexec]
+@ECHO OFF
+mount C "."
+imgmount d "ja1.gog" -t iso -fs iso
+c:
+cls
+ja.exe
+exit
diff --git a/fix-dosbox-mounts.patch b/fix-dosbox-mounts.patch
deleted file mode 100644
index 00328b7faad..00000000000
--- a/fix-dosbox-mounts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/app/dosboxja_settings.conf b/app/dosboxja_settings.conf
---- a/app/dosboxja_settings.conf
-+++ b/app/dosboxja_settings.conf
-@@ -8,8 +8,8 @@ ipx=true
- # Lines in this section will be run at startup.
-
- @ECHO OFF
--mount C ".."
--imgmount d "..\ja1.gog" -t iso -fs iso
-+mount C "."
-+imgmount d "ja1.gog" -t iso -fs iso
- c:
- cls
- SETSOUND.EXE
-diff --git a/app/dosboxja_single.conf b/app/dosboxja_single.conf
---- a/app/dosboxja_single.conf
-+++ b/app/dosboxja_single.conf
-@@ -8,8 +8,8 @@ ipx=true
- # Lines in this section will be run at startup.
-
- @ECHO OFF
--mount C ".."
--imgmount d "..\ja1.gog" -t iso -fs iso
-+mount C "."
-+imgmount d "ja1.gog" -t iso -fs iso
- c:
- cls
- ja.exe