Add patch for translation issues

3 files changed, 67 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23bc6867baae..db5687963e1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-lilv
 	pkgdesc = A C library interface to the LV2 plug-in standard (32-bit)
 	pkgver = 0.24.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://drobilla.net/software/lilv/
 	arch = x86_64
 	license = custom:ISC
@@ -12,9 +12,11 @@ pkgbase = lib32-lilv
 	depends = lilv
 	source = https://download.drobilla.net/lilv-0.24.8.tar.bz2
 	source = https://download.drobilla.net/lilv-0.24.8.tar.bz2.sig
+	source = lilv-0.24.8-fix_translations.patch
 	validpgpkeys = 907D226E7E13FA337F014A083672782A9BF368F3
 	sha512sums = f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
 	sha512sums = SKIP
+	sha512sums = 71a38be9d33a21e2d2a9500e37efee9825124bab817c8e459790c00c28b9b27a1c9a3b611955790542b55253ae656dad58be934199a854cd7a5e16daed485b68
 
 pkgname = lib32-lilv
 
diff --git a/PKGBUILD b/PKGBUILD
index b4f2656da732..5e223b3e3f94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,26 @@
 _basename=lilv
 pkgname=lib32-lilv
 pkgver=0.24.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library interface to the LV2 plug-in standard (32-bit)"
 arch=('x86_64')
 url="https://drobilla.net/software/lilv/"
 license=('custom:ISC')
 depends=('lib32-sratom' 'lilv')
 makedepends=('lib32-libsndfile' 'lib32-lv2' 'waf')
-source=("https://download.drobilla.net/$_basename-$pkgver.tar.bz2"{,.sig})
+source=("https://download.drobilla.net/$_basename-$pkgver.tar.bz2"{,.sig}
+        "$_basename-0.24.8-fix_translations.patch")
 sha512sums=('f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192'
-            'SKIP')
+            'SKIP'
+            '71a38be9d33a21e2d2a9500e37efee9825124bab817c8e459790c00c28b9b27a1c9a3b611955790542b55253ae656dad58be934199a854cd7a5e16daed485b68')
 validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3')
 
 prepare() {
     cd "$_basename-$pkgver"
 
+    # patch translation issues
+    patch -Np1 -i "../$_basename-0.24.8-fix_translations.patch"
+
     # let wscript(s) find the custom waf scripts
     mkdir -pv tools
     touch __init__.py
diff --git a/lilv-0.24.8-fix_translations.patch b/lilv-0.24.8-fix_translations.patch
new file mode 100644
index 000000000000..1f7593dd6a7c
--- /dev/null
+++ b/lilv-0.24.8-fix_translations.patch
@@ -0,0 +1,56 @@
+From b3438131f4bff67d56243bac85371c03a86bf53b Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sun, 17 May 2020 20:49:46 +0200
+Subject: [PATCH] Make lilv_world_get() use translations
+
+---
+ NEWS        |  6 ++++++
+ src/world.c | 20 ++++++++++++++++++++
+ wscript     |  2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index b2f881c..c1c06f7 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,9 @@
++lilv (0.24.9) unstable;
++
++  * Make lilv_world_get() use translations
++
++ -- David Robillard <d@drobilla.net>  Sun, 17 May 2020 18:44:04 +0000
++
+ lilv (0.24.8) stable;
+ 
+   * Allow passing strings for URIs in Python API when unambiguous
+diff --git a/src/world.c b/src/world.c
+index 22d165a..65cffd4 100644
+--- a/src/world.c
++++ b/src/world.c
+@@ -240,6 +240,26 @@ lilv_world_get(LilvWorld*      world,
+                const LilvNode* predicate,
+                const LilvNode* object)
+ {
++	if (!object) {
++		// TODO: Improve performance (see lilv_plugin_get_one)
++		SordIter* stream = sord_search(world->model,
++		                               subject   ? subject->node : NULL,
++		                               predicate ? predicate->node : NULL,
++		                               NULL,
++		                               NULL);
++
++		LilvNodes* nodes =
++		    lilv_nodes_from_stream_objects(world, stream, SORD_OBJECT);
++
++		if (nodes) {
++			LilvNode* value = lilv_node_duplicate(lilv_nodes_get_first(nodes));
++			lilv_nodes_free(nodes);
++			return value;
++		}
++
++		return NULL;
++	}
++
+ 	SordNode* snode = sord_get(world->model,
+ 	                           subject   ? subject->node   : NULL,
+ 	                           predicate ? predicate->node : NULL,