1.3.9

4 files changed, 16 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e47561c0c37..0733d709dd0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = octoprint
 	pkgdesc = Responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...)
-	pkgver = 1.3.8
-	pkgrel = 8
+	pkgver = 1.3.9
+	pkgrel = 1
 	url = http://octoprint.org/
 	install = octoprint.install
 	arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = octoprint
 	license = AGPL3
 	makedepends = python2-virtualenv
 	depends = python2-argh
-	depends = python2-babel
 	depends = python2-backports.ssl_match_hostname
 	depends = python2-blinker
 	depends = python2-certifi
@@ -23,8 +22,11 @@ pkgbase = octoprint
 	depends = python2-markdown
 	depends = python2-markupsafe
 	depends = python2-netaddr
+	depends = python2-netifaces>=0.10.6
+	depends = python2-netifaces<0.11
 	depends = python2-pathtools
 	depends = python2-pkginfo
+	depends = python2-psutil
 	depends = python2-pyasn1
 	depends = python2-pyserial
 	depends = python2-pytz
@@ -33,6 +35,7 @@ pkgbase = octoprint
 	depends = python2-sarge
 	depends = python2-six
 	depends = python2-speaklater
+	depends = python2-tornado
 	depends = python2-urllib3
 	depends = python2-watchdog
 	depends = python2-wrapt
@@ -44,20 +47,16 @@ pkgbase = octoprint
 	provides = octoprint
 	conflicts = octoprint-venv
 	backup = etc/conf.d/octoprint
-	source = octoprint-1.3.8.tar.gz::https://github.com/foosel/OctoPrint/archive/1.3.8.tar.gz
+	source = octoprint-1.3.9.tar.gz::https://github.com/foosel/OctoPrint/archive/1.3.9.tar.gz
 	source = octoprint.sysusers
 	source = octoprint.service
 	source = octoprint-serve
 	source = octoprint.conf
-	source = 0010-pkginfo.patch
-	source = 0020-click.patch
-	sha256sums = f447d2888004ff85971691a0e0f01d74dec6169b7ac599ec51bf44cfe42f2f92
+	sha256sums = f3eaf15784e9eb6ae46266b06cbe09f7ff874fb1bf13b1dd2eaca070718e2a6e
 	sha256sums = bd9b7f989aefb02da1ac414f306861f21f084d886f0283eea11516482b407d65
 	sha256sums = 231685e84b0241a466766c766f8d3ba31efda3238f19e9adedea380e7b861737
 	sha256sums = 08e6ff10fb7f61c40e5770b67e8f7201d02d82d3bd46c5441a7f2b0435fbe9c2
 	sha256sums = 02be5d5a18febe215809882d96f068092c4474abb4e76d82e4450b860a4e9ef5
-	sha256sums = 735644dcd6a26eb02cefe1727d41d91c4a1dcb53d0b8a1876fe3fa9abe04eba2
-	sha256sums = a3e7a9d816d16c878bb893c1c34815c1f2ecdb9c568a0ef3d8be7dfaa2d12cf2
 
 pkgname = octoprint
 
diff --git a/0010-pkginfo.patch b/0010-pkginfo.patch
deleted file mode 100644
index 2a191fab9931..000000000000
--- a/0010-pkginfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru OctoPrint-1.3.8-orig/setup.py OctoPrint-1.3.8/setup.py
---- OctoPrint-1.3.8-orig/setup.py	2018-04-13 17:22:44.000000000 +0300
-+++ OctoPrint-1.3.8/setup.py	2018-06-19 16:39:03.394773021 +0300
-@@ -37,7 +37,7 @@
- 	"netifaces>=0.10,<0.11",
- 	"pylru>=1.0.9,<1.1",
- 	"rsa>=3.2,<3.3",
--	"pkginfo>=1.2.1,<1.3",
-+	"pkginfo>=1.2.1",
- 	"requests>=2.18.4,<3",
- 	"semantic_version>=2.4.2,<2.5",
- 	"psutil==5.4.3", # 5.4.4 introduced a breaking change concerning installing under non current
diff --git a/0020-click.patch b/0020-click.patch
deleted file mode 100644
index fb6022632c06..000000000000
--- a/0020-click.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru OctoPrint-1.3.8-orig/setup.py OctoPrint-1.3.8/setup.py
---- OctoPrint-1.3.8-orig/setup.py	2018-06-20 18:15:15.134173657 +0300
-+++ OctoPrint-1.3.8/setup.py	2018-06-20 18:23:01.361656368 +0300
-@@ -42,7 +42,7 @@
- 	"semantic_version>=2.4.2,<2.5",
- 	"psutil==5.4.3", # 5.4.4 introduced a breaking change concerning installing under non current
- 	                 # setuptools versions. Pinning to 5.4.3 for now to work around this.
--	"Click>=6.2,<6.3",
-+	"Click>=6.2,<6.8",
- 	"awesome-slugify>=1.6.5,<1.7",
- 	"feedparser>=5.2.1,<5.3",
- 	"chainmap>=1.0.2,<1.1",
diff --git a/PKGBUILD b/PKGBUILD
index 5fc68f3607e6..9d3510b5db9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,14 @@
 
 _pkgname=OctoPrint
 pkgname=octoprint
-# c55c568bbddf5112facf6aa3a173d500936b6cbf
-pkgver=1.3.8
-pkgrel=8
+pkgver=1.3.9
+pkgrel=1
 pkgdesc="Responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...)"
 arch=(x86_64 armv6h armv7h)
 url="http://octoprint.org/"
 license=('AGPL3')
 depends=(
 		python2-argh
-		python2-babel
 		python2-backports.ssl_match_hostname
 		python2-blinker
 		python2-certifi
@@ -24,8 +22,11 @@ depends=(
 		python2-markdown
 		python2-markupsafe
 		python2-netaddr
+		'python2-netifaces>=0.10.6'
+		'python2-netifaces<0.11'
 		python2-pathtools
 		python2-pkginfo
+		python2-psutil
 		python2-pyasn1
 		python2-pyserial
 		python2-pytz
@@ -34,6 +35,7 @@ depends=(
 		python2-sarge
 		python2-six
 		python2-speaklater
+		python2-tornado
 		python2-urllib3
 		python2-watchdog
 		python2-wrapt
@@ -55,18 +57,13 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/foosel/$_pkgname/archive/$pk
 		octoprint.service
 		octoprint-serve
 		octoprint.conf
-
-		0010-pkginfo.patch
-		0020-click.patch
 		)
 
-sha256sums=('f447d2888004ff85971691a0e0f01d74dec6169b7ac599ec51bf44cfe42f2f92'
+sha256sums=('f3eaf15784e9eb6ae46266b06cbe09f7ff874fb1bf13b1dd2eaca070718e2a6e'
             'bd9b7f989aefb02da1ac414f306861f21f084d886f0283eea11516482b407d65'
             '231685e84b0241a466766c766f8d3ba31efda3238f19e9adedea380e7b861737'
             '08e6ff10fb7f61c40e5770b67e8f7201d02d82d3bd46c5441a7f2b0435fbe9c2'
-            '02be5d5a18febe215809882d96f068092c4474abb4e76d82e4450b860a4e9ef5'
-            '735644dcd6a26eb02cefe1727d41d91c4a1dcb53d0b8a1876fe3fa9abe04eba2'
-            'a3e7a9d816d16c878bb893c1c34815c1f2ecdb9c568a0ef3d8be7dfaa2d12cf2')
+            '02be5d5a18febe215809882d96f068092c4474abb4e76d82e4450b860a4e9ef5')
 
 prepare()
 {