friture-git: merged patch upstream

3 files changed, 2 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82b07f83166d..c27670cbbe46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,10 +18,8 @@ pkgbase = friture-git
 	depends = python-sounddevice
 	optdepends = jack: for JACK I/O support
 	source = friture::git+https://github.com/tlecomte/friture.git
-	source = patch
 	source = friture.desktop
 	md5sums = SKIP
-	md5sums = 9ddb9961a2694403bb56ccfd0ae99bd2
 	md5sums = 90243c7bedd2dfca1429498561ce796b
 
 pkgname = friture-git
diff --git a/PKGBUILD b/PKGBUILD
index 734ff171525f..57387d6d6c94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: robertfoster
 
 pkgname=friture-git
-pkgver=v0.35.r0.g98a8aac
+pkgver=v0.35.r2.g66231f3
 pkgrel=1
 pkgdesc="An application to visualize and analyze live audio data in real-time."
 arch=(i686 x86_64)
@@ -11,13 +11,11 @@ depends=('pyqwt' 'python-opengl' 'python-psutil' 'python-pyaudio' 'python-pyqt5'
 optdepends=('jack: for JACK I/O support')
 makedepends=('cython' 'git')
 source=("friture::git+https://github.com/tlecomte/friture.git"
-patch
 friture.desktop)
 md5sums=('866407aefd359ae16015f4ce6a2cd212')
 
 build() {
 	cd friture
-	patch -Np1 -i ../patch
 	python setup.py build
 }
 
@@ -34,5 +32,4 @@ pkgver() {
 }
 
 md5sums=('SKIP'
-         '9ddb9961a2694403bb56ccfd0ae99bd2'
-         '90243c7bedd2dfca1429498561ce796b')
+'90243c7bedd2dfca1429498561ce796b')
diff --git a/patch b/patch
deleted file mode 100644
index c3d9b8165652..000000000000
--- a/patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/setup.py	2018-06-08 15:53:33.353160285 +0200
-+++ b/setup.py	2018-06-08 15:53:00.570152313 +0200
-@@ -187,7 +187,8 @@
-       ],
-       packages=['friture',
-                 'friture.plotting',
--                'friture.generators'],
-+                'friture.generators',
-+		'friture.signal'],
-       scripts=['scripts/friture'],
-       ext_modules=cythonize(ext_modules),
-       **extra_options