Align the package with the gog-baldurs-gate-enhanced-edition package

4 files changed, 40 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61c54b702d3a..01ac0a947571 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,44 @@
 pkgbase = gog-baldurs-gate-2-enhanced-edition
 	pkgdesc = Your story begins anew in the exotic southern kingdom of Amn, amidst the opulence of the sinister capital city of Athkatla. GOG Version. Linux native.
-	pkgver = 2.6.0.10
+	pkgver = 2.6.6.0.47292
 	pkgrel = 1
 	url = http://www.gog.com/game/baldurs_gate_2_enhanced_edition
 	arch = i686
 	arch = x86_64
 	license = custom
-	source = gog://gog_baldur_s_gate_2_enhanced_edition_2.6.0.10.sh
+	source = gog://baldur_s_gate_ii_enhanced_edition_2_6_6_0_47292.sh
 	source = gog-baldurs-gate-2-enhanced-edition
 	source = gog-baldurs-gate-2-enhanced-edition.desktop
-	sha256sums = f123b2482c169c81d52c93513c4659db3ed376c2781401d24b65ce08d49747e9
-	sha256sums = 55e56f5c3e4b03a3dfa70ad66e85b5cdac229baa7fc72775fd77a6962ea68ca7
-	sha256sums = 082330f67a7a6aa4ecc4d2f71765f12224f03260edff82e42d7622fd5084c14d
+	sha256sums = 453b22cc00a3a412dae8a73dcf89b07ef066c89b4c17cc70cf5f49c8d224bc6f
+	sha256sums = d88a1751e522096976be38ef27b841af533d11155ab0c507d83836818229f918
+	sha256sums = a5e36a1bcd664d34e1b01cedad249282b5a7663f1bdae73242966231c5250644
 	depends_i686 = glibc
 	depends_i686 = alsa-lib
 	depends_i686 = libgl
+	depends_i686 = libjson
+	depends_i686 = openal
+	depends_i686 = openssl-1.0
+	depends_i686 = expat
+	depends_i686 = libx11
+	depends_i686 = gcc-libs
+	depends_i686 = libxext
 	depends_i686 = libxcb
+	depends_i686 = libxau
+	depends_i686 = lib32-libxdmcp
 	optdepends_i686 = libpulse: pulseaudio support
 	depends_x86_64 = lib32-glibc
 	depends_x86_64 = lib32-alsa-lib
 	depends_x86_64 = lib32-libgl
+	depends_x86_64 = lib32-libjson
+	depends_x86_64 = lib32-openal
+	depends_x86_64 = lib32-openssl-1.0
+	depends_x86_64 = lib32-expat
+	depends_x86_64 = lib32-libx11
+	depends_x86_64 = lib32-gcc-libs
+	depends_x86_64 = lib32-libxext
 	depends_x86_64 = lib32-libxcb
+	depends_x86_64 = lib32-libxau
+	depends_x86_64 = lib32-libxdmcp
 	optdepends_x86_64 = lib32-libpulse: pulseaudio support
 
 pkgname = gog-baldurs-gate-2-enhanced-edition
diff --git a/PKGBUILD b/PKGBUILD
index 1a999a1f6575..bc212e428abf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,29 @@
 pkgname=gog-baldurs-gate-2-enhanced-edition
 _pkgname=baldurs-gate-2-enhanced-edition
 _original="Baldurs Gate 2 Enhanced Edition"
-pkgver=2.6.0.10
+pkgver=2.6.6.0.47292
+pkgver_dl=2_6_6_0_47292
 pkgrel=1
 pkgdesc="Your story begins anew in the exotic southern kingdom of Amn, amidst the opulence of the sinister capital city of Athkatla. GOG Version. Linux native."
 arch=('i686' 'x86_64')
 url="http://www.gog.com/game/baldurs_gate_2_enhanced_edition"
 license=('custom')
-depends_i686=('glibc' 'alsa-lib' 'libgl' 'libxcb')
-depends_x86_64=('lib32-glibc' 'lib32-alsa-lib' 'lib32-libgl' 'lib32-libxcb')
+depends_i686=('glibc' 'alsa-lib' 'libgl' 'libjson' 'openal' 'openssl-1.0' 'expat' 'libx11' 'gcc-libs' 'libxext' 'libxcb' 'libxau' 'lib32-libxdmcp')
+depends_x86_64=('lib32-glibc' 'lib32-alsa-lib' 'lib32-libgl' 'lib32-libjson' 'lib32-openal' 'lib32-openssl-1.0' 'lib32-expat' 'lib32-libx11' 'lib32-gcc-libs' 'lib32-libxext' 'lib32-libxcb' 'lib32-libxau' 'lib32-libxdmcp')
 optdepends_i686=('libpulse: pulseaudio support')
 optdepends_x86_64=('lib32-libpulse: pulseaudio support')
 DLAGENTS+=("gog::/usr/bin/echo Could not find %u. Manually download it to \"$(pwd)\", or set up a gog:// DLAGENT in /etc/makepkg.conf.")
-source=("gog://gog_baldur_s_gate_2_enhanced_edition_$pkgver.sh"
-        "$pkgname"
+source=("gog://baldur_s_gate_ii_enhanced_edition_$pkgver_dl.sh"
+        "${pkgname}"
         "$pkgname.desktop")
-sha256sums=('f123b2482c169c81d52c93513c4659db3ed376c2781401d24b65ce08d49747e9'
-            '55e56f5c3e4b03a3dfa70ad66e85b5cdac229baa7fc72775fd77a6962ea68ca7'
-            '082330f67a7a6aa4ecc4d2f71765f12224f03260edff82e42d7622fd5084c14d')
 PKGEXT=".pkg.tar"
-
-
+sha256sums=('453b22cc00a3a412dae8a73dcf89b07ef066c89b4c17cc70cf5f49c8d224bc6f'
+            'd88a1751e522096976be38ef27b841af533d11155ab0c507d83836818229f918'
+            'a5e36a1bcd664d34e1b01cedad249282b5a7663f1bdae73242966231c5250644')
 package() {
-  mkdir -p "$pkgdir/opt/$pkgname"
-  cp -r data/noarch/* "$pkgdir/opt/$pkgname"
-  # Remove packaged libraries that result in the game not starting
-  rm "$pkgdir/opt/$pkgname/lib/libstdc++.so.6"
-  rm "$pkgdir/opt/$pkgname/lib/libxcb.so.1"
+  _pkgdir="$pkgdir/opt/gog/$_pkgname"
+  mkdir -p "$pkgdir"/opt/gog/$_pkgname
+  cp -r data/noarch/* "$_pkgdir"
   install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 data/noarch/support/icon.png "$pkgdir/usr/share/pixmaps/hicolor/256x256/$pkgname.png"
diff --git a/gog-baldurs-gate-2-enhanced-edition b/gog-baldurs-gate-2-enhanced-edition
index b787f4273d3d..0710b05c3a99 100644
--- a/gog-baldurs-gate-2-enhanced-edition
+++ b/gog-baldurs-gate-2-enhanced-edition
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
-gogdir="/opt/gog-baldurs-gate-2-enhanced-edition"
+gogdir="/opt/gog/baldurs-gate-2-enhanced-edition"
 "${gogdir}/start.sh"
diff --git a/gog-baldurs-gate-2-enhanced-edition.desktop b/gog-baldurs-gate-2-enhanced-edition.desktop
index f1a81dbae2ea..26b62e03add9 100644
--- a/gog-baldurs-gate-2-enhanced-edition.desktop
+++ b/gog-baldurs-gate-2-enhanced-edition.desktop
@@ -5,8 +5,7 @@ Type=Application
 Name=Baldur's Gate 2 Enhanced Edition
 GenericName=Baldur's Gate 2 Enhanced Edition
 Comment=Baldur's Gate 2 Enhanced Edition
-Icon=/opt/gog=baldurs-gate-2-enhanced-edition/support/icon.png
-Exec=/opt/gog-baldurs-gate-2-enhanced-edition/start.sh
+Icon=/opt/gog/baldurs-gate-2-enhanced-edition/support/icon.png
+Exec="/opt/gog/baldurs-gate-2-enhanced-edition/start.sh" ""
 Categories=Game;
-Path="/opt/gog-baldurs-gate-2-enhanced-edition"
-
+Path=/opt/gog/baldurs-gate-2-enhanced-edition/