Apply donaldtrump's patch.

2 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e3da3b8dc8b..d082c4b9d4d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Nov 16 22:08:55 UTC 2017
+# Thu Nov 30 21:14:43 UTC 2017
 pkgbase = osu-lazer-git
 	pkgdesc = Freeware rhythm video game - lazer development version
 	pkgver = 2017.1116.0
@@ -9,11 +9,10 @@ pkgbase = osu-lazer-git
 	arch = i686
 	license = MIT
 	makedepends = nuget4
-	makedepends = msbuild-stable
 	makedepends = git
 	depends = ffmpeg
 	depends = libgl
-	depends = mono
+	depends = mono-stable
 	provides = osu-lazer
 	conflicts = osu-lazer
 	source = git+https://github.com/ppy/osu.git
@@ -21,13 +20,11 @@ pkgbase = osu-lazer-git
 	source = osu-lazer.desktop
 	source = osu-lazer.png
 	source = x-osu-lazer.xml
-	source = NuGet.config
 	sha256sums = SKIP
 	sha256sums = c499dbff1d9a8f382e7b3cf4a95b58b9f02fb98e66e50cddb5d7d6c8a5223d2d
 	sha256sums = 11d29c2654896607f37bc5c8e558ea245d8e3b1b412dcba03033bf1db6580ebe
 	sha256sums = 3b3a9075f79ca7f2a4fd34eb182a5c1ada6eb118a95e49c1526df516365bbfe5
 	sha256sums = d22f0d922856639c7cc5f71bdd620cc8b3eb54af923b1a43703faac217b8b13b
-	sha256sums = 171dc778d3f4408856b5b5bb9bffc272c7c9bd14cf0b11fd4026ccd57a2c4038
 
 pkgname = osu-lazer-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e2ccace4779..b6793e92de1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Ammon Smith <ammon.i.smith@gmail.com>
 # Contributor: Nicole Fontenot <nfontenot27@gmail.com>
+# Contributor: "donaldtrump" [AUR]
 
 pkgname=osu-lazer-git
 pkgver=2017.1116.0
@@ -9,11 +10,10 @@ arch=('x86_64' 'i686')
 url='https://osu.ppy.sh'
 license=('MIT')
 makedepends=('nuget4'
-             'msbuild-stable'
              'git')
 depends=('ffmpeg'
          'libgl'
-         'mono')
+         'mono-stable')
 optdepends=()
 options=()
 provides=('osu-lazer')
@@ -22,14 +22,12 @@ source=('git+https://github.com/ppy/osu.git'
         'osu-launcher'
         'osu-lazer.desktop'
         'osu-lazer.png'
-        'x-osu-lazer.xml'
-        'NuGet.config')
+        'x-osu-lazer.xml')
 sha256sums=('SKIP'
             'c499dbff1d9a8f382e7b3cf4a95b58b9f02fb98e66e50cddb5d7d6c8a5223d2d'
             '11d29c2654896607f37bc5c8e558ea245d8e3b1b412dcba03033bf1db6580ebe'
             '3b3a9075f79ca7f2a4fd34eb182a5c1ada6eb118a95e49c1526df516365bbfe5'
-            'd22f0d922856639c7cc5f71bdd620cc8b3eb54af923b1a43703faac217b8b13b'
-            '171dc778d3f4408856b5b5bb9bffc272c7c9bd14cf0b11fd4026ccd57a2c4038')
+            'd22f0d922856639c7cc5f71bdd620cc8b3eb54af923b1a43703faac217b8b13b')
 
 case "$CARCH" in
 	x86_64)
@@ -54,10 +52,18 @@ build() {
 
 	# Download dependencies
 	nuget restore
-	nuget restore -configfile "$srcdir/NuGet.config"
+
+	# Symlink netstandard for xbuild
+	mkdir -p "osu.Game/bin/Release"
+	ln -s "/lib/mono/4.5/Facades/netstandard.dll" "osu.Game/bin/Release"
 
 	# Build
-	msbuild /property:Configuration=Release
+	export MONO_IOMAP="case"
+	xbuild /property:Configuration=Release
+
+	# Cleanup
+	rm "osu.Game/bin/Release/netstandard.dll"
+	rm "osu.Desktop/bin/Release/netstandard.dll"
 }
 
 package() {
@@ -88,6 +94,7 @@ package() {
 	# Native libraries
 	install -m755 "libbass.$_arch.so" "$pkgdir/usr/lib/${pkgname%-git}/libbass.so"
 	install -m755 "libbass_fx.$_arch.so" "$pkgdir/usr/lib/${pkgname%-git}/libbass_fx.so"
+	install -m755 "libe_sqlite3.so" "$pkgdir/usr/lib/${pkgname%-git}/libe_sqlite3.so"
 }
 
 # vim: set sw=4 ts=4 noet: