upgpkg: 2.1.0.11

6 files changed, 29 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17f7f2e92e0f..3b2e2e223d0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = constructor-gog
 	pkgdesc = Control a construction company, and aim to drive the other players out of business.
-	pkgver = 2.0.0.9
+	pkgver = 2.1.0.11
 	pkgrel = 1
 	url = https://www.gog.com/game/constructor
 	install = constructor-gog.install
@@ -11,23 +11,21 @@ pkgbase = constructor-gog
 	makedepends = icoutils
 	depends = dosbox
 	optdepends = unionfs-fuse: mounting game folder to home for savegames and settings
-	source = setup_constructor_2.0.0.9.exe::gogdownloader://constructor/installer_win_en
+	source = setup_constructor_2.1.0.11.exe::gogdownloader://constructor/installer_win_en
 	source = constructor-gog.sh
 	source = constructor-gog.desktop
-	source = dosboxconstructor_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 = 2c996960fef8952601938bbe6ccc93b069b9275716ab202ed14daa443f5e8800
-	sha256sums = 0e78c290229205cb4245beaec1118edc85dc310446292f9c0fefc8a0e34d525f
+	sha256sums = 49ac172a3f82671eb89ea9d858f8b2643f820c394446eb1a88564b293a88acfd
+	sha256sums = bce1e648feb9e15bcbc33f7dec9a290a01c224a083801d258d9db36f4314c92b
 	sha256sums = 7db33dbe4048286cc08f76de61c2a81eb9d06f0c8c76d532c5e8c50a7952789f
-	sha256sums = 61e583c4ccf48215d024ee5443399c8f886d0986b46dcf447c9ba65abb469d18
 	sha256sums = 50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578
 	sha256sums = e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8
-	sha256sums = 72d2a719f7c764f1c19c2660e54272f00c4e468579f99c38fb29be5e6b3d316e
-	sha256sums = a6920807c11c1aa0fcad0bcf6a71adc8b7fd13ed66f5f26ce2973bed97dfc7e4
+	sha256sums = 7168e67bd3b7308993f12f36c45571681e91c3d51be0561ede0cda9c889a993c
+	sha256sums = 5eff85a14fa02aca36c0d7bbab89c6993ed2b7b81c23807d0f79d724d6d583db
 	sha256sums = ee6715c4ba84e97ee3d04a4ad00ec1b67439ee8eb4ca2f1fd1000cb47b3f1c92
 
 pkgname = constructor-gog
diff --git a/PKGBUILD b/PKGBUILD
index a9df5e753c3f..5332cd29c3da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
 
 pkgname=constructor-gog
-pkgver=2.0.0.9
+pkgver=2.1.0.11
 pkgrel=1
 pkgdesc="Control a construction company, and aim to drive the other players out of business."
 url="https://www.gog.com/game/constructor"
@@ -16,21 +16,19 @@ install=$pkgname.install
 source=("setup_constructor_$pkgver.exe"::"gogdownloader://constructor/installer_win_en"
         "constructor-gog.sh"
         "constructor-gog.desktop"
-        "dosboxconstructor_settings.conf"
         "dosbox_windowed.conf"
         "dosbox_ipx.conf"
         "simple-net-config.patch"
         "fix-dosbox-mounts.patch"
         "fix-permissions.sh")
 
-sha256sums=('2c996960fef8952601938bbe6ccc93b069b9275716ab202ed14daa443f5e8800'
-            '0e78c290229205cb4245beaec1118edc85dc310446292f9c0fefc8a0e34d525f'
+sha256sums=('49ac172a3f82671eb89ea9d858f8b2643f820c394446eb1a88564b293a88acfd'
+            'bce1e648feb9e15bcbc33f7dec9a290a01c224a083801d258d9db36f4314c92b'
             '7db33dbe4048286cc08f76de61c2a81eb9d06f0c8c76d532c5e8c50a7952789f'
-            '61e583c4ccf48215d024ee5443399c8f886d0986b46dcf447c9ba65abb469d18'
             '50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
             'e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8'
-            '72d2a719f7c764f1c19c2660e54272f00c4e468579f99c38fb29be5e6b3d316e'
-            'a6920807c11c1aa0fcad0bcf6a71adc8b7fd13ed66f5f26ce2973bed97dfc7e4'
+            '7168e67bd3b7308993f12f36c45571681e91c3d51be0561ede0cda9c889a993c'
+            '5eff85a14fa02aca36c0d7bbab89c6993ed2b7b81c23807d0f79d724d6d583db'
             'ee6715c4ba84e97ee3d04a4ad00ec1b67439ee8eb4ca2f1fd1000cb47b3f1c92')
 
 # You need to download the gog.com installer file to this directory ($PWD),
@@ -44,7 +42,7 @@ prepare() {
     # extract installer (convert files to lowercase, as DOS does not care)
     innoextract -e -L -d "$srcdir" setup_constructor_$pkgver.exe
     # convert icon
-    icotool -x app/gfw_high.ico
+    icotool -x app/goggame-1207658826.ico
     # create launchers
     for _m in client server; do
         sed "s|Exec=constructor|& --$_m|;s|Name=Constructor|& (${_m^})|" \
@@ -65,7 +63,6 @@ package() {
     # fix permissions script
     install -Dm755 fix-permissions.sh "$pkgdir"/opt/constructor
     # additional dosbox config
-    install -m644 dosboxconstructor_settings.conf "$pkgdir"/opt/constructor
     install -m644 dosbox_windowed.conf "$pkgdir"/opt/constructor
     install -m644 dosbox_ipx.conf "$pkgdir"/opt/constructor
     # doc + licenses
@@ -79,5 +76,5 @@ package() {
         install -m644 constructor-$_m.desktop "$pkgdir"/usr/share/applications
     done
     # icon
-    install -Dm644 gfw_high_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/constructor.png
+    install -Dm644 goggame-1207658826_6_256x256x32.png "$pkgdir"/usr/share/pixmaps/constructor.png
 }
diff --git a/constructor-gog.sh b/constructor-gog.sh
index 600610f118c3..cc0dbb425142 100644
--- a/constructor-gog.sh
+++ b/constructor-gog.sh
@@ -41,7 +41,7 @@ while true; do
     case "$1" in
         -h|--help) _help; shift ;;
         --windowed) WINDOWED=1; shift ;;
-        --settings) START_SETTINGS=1; shift ;;
+        --settings) START_SETTINGS=1; WINDOWED=1; shift ;;
         --client) START_CLIENT=1; shift ;;
         --server) START_SERVER=1; shift ;;
         --) shift; break ;;
diff --git a/dosboxconstructor_settings.conf b/dosboxconstructor_settings.conf
deleted file mode 100644
index c83478a02cb9..000000000000
--- a/dosboxconstructor_settings.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[sdl]
-fullscreen=false
-
-[autoexec]
-echo off
-mount c "."
-c:
-cls
-call setsound.bat
-exit
diff --git a/fix-dosbox-mounts.patch b/fix-dosbox-mounts.patch
index fa4d8235f204..436090bb7b6d 100644
--- a/fix-dosbox-mounts.patch
+++ b/fix-dosbox-mounts.patch
@@ -1,7 +1,21 @@
+diff --git a/app/dosboxconstructor_settings.conf b/app/dosboxconstructor_settings.conf
+--- a/app/dosboxconstructor_settings.conf
++++ b/app/dosboxconstructor_settings.conf
+@@ -7,8 +7,8 @@ ipx=false
+ # Lines in this section will be run at startup.

+ 

+ @ECHO OFF

+-mount C ".."

+-imgmount d "..\const.gog" -t iso -fs iso

++mount C "."

++imgmount d "const.gog" -t iso -fs iso

+ c:

+ cls

+ setsound.bat

 diff --git a/app/dosboxconstructor_single.conf b/app/dosboxconstructor_single.conf
 --- a/app/dosboxconstructor_single.conf
 +++ b/app/dosboxconstructor_single.conf
-@@ -5,8 +5,8 @@ ipx=true
+@@ -7,8 +7,8 @@ ipx=false
  # Lines in this section will be run at startup.

  

  @ECHO OFF

diff --git a/simple-net-config.patch b/simple-net-config.patch
index 3038b119ee76..938129d3bdb1 100644
--- a/simple-net-config.patch
+++ b/simple-net-config.patch
@@ -41,15 +41,3 @@ diff --git a/app/dosboxconstructor_server.conf b/app/dosboxconstructor_server.co
 -exit
 \ No newline at end of file
 +IPXNET STARTSERVER 19900

-diff --git a/app/dosboxconstructor_single.conf b/app/dosboxconstructor_single.conf
---- a/app/dosboxconstructor_single.conf
-+++ b/app/dosboxconstructor_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.