The following commit has been merged in the master branch:
commit ae62971debba556fa5a99608f1c03d3f1341e34b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sat Feb 22 14:31:45 2014 +0100
Patches refreshed.
diff --git a/debian/patches/1001-dont_run_ldconfig.patch b/debian/patches/1001-dont_run_ldconfig.patch
index af060c0..c9c36ba 100644
--- a/debian/patches/1001-dont_run_ldconfig.patch
+++ b/debian/patches/1001-dont_run_ldconfig.patch
@@ -6,9 +6,11 @@ Forwarded: not-needed
wscript | 1 -
1 file changed, 1 deletion(-)
---- lilv.orig/wscript
-+++ lilv/wscript
-@@ -348,7 +348,6 @@ def build(bld):
+Index: lilv/wscript
+===================================================================
+--- lilv.orig/wscript 2014-02-22 14:27:33.070322137 +0100
++++ lilv/wscript 2014-02-22 14:27:33.066322114 +0100
+@@ -382,7 +382,6 @@
bld.install_files('${PYTHONDIR}', 'bindings/lilv.py')
diff --git a/debian/patches/1002-fix_gnu_kfreebsd_build.patch b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
index 764a9cd..cdc5d7d 100644
--- a/debian/patches/1002-fix_gnu_kfreebsd_build.patch
+++ b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
@@ -9,9 +9,11 @@ Subject: Fix build on GNU/kFreeBSD
wscript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- lilv.orig/wscript
-+++ lilv/wscript
-@@ -218,7 +218,7 @@ def build(bld):
+Index: lilv/wscript
+===================================================================
+--- lilv.orig/wscript 2014-02-22 14:27:52.586416193 +0100
++++ lilv/wscript 2014-02-22 14:27:52.582416170 +0100
+@@ -221,7 +221,7 @@
if bld.env.MSVC_COMPILER:
libflags = []
defines = ['snprintf=_snprintf']
@@ -20,7 +22,7 @@ Subject: Fix build on GNU/kFreeBSD
lib = []
# Shared Library
-@@ -342,7 +342,7 @@ def build(bld):
+@@ -376,7 +376,7 @@
source = 'bindings/lilv.i',
target = 'bindings/_lilv',
includes = ['..'],
diff --git a/debian/patches/9001-bindings.patch b/debian/patches/9001-bindings.patch
index 75a863a..e616ff5 100644
--- a/debian/patches/9001-bindings.patch
+++ b/debian/patches/9001-bindings.patch
@@ -5,10 +5,12 @@ Applied-Upstream: yes
lilv/lilvmm.hpp | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
---- lilv.orig/lilv/lilvmm.hpp
-+++ lilv/lilv/lilvmm.hpp
-@@ -49,6 +49,11 @@ uri_to_path(const char* uri) {
- return lilv_ ## prefix ## _ ## name(me, a1, a2); \
+Index: lilv/lilv/lilvmm.hpp
+===================================================================
+--- lilv.orig/lilv/lilvmm.hpp 2014-02-22 14:28:05.202476948 +0100
++++ lilv/lilv/lilvmm.hpp 2014-02-22 14:28:05.198476933 +0100
+@@ -54,6 +54,11 @@
+ return lilv_ ## prefix ## _ ## name(me, a1, a2, a3); \
}
+#define LILV_WRAP3(RT, prefix, name, T1, a1, T2, a2, T3, a3) \
@@ -19,11 +21,10 @@ Applied-Upstream: yes
#define LILV_WRAP2_VOID(prefix, name, T1, a1, T2, a2) \
inline void name(T1 a1, T2 a2) { lilv_ ## prefix ## _ ## name(me, a1, a2); }
-@@ -139,6 +144,27 @@ struct Nodes {
- LILV_WRAP0(Node, nodes, get_first);
+@@ -145,6 +150,27 @@
};
-+struct UI {
+ struct UI {
+ inline UI(const LilvUI* c_obj) : me(c_obj) {}
+ LILV_WRAP_CONVERSION(const LilvUI);
+
@@ -44,6 +45,7 @@ Applied-Upstream: yes
+ LILV_WRAP_COLL(UIs, UI, uis);
+};
+
- struct Port {
- inline Port(const LilvPlugin* p, const LilvPort* c_obj)
- : parent(p), me(c_obj)
++struct UI {
+ inline UI(const LilvUI* c_obj) : me(c_obj) {}
+ LILV_WRAP_CONVERSION(const LilvUI);
+
--
lilv packaging