1.7.0-1

2 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7657324de77..6ae44372dfcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Dec 30 01:03:28 UTC 2016
+# Wed May 31 01:59:36 UTC 2017
 pkgbase = mattercontrol-plugins
 	pkgdesc = Closed source plugins for MatterControl
-	pkgver = 1.6.2
+	pkgver = 1.7.0
 	pkgrel = 1
 	url = http://www.mattercontrol.com
 	arch = i386
@@ -10,8 +10,10 @@ pkgbase = mattercontrol-plugins
 	license = custom
 	depends = mattercontrol
 	provides = mattercontrol-plugins
-	source = MatterControlSetup-1.6.2.tar.gz::https://mattercontrol.appspot.com/downloads/development/ag9zfm1hdHRlcmNvbnRyb2xyQQsSB1Byb2plY3QYgICAiOCSzAsMCxINUHVibGljUmVsZWFzZRiAgIDAv6GECgwLEgZVcGxvYWQYgICAoMSOgAoM
-	sha256sums = 63757def7d1d880f67cd72107b3df5c2d0cad2242fb540f48264b2fb4f2b05f8
+	source = MatterControlSetup-1.7.0.tar.gz::https://mattercontrol.appspot.com/downloads/development/ag9zfm1hdHRlcmNvbnRyb2xyQQsSB1Byb2plY3QYgICAiOCSzAsMCxINUHVibGljUmVsZWFzZRiAgICgsdyLCgwLEgZVcGxvYWQYgICAoK3hngoM
+	source = websocket4net.0.15.0-beta7.nupkg::https://www.nuget.org/api/v2/package/WebSocket4Net/0.15.0-beta7
+	sha256sums = 2e975a7e97c7e747c2245ffd7e975b248b5ef9f0ca83e90248b6b7f8008e1568
+	sha256sums = f001300c03dfe7cc8f768be76491cd9da72286d0c8c935456b885b7d8b6cec9b
 
 pkgname = mattercontrol-plugins
 
diff --git a/PKGBUILD b/PKGBUILD
index 4605970326c7..fcf21b76c608 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mattercontrol-plugins
 _pkgname=MatterControl
-pkgver=1.6.2
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Closed source plugins for MatterControl"
 arch=("i386" "x86_64")
@@ -10,13 +10,18 @@ license=('custom')
 url="http://www.mattercontrol.com"
 depends=('mattercontrol')
 provides=('mattercontrol-plugins')
-source=("MatterControlSetup-1.6.2.tar.gz::https://mattercontrol.appspot.com/downloads/development/ag9zfm1hdHRlcmNvbnRyb2xyQQsSB1Byb2plY3QYgICAiOCSzAsMCxINUHVibGljUmVsZWFzZRiAgIDAv6GECgwLEgZVcGxvYWQYgICAoMSOgAoM")
-sha256sums=('63757def7d1d880f67cd72107b3df5c2d0cad2242fb540f48264b2fb4f2b05f8')
+source=("MatterControlSetup-1.7.0.tar.gz::https://mattercontrol.appspot.com/downloads/development/ag9zfm1hdHRlcmNvbnRyb2xyQQsSB1Byb2plY3QYgICAiOCSzAsMCxINUHVibGljUmVsZWFzZRiAgICgsdyLCgwLEgZVcGxvYWQYgICAoK3hngoM"
+        "websocket4net.0.15.0-beta7.nupkg::https://www.nuget.org/api/v2/package/WebSocket4Net/0.15.0-beta7")
+sha256sums=('2e975a7e97c7e747c2245ffd7e975b248b5ef9f0ca83e90248b6b7f8008e1568'
+            'f001300c03dfe7cc8f768be76491cd9da72286d0c8c935456b885b7d8b6cec9b')
 
 build() {
 	cd "${srcdir}"
-	ar -x "mattercontrol-1.6/mattercontrol-1.6.deb"
+	ar -x "mattercontrol-1.7/mattercontrol-1.7.deb"
 	tar -xvf data.tar.xz
+
+	# Fix for https://github.com/MatterHackers/MatterControl/issues/1989
+	unzip websocket4net.0.15.0-beta7.nupkg -d websocket4net
 }
 
 package() {
@@ -36,6 +41,7 @@ package() {
 	# Libraries
 	cp EngineIoClientDotNet.dll* "$pkgdir/usr/lib/mattercontrol/"
 	cp SocketIoClientDotNet.dll* "$pkgdir/usr/lib/mattercontrol/"
+	cd "${srcdir}/websocket4net/lib/net45"
 	cp WebSocket4Net.dll* "$pkgdir/usr/lib/mattercontrol/"
 
 }