summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Arndt2019-10-05 22:26:18 +0200
committerChristopher Arndt2019-10-05 22:26:18 +0200
commit078138fcf34558056c89a3a659a15c8a05b1ee99 (patch)
treee44a2d6dfdee2e4c06e7b76727e7cad8ab5bd90c
parentf1f2fbec185bb62b01ab88c5872529a80b50209c (diff)
downloadaur-078138fcf34558056c89a3a659a15c8a05b1ee99.tar.gz
Remove makep dep on Python 2; add dep on python-rdflib; add patch for Python 3 issues
Signed-off-by: Christopher Arndt <chris@chrisarndt.de>
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD27
-rw-r--r--ingen-ingenish-python3.diff28
3 files changed, 51 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 02807481c7b1..210f917864e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,13 +6,14 @@ pkgbase = ingen-git
arch = i686
arch = x86_64
license = GPL
- makedepends = python2
+ makedepends = git
depends = alsa-lib
depends = ganv>=1.5.0
depends = jack
depends = lilv>=0.21.5
depends = lv2>=1.15.4
depends = portaudio
+ depends = python-rdflib
depends = raul>=0.8.10
depends = suil>=0.8.7
depends = serd>=0.30
@@ -22,7 +23,9 @@ pkgbase = ingen-git
provides = ingen=0.5.1
conflicts = ingen
source = ingen::git+http://git.drobilla.net/cgit.cgi/ingen.git/
+ source = ingen-ingenish-python3.diff
md5sums = SKIP
+ md5sums = 210743fd775951fb9e8641b13541e097
pkgname = ingen-git
diff --git a/PKGBUILD b/PKGBUILD
index bc1a14bd9b05..14b1c74e39f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,16 +9,19 @@ pkgdesc="A modular plugin host for JACK and LV2."
arch=('i686' 'x86_64')
url="http://drobilla.net/software/${_pkgname}/"
license=('GPL')
-depends=('alsa-lib' 'ganv>=1.5.0' 'jack' 'lilv>=0.21.5' 'lv2>=1.15.4' 'portaudio'
- 'raul>=0.8.10' 'suil>=0.8.7' 'serd>=0.30' 'sord>=0.12.0')
-makedepends=('python2')
+depends=('alsa-lib' 'ganv>=1.5.0' 'jack' 'lilv>=0.21.5' 'lv2>=1.15.4'
+ 'portaudio' 'python-rdflib' 'raul>=0.8.10' 'suil>=0.8.7' 'serd>=0.30'
+ 'sord>=0.12.0')
+makedepends=('git')
optdepends=(
'lv2-plugins: various useful LV2 plug-in packages'
)
provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
conflicts=("${_pkgname}")
-source=("${_pkgname}::git+http://git.drobilla.net/cgit.cgi/ingen.git/")
-md5sums=('SKIP')
+source=("${_pkgname}::git+http://git.drobilla.net/cgit.cgi/ingen.git/"
+ "ingen-ingenish-python3.diff")
+md5sums=('SKIP'
+ '210743fd775951fb9e8641b13541e097')
pkgver() {
@@ -30,17 +33,25 @@ pkgver() {
echo "${ver}.r${rev}.${githash}"
}
+prepare() {
+ cd "$srcdir/${_pkgname}"
+
+ # Fix 'does not look like a valid URI' warning
+ # and decode command responses.
+ patch -p1 -N -r - -i "${srcdir}/ingen-ingenish-python3.diff"
+}
+
build() {
cd "$srcdir/${_pkgname}"
- python2 waf configure --prefix=/usr
- python2 waf build
+ python waf configure --prefix=/usr
+ python waf build
}
package() {
cd "$srcdir/${_pkgname}"
- python2 waf install --destdir="$pkgdir/"
+ python waf install --destdir="$pkgdir/"
}
# vim:set ts=2 sw=2 et:
diff --git a/ingen-ingenish-python3.diff b/ingen-ingenish-python3.diff
new file mode 100644
index 000000000000..3b0df3b418cb
--- /dev/null
+++ b/ingen-ingenish-python3.diff
@@ -0,0 +1,28 @@
+diff --git a/scripts/ingen.py b/scripts/ingen.py
+index 594a7c01..9e757504 100644
+--- a/scripts/ingen.py
++++ b/scripts/ingen.py
+@@ -99,7 +99,8 @@ class Remote(Interface):
+ self.ns_manager = rdflib.namespace.NamespaceManager(self.model)
+ self.ns_manager.bind('server', self.server_base)
+ for (k, v) in NS.__dict__.items():
+- self.ns_manager.bind(k, v)
++ if not k.startswith('__'):
++ self.ns_manager.bind(k, v)
+ if uri.startswith('unix://'):
+ self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ self.sock.connect(uri[len('unix://'):])
+diff --git a/scripts/ingenish b/scripts/ingenish
+index 97640645..b0911021 100755
+--- a/scripts/ingenish
++++ b/scripts/ingenish
+@@ -76,7 +76,8 @@ def run(cmd):
+ elif cmd[0] == 'exit':
+ sys.exit(0)
+ elif cmd[0] == 'get' and len(cmd) == 2:
+- print(ingen.get(cmd[1]).serialize(format='n3'))
++ print(ingen.get(cmd[1]).serialize(
++ format='n3', encoding='utf-8').decode('utf-8'))
+ elif cmd[0] == 'put' and len(cmd) == 3:
+ return ingen.put(cmd[1], cmd[2])
+ elif cmd[0] == 'patch' and len(cmd) == 4: